Skip to content

:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.

fix(metrics): list service.name once in project-wide attribute keys (#116605)

Daniel Visca1d5b62d42850
diff --git a/products/metrics/backend/metric_attributes_query_runner.py b/products/metrics/backend/metric_attributes_query_runner.py
index d4f660cd1957..93a25f58fdd6 100644
--- a/products/metrics/backend/metric_attributes_query_runner.py
+++ b/products/metrics/backend/metric_attributes_query_runner.py
@@ -104,14 +104,23 @@ class MetricAttributeKeysQueryRunner:
SELECT attribute_key, uniq(attribute_value) AS value_count
FROM posthog.metric_attributes
WHERE time_bucket >= {date_from}
+ AND attribute_key NOT IN ('service_name', 'service.name')
AND attribute_key ILIKE {search_pattern}
GROUP BY attribute_key
UNION ALL
- SELECT 'service_name' AS attribute_key, uniq(service_name) AS value_count
- FROM posthog.metric_attributes
- WHERE time_bucket >= {date_from}
- AND ('service_name' ILIKE {search_pattern} OR 'service.name' ILIKE {search_pattern})
- HAVING value_count > 0
+ -- A metric of a service that sends `service.name` lists that key.
+ -- Other metrics list the synthetic `service_name` key.
+ SELECT if(has_dotted_service_name, 'service.name', 'service_name') AS attribute_key,
+ uniq(service) AS value_count
+ FROM (
+ SELECT service_name AS service,
+ max(attribute_type = 'resource' AND attribute_key = 'service.name') AS has_dotted_service_name
+ FROM posthog.metric_attributes
+ WHERE time_bucket >= {date_from}
+ GROUP BY metric_name, service_name
+ )
+ WHERE 'service_name' ILIKE {search_pattern} OR 'service.name' ILIKE {search_pattern}
+ GROUP BY attribute_key
)
ORDER BY value_count DESC, attribute_key ASC
LIMIT {limit}
diff --git a/products/metrics/backend/tests/test_metric_attributes.py b/products/metrics/backend/tests/test_metric_attributes.py
index 2b5da2a2be7c..a31135860d8f 100644
--- a/products/metrics/backend/tests/test_metric_attributes.py
+++ b/products/metrics/backend/tests/test_metric_attributes.py
@@ -192,12 +192,17 @@ class TestMetricAttributeDistinctValuesAPI(ClickhouseTestMixin, APIBaseTest):
@parameterized.expand(
[
- ("no_search", "", ["service.name", "env"]),
- ("underscore_search", "service_name", ["service.name"]),
- ("dotted_search", "service.name", ["service.name"]),
+ ("no_search", "job.duration", "", ["service.name", "env"]),
+ ("underscore_search", "job.duration", "service_name", ["service.name"]),
+ ("dotted_search", "job.duration", "service.name", ["service.name"]),
+ ("project_wide_no_search", "", "", ["service.name", "env"]),
+ ("project_wide_underscore_search", "", "service_name", ["service.name"]),
+ ("project_wide_dotted_search", "", "service.name", ["service.name"]),
]
)
- def test_service_name_resource_attribute_is_listed_once(self, _name: str, search: str, expected: list[str]) -> None:
+ def test_service_name_resource_attribute_is_listed_once(
+ self, _name: str, metric_name: str, search: str, expected: list[str]
+ ) -> None:
truncate_metrics_tables()
now = timezone.now().replace(second=0, microsecond=0)
for service in ("checkout", "billing"):
@@ -211,8 +216,45 @@ class TestMetricAttributeDistinctValuesAPI(ClickhouseTestMixin, APIBaseTest):
)
response = self.client.get(
- f"/api/projects/{self.team.id}/metrics/attributes/", {"metricName": "job.duration", "search": search}
+ f"/api/projects/{self.team.id}/metrics/attributes/", {"metricName": metric_name, "search": search}
)
assert response.status_code == status.HTTP_200_OK, response.json()
assert [r["name"] for r in response.json()["results"]] == expected
+
+ @parameterized.expand(
+ [
+ ("one_metric", "job.duration", "service_name"),
+ ("project_wide", "", "service_name"),
+ ("project_wide_dotted_datapoint_label", "", "service.name"),
+ ]
+ )
+ def test_services_without_dotted_resource_attribute_keep_one_synthetic_key(
+ self, _name: str, metric_name: str, datapoint_service_key: str
+ ) -> None:
+ truncate_metrics_tables()
+ now = timezone.now().replace(second=0, microsecond=0)
+ seed_metric(
+ team_id=self.team.id,
+ metric_name="job.duration",
+ service_name="checkout",
+ points=[(now - dt.timedelta(minutes=2), 1.0)],
+ labels={"env": "prod"},
+ resource_labels={"service.name": "checkout"},
+ )
+ seed_metric(
+ team_id=self.team.id,
+ metric_name="job.duration",
+ service_name="billing",
+ points=[(now - dt.timedelta(minutes=2), 1.0)],
+ labels={"env": "prod", datapoint_service_key: "billing"},
+ )
+
+ response = self.client.get(f"/api/projects/{self.team.id}/metrics/attributes/", {"metricName": metric_name})
+
+ assert response.status_code == status.HTTP_200_OK, response.json()
+ assert response.json()["results"] == [
+ {"name": "env", "value_count": 1},
+ {"name": "service.name", "value_count": 1},
+ {"name": "service_name", "value_count": 1},
+ ]