Merge pull request #587 from mendix/develop

Release 2022-12-09
mendix · Dec 9, 2022 · e87d747 · e87d747
2 parents 2553be7 + a405c8e
commit e87d747
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/buildpack/telemetry/metrics.py b/buildpack/telemetry/metrics.py
@@ -37,6 +37,13 @@
         "step": "10s",
     },
     "filters": [
+        # Login metrics needs to be enabled explicitly as it's disabled
+        # by default
+        {
+            "type": "nameStartsWith",
+            "result": "accept",
+            "values": ["mx.runtime.user.login"],
+        },
         # Filter out irrelevant metrics to reduce
         # the payload size passed to TSS
         # https://docs.mendix.com/refguide/metrics#filters
@@ -53,7 +60,7 @@
     "settings": {"port": datadog.get_statsd_port()},
 }
 
-# For freeapps we push only the session metrics
+# For freeapps we push only the session & login metrics
 FREEAPPS_METRICS_REGISTRY = [
     {
         "type": "influx",
@@ -66,7 +73,10 @@
             {
                 "type": "nameStartsWith",
                 "result": "accept",
-                "values": ["mx.runtime.stats.sessions"],
+                "values": [
+                    "mx.runtime.stats.sessions",
+                    "mx.runtime.user.login",
+                ],
             },
             {"type": "nameStartsWith", "result": "deny", "values": [""]},
         ],
@@ -444,8 +454,8 @@ def _inject_jvm_failure_metrics(self, stats):
         if "jvm" not in stats:
             stats["jvm"] = {}
 
-        stats["jvm"]["errors"] = 0.
-        stats["jvm"]["ooms"] = 0.
+        stats["jvm"]["errors"] = 0.0
+        stats["jvm"]["ooms"] = 0.0
 
         return stats