From 94461cd8b5d13e8e7ad279fc29f53264ad1e401e Mon Sep 17 00:00:00 2001 From: Lyn Nagara Date: Wed, 20 Mar 2024 15:47:44 -0700 Subject: [PATCH 1/3] feat(generic-metrics): Don't produce headers unnecessarily These are no longer needed by snuba, it is unnecessary to produce this information as we don't use it for anything --- src/sentry/sentry_metrics/consumers/indexer/batch.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/sentry/sentry_metrics/consumers/indexer/batch.py b/src/sentry/sentry_metrics/consumers/indexer/batch.py index 3d3b1251d9b2d..503cf357946ef 100644 --- a/src/sentry/sentry_metrics/consumers/indexer/batch.py +++ b/src/sentry/sentry_metrics/consumers/indexer/batch.py @@ -410,10 +410,6 @@ def reconstruct_messages( fetch_types_encountered.add(metadata.fetch_type) output_message_meta[metadata.fetch_type.value][str(metadata.id)] = tag - mapping_header_content = bytes( - "".join(sorted(t.value for t in fetch_types_encountered)), "utf-8" - ) - numeric_metric_id = mapping[use_case_id][org_id][metric_name] if numeric_metric_id is None: metadata = bulk_record_meta[use_case_id][org_id].get(metric_name) @@ -501,12 +497,7 @@ def reconstruct_messages( kafka_payload = KafkaPayload( key=message.payload.key, value=rapidjson.dumps(new_payload_value).encode(), - headers=[ - *message.payload.headers, - ("mapping_sources", mapping_header_content), - # XXX: type mismatch, but seems to work fine in prod - ("metric_type", new_payload_value["type"]), # type: ignore - ], + headers=[], ) if self.is_output_sliced: routing_payload = RoutingPayload( From 1c0963ae0e352f149e7655c968b414332e61681c Mon Sep 17 00:00:00 2001 From: Lyn Nagara Date: Thu, 21 Mar 2024 14:57:44 -0700 Subject: [PATCH 2/3] headers --- .../sentry_metrics/test_gen_metrics_multiprocess_steps.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/sentry/sentry_metrics/test_gen_metrics_multiprocess_steps.py b/tests/sentry/sentry_metrics/test_gen_metrics_multiprocess_steps.py index a5cff4381f66c..3d8a2ac55ddbf 100644 --- a/tests/sentry/sentry_metrics/test_gen_metrics_multiprocess_steps.py +++ b/tests/sentry/sentry_metrics/test_gen_metrics_multiprocess_steps.py @@ -63,11 +63,6 @@ def compare_messages_ignoring_mapping_metadata(actual: Message, expected: Messag assert actual_payload.key == expected_payload.key - actual_headers_without_mapping_sources = [ - (k, v.encode()) for k, v in actual_payload.headers if k != "mapping_sources" - ] - assert actual_headers_without_mapping_sources == expected_payload.headers - actual_deserialized = json.loads(actual_payload.value) expected_deserialized = json.loads(expected_payload.value) del actual_deserialized["mapping_meta"] From 30f39436b28678b6bd8e18793a73f58e8e7beacd Mon Sep 17 00:00:00 2001 From: Lyn Nagara Date: Thu, 21 Mar 2024 14:59:44 -0700 Subject: [PATCH 3/3] release health too --- .../sentry_metrics/test_rh_metrics_multiprocess_steps.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/sentry/sentry_metrics/test_rh_metrics_multiprocess_steps.py b/tests/sentry/sentry_metrics/test_rh_metrics_multiprocess_steps.py index 5ca349c9d6546..63d7a1005f8e2 100644 --- a/tests/sentry/sentry_metrics/test_rh_metrics_multiprocess_steps.py +++ b/tests/sentry/sentry_metrics/test_rh_metrics_multiprocess_steps.py @@ -62,11 +62,6 @@ def compare_messages_ignoring_mapping_metadata(actual: Message, expected: Messag assert actual_payload.key == expected_payload.key - actual_headers_without_mapping_sources = [ - (k, v.encode()) for k, v in actual_payload.headers if k != "mapping_sources" - ] - assert actual_headers_without_mapping_sources == expected_payload.headers - actual_deserialized = json.loads(actual_payload.value) expected_deserialized = json.loads(expected_payload.value) del actual_deserialized["mapping_meta"]