From 2e803bf9a5d75db9c352485d329fdd6051b32fb9 Mon Sep 17 00:00:00 2001 From: Zarir Hamza Date: Thu, 18 Jun 2026 12:27:11 -0400 Subject: [PATCH 1/6] fix: prefer DD_SERVICE as the inferred span service name When DD_SERVICE (config.service) is set, use it as the service for inferred (synthetic) spans, taking precedence over DD_SERVICE_MAPPING and the AWS service representation. When DD_SERVICE is unset, the existing resolution logic is preserved. --- datadog_lambda/config.py | 4 ++ datadog_lambda/tracing.py | 11 ++-- tests/test_tracing.py | 125 ++++++++++++++++++++++++++++---------- 3 files changed, 103 insertions(+), 37 deletions(-) diff --git a/datadog_lambda/config.py b/datadog_lambda/config.py index ce4924af..5181b57e 100644 --- a/datadog_lambda/config.py +++ b/datadog_lambda/config.py @@ -75,6 +75,10 @@ def _resolve_env(self, key, default=None, cast=None, depends_on_tracing=False): add_span_pointers = _get_env("DD_BOTOCORE_ADD_SPAN_POINTERS", "true", as_bool) trace_extractor = _get_env("DD_TRACE_EXTRACTOR") + aws_service_representation_enabled = _get_env( + "DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED", "true", as_bool + ) + enhanced_metrics_enabled = _get_env("DD_ENHANCED_METRICS", "true", as_bool) flush_in_thread = _get_env("DD_FLUSH_IN_THREAD", "false", as_bool) diff --git a/datadog_lambda/tracing.py b/datadog_lambda/tracing.py index b3f79a96..2974ba30 100644 --- a/datadog_lambda/tracing.py +++ b/datadog_lambda/tracing.py @@ -893,6 +893,12 @@ def create_service_mapping(val): def determine_service_name( service_mapping, specific_key, generic_key, extracted_key, fallback=None ): + # DD_SERVICE (the base service name) takes top priority for inferred + # (synthetic) spans. When it is set, use it as the service regardless of + # any AWS service representation or service mapping. + if config.service: + return config.service + # Check for mapped service (specific key first, then generic key) mapped_service = service_mapping.get(specific_key) or service_mapping.get( generic_key @@ -901,10 +907,7 @@ def determine_service_name( return mapped_service # Check if AWS service representation is disabled - aws_service_representation = os.environ.get( - "DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED", "" - ).lower() - if aws_service_representation in ("false", "0"): + if not config.aws_service_representation_enabled: return fallback # Use extracted_key if it exists and is not empty, otherwise use fallback diff --git a/tests/test_tracing.py b/tests/test_tracing.py index fc18f6e5..21eed772 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -1467,6 +1467,7 @@ def test_set_service_mapping(self): self.set_service_mapping(new_service_mapping) self.assertEqual(self.get_service_mapping(), new_service_mapping) + @patch("datadog_lambda.config.Config.service", None) def test_determine_service_name(self): # Prepare the environment os.environ["DD_SERVICE_MAPPING"] = "api1:service1,api2:service2" @@ -1501,44 +1502,102 @@ def test_determine_service_name(self): "default", ) - # Test with DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED set to false - os.environ["DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED"] = "false" - self.assertEqual( - determine_service_name( - self.get_service_mapping(), "api4", "api4", "extracted", "fallback" - ), - "fallback", - ) - - # Test with DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED set to 0 - os.environ["DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED"] = "0" - self.assertEqual( - determine_service_name( - self.get_service_mapping(), "api4", "api4", "extracted", "fallback" - ), - "fallback", - ) + # Test with DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED disabled + with patch( + "datadog_lambda.config.Config.aws_service_representation_enabled", False + ): + self.assertEqual( + determine_service_name( + self.get_service_mapping(), + "api4", + "api4", + "extracted", + "fallback", + ), + "fallback", + ) - # Test with DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED not set (default behavior) - if "DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED" in os.environ: - del os.environ["DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED"] - self.assertEqual( - determine_service_name( - self.get_service_mapping(), "api4", "api4", "extracted", "fallback" - ), - "extracted", - ) + # Test with DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED enabled (default) + with patch( + "datadog_lambda.config.Config.aws_service_representation_enabled", True + ): + self.assertEqual( + determine_service_name( + self.get_service_mapping(), + "api4", + "api4", + "extracted", + "fallback", + ), + "extracted", + ) - # Test with empty extracted key - self.assertEqual( - determine_service_name( - self.get_service_mapping(), "api4", "api4", " ", "fallback" - ), - "fallback", - ) + # Test with empty extracted key + self.assertEqual( + determine_service_name( + self.get_service_mapping(), "api4", "api4", " ", "fallback" + ), + "fallback", + ) del os.environ["DD_SERVICE_MAPPING"] + def test_determine_service_name_prefers_dd_service(self): + # When DD_SERVICE is set, inferred spans always use the base service + # name (DD_SERVICE), regardless of any other configuration. + with patch("datadog_lambda.config.Config.service", "my-service"): + self.assertEqual( + determine_service_name( + {}, "queue-name", "lambda_sqs", "queue-name", "sqs" + ), + "my-service", + ) + + # DD_SERVICE takes precedence over an explicit service mapping. + self.assertEqual( + determine_service_name( + {"lambda_sqs": "mapped-service"}, + "queue-name", + "lambda_sqs", + "queue-name", + "sqs", + ), + "my-service", + ) + + # DD_SERVICE takes precedence over a disabled AWS service + # representation. + with patch( + "datadog_lambda.config.Config.aws_service_representation_enabled", + False, + ): + self.assertEqual( + determine_service_name( + {}, "queue-name", "lambda_sqs", "queue-name", "sqs" + ), + "my-service", + ) + + # When DD_SERVICE is not set, fall back to the existing behavior + # (service mapping, then AWS service representation / extracted key). + with patch("datadog_lambda.config.Config.service", None): + self.assertEqual( + determine_service_name( + {"lambda_sqs": "mapped-service"}, + "queue-name", + "lambda_sqs", + "queue-name", + "sqs", + ), + "mapped-service", + ) + self.assertEqual( + determine_service_name( + {}, "queue-name", "lambda_sqs", "queue-name", "sqs" + ), + "queue-name", + ) + def test_remaps_all_inferred_span_service_names_from_api_gateway_event(self): new_service_mapping = {"lambda_api_gateway": "new-name"} self.set_service_mapping(new_service_mapping) From d21fa184fbafa5f79d2df0946da0ff51d6106792 Mon Sep 17 00:00:00 2001 From: Zarir Hamza Date: Thu, 18 Jun 2026 13:00:23 -0400 Subject: [PATCH 2/6] test: pin config.service=None for AWS service-representation tests The inferred-span and service-mapping tests assert the AWS service representation, which only applies when DD_SERVICE is unset. CI sets DD_SERVICE, so pin config.service to None to keep them deterministic. --- tests/test_tracing.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/test_tracing.py b/tests/test_tracing.py index 21eed772..e2a8e5be 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -1421,6 +1421,13 @@ def test_set_dd_trace_py_root_none_context(self): class TestServiceMapping(unittest.TestCase): def setUp(self): self.service_mapping = {} + # These tests exercise the AWS service-representation / service-mapping + # resolution, which only applies when DD_SERVICE is not set. Pin + # config.service to None so the tests are deterministic regardless of + # whether DD_SERVICE is present in the environment (e.g. in CI). + service_patcher = patch("datadog_lambda.config.Config.service", None) + service_patcher.start() + self.addCleanup(service_patcher.stop) def get_service_mapping(self): return global_service_mapping @@ -2614,6 +2621,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None): @pytest.mark.parametrize("source,expect", _test_create_inferred_span) @patch("ddtrace.trace.Span.finish", autospec=True) +@patch("datadog_lambda.config.Config.service", None) def test_create_inferred_span(mock_span_finish, source, expect): with open(f"{event_samples}{source}.json") as f: event = json.load(f) From e2cdc94e912f43f06df858917546c6d8f5fa573c Mon Sep 17 00:00:00 2001 From: Zarir Hamza Date: Thu, 18 Jun 2026 13:04:23 -0400 Subject: [PATCH 3/6] test: add inferred-span coverage for DD_SERVICE precedence Verify create_inferred_span uses DD_SERVICE as the service (over an explicit service mapping) when DD_SERVICE is set. --- tests/test_tracing.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/test_tracing.py b/tests/test_tracing.py index e2a8e5be..e2ba6664 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -1793,6 +1793,23 @@ def test_remaps_specific_inferred_span_service_names_from_sqs_event(self): self.assertEqual(span2.get_tag("operation_name"), "aws.sqs") self.assertEqual(span2.service, "different-sqs-url") + def test_create_inferred_span_uses_dd_service_when_set(self): + # When DD_SERVICE is set, inferred spans use it as the service, + # taking precedence over any AWS service representation or mapping. + event_sample_source = "sqs-string-msg-attribute" + test_file = event_samples + event_sample_source + ".json" + with open(test_file, "r") as event: + original_event = json.load(event) + + ctx = get_mock_context() + ctx.aws_request_id = "123" + + self.set_service_mapping({"lambda_sqs": "mapped-name"}) + with patch("datadog_lambda.config.Config.service", "my-dd-service"): + span = create_inferred_span(original_event, ctx) + self.assertEqual(span.get_tag("operation_name"), "aws.sqs") + self.assertEqual(span.service, "my-dd-service") + def test_remaps_all_inferred_span_service_names_from_sns_event(self): self.set_service_mapping({"lambda_sns": "new-name"}) event_sample_source = "sns-string-msg-attribute" From d1aaee5987540a874e91bf18f5aea61aea1c8791 Mon Sep 17 00:00:00 2001 From: Zarir Hamza Date: Thu, 18 Jun 2026 13:44:13 -0400 Subject: [PATCH 4/6] test(integration): regenerate snapshots for DD_SERVICE inferred spans Inferred (synthetic) spans now use DD_SERVICE (integration-tests-python) as their service instead of the AWS service representation, so the redundant _dd.base_service tag is dropped on those spans. Regenerated via UPDATE_SNAPSHOTS for all Python versions. --- .../logs/async-metrics_python310.log | 54 ++++--------------- .../logs/async-metrics_python311.log | 54 ++++--------------- .../logs/async-metrics_python312.log | 54 ++++--------------- .../logs/async-metrics_python313.log | 54 ++++--------------- .../logs/async-metrics_python314.log | 54 ++++--------------- .../snapshots/logs/async-metrics_python38.log | 45 ++++------------ .../snapshots/logs/async-metrics_python39.log | 45 ++++------------ .../snapshots/logs/sync-metrics_python310.log | 54 ++++--------------- .../snapshots/logs/sync-metrics_python311.log | 54 ++++--------------- .../snapshots/logs/sync-metrics_python312.log | 54 ++++--------------- .../snapshots/logs/sync-metrics_python313.log | 54 ++++--------------- .../snapshots/logs/sync-metrics_python314.log | 54 ++++--------------- .../snapshots/logs/sync-metrics_python38.log | 45 ++++------------ .../snapshots/logs/sync-metrics_python39.log | 45 ++++------------ 14 files changed, 126 insertions(+), 594 deletions(-) diff --git a/tests/integration/snapshots/logs/async-metrics_python310.log b/tests/integration/snapshots/logs/async-metrics_python310.log index 14d4bd67..727c5f0a 100644 --- a/tests/integration/snapshots/logs/async-metrics_python310.log +++ b/tests/integration/snapshots/logs/async-metrics_python310.log @@ -45,7 +45,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -80,7 +79,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "XXXX.execute-api.us-east-2.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -109,9 +108,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python310", @@ -375,7 +371,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -408,7 +403,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "ExampleTableWithStream", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -465,9 +460,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python310", @@ -585,7 +577,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -611,7 +602,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "eventbridge.custom.event.sender", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -635,9 +626,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python310", @@ -755,7 +743,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -791,7 +778,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -820,9 +807,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python310", @@ -940,7 +924,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -973,7 +956,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "EXAMPLE", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -998,9 +981,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python310", @@ -1117,7 +1097,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A { "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1149,7 +1128,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "example-bucket", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -1185,9 +1164,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python310", @@ -1305,7 +1281,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1336,7 +1311,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "sns-lambda", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1361,9 +1336,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python310", @@ -1481,7 +1453,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1511,7 +1482,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "my-queue", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1536,9 +1507,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python310", @@ -1656,7 +1624,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1692,7 +1659,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1719,9 +1686,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python310", diff --git a/tests/integration/snapshots/logs/async-metrics_python311.log b/tests/integration/snapshots/logs/async-metrics_python311.log index 62054e97..992bae82 100644 --- a/tests/integration/snapshots/logs/async-metrics_python311.log +++ b/tests/integration/snapshots/logs/async-metrics_python311.log @@ -45,7 +45,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -80,7 +79,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "XXXX.execute-api.us-east-2.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -109,9 +108,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python311", @@ -375,7 +371,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -408,7 +403,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "ExampleTableWithStream", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -465,9 +460,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python311", @@ -585,7 +577,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -611,7 +602,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "eventbridge.custom.event.sender", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -635,9 +626,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python311", @@ -755,7 +743,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -791,7 +778,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -820,9 +807,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python311", @@ -940,7 +924,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -973,7 +956,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "EXAMPLE", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -998,9 +981,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python311", @@ -1117,7 +1097,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A { "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1149,7 +1128,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "example-bucket", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -1185,9 +1164,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python311", @@ -1305,7 +1281,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1336,7 +1311,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "sns-lambda", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1361,9 +1336,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python311", @@ -1481,7 +1453,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1511,7 +1482,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "my-queue", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1536,9 +1507,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python311", @@ -1656,7 +1624,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1692,7 +1659,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1719,9 +1686,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python311", diff --git a/tests/integration/snapshots/logs/async-metrics_python312.log b/tests/integration/snapshots/logs/async-metrics_python312.log index 8217a757..4b1b1319 100644 --- a/tests/integration/snapshots/logs/async-metrics_python312.log +++ b/tests/integration/snapshots/logs/async-metrics_python312.log @@ -45,7 +45,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -80,7 +79,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "XXXX.execute-api.us-east-2.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -109,9 +108,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python312", @@ -375,7 +371,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -408,7 +403,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "ExampleTableWithStream", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -465,9 +460,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python312", @@ -585,7 +577,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -611,7 +602,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "eventbridge.custom.event.sender", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -635,9 +626,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python312", @@ -755,7 +743,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -791,7 +778,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -820,9 +807,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python312", @@ -940,7 +924,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -973,7 +956,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "EXAMPLE", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -998,9 +981,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python312", @@ -1117,7 +1097,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A { "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1149,7 +1128,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "example-bucket", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -1185,9 +1164,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python312", @@ -1305,7 +1281,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1336,7 +1311,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "sns-lambda", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1361,9 +1336,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python312", @@ -1481,7 +1453,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1511,7 +1482,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "my-queue", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1536,9 +1507,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python312", @@ -1656,7 +1624,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1692,7 +1659,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1719,9 +1686,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python312", diff --git a/tests/integration/snapshots/logs/async-metrics_python313.log b/tests/integration/snapshots/logs/async-metrics_python313.log index b1b5afd6..97ac1317 100644 --- a/tests/integration/snapshots/logs/async-metrics_python313.log +++ b/tests/integration/snapshots/logs/async-metrics_python313.log @@ -45,7 +45,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -80,7 +79,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "XXXX.execute-api.us-east-2.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -109,9 +108,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python313", @@ -375,7 +371,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -408,7 +403,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "ExampleTableWithStream", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -465,9 +460,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python313", @@ -585,7 +577,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -611,7 +602,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "eventbridge.custom.event.sender", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -635,9 +626,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python313", @@ -755,7 +743,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -791,7 +778,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -820,9 +807,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python313", @@ -940,7 +924,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -973,7 +956,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "EXAMPLE", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -998,9 +981,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python313", @@ -1117,7 +1097,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A { "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1149,7 +1128,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "example-bucket", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -1185,9 +1164,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python313", @@ -1305,7 +1281,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1336,7 +1311,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "sns-lambda", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1361,9 +1336,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python313", @@ -1481,7 +1453,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1511,7 +1482,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "my-queue", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1536,9 +1507,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python313", @@ -1656,7 +1624,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1692,7 +1659,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1719,9 +1686,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python313", diff --git a/tests/integration/snapshots/logs/async-metrics_python314.log b/tests/integration/snapshots/logs/async-metrics_python314.log index 51fb9799..cc69d5c5 100644 --- a/tests/integration/snapshots/logs/async-metrics_python314.log +++ b/tests/integration/snapshots/logs/async-metrics_python314.log @@ -45,7 +45,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -80,7 +79,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "XXXX.execute-api.us-east-2.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -109,9 +108,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python314", @@ -375,7 +371,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -408,7 +403,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "ExampleTableWithStream", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -465,9 +460,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python314", @@ -585,7 +577,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -611,7 +602,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "eventbridge.custom.event.sender", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -635,9 +626,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python314", @@ -755,7 +743,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -791,7 +778,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -820,9 +807,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python314", @@ -940,7 +924,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -973,7 +956,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "EXAMPLE", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -998,9 +981,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python314", @@ -1117,7 +1097,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs { "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1149,7 +1128,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "example-bucket", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -1185,9 +1164,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python314", @@ -1305,7 +1281,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1336,7 +1311,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "sns-lambda", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1361,9 +1336,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python314", @@ -1481,7 +1453,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1511,7 +1482,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "my-queue", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1536,9 +1507,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python314", @@ -1656,7 +1624,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1692,7 +1659,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1719,9 +1686,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python314", diff --git a/tests/integration/snapshots/logs/async-metrics_python38.log b/tests/integration/snapshots/logs/async-metrics_python38.log index d086acb2..fa01a5f1 100644 --- a/tests/integration/snapshots/logs/async-metrics_python38.log +++ b/tests/integration/snapshots/logs/async-metrics_python38.log @@ -77,7 +77,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "XXXX.execute-api.us-east-2.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -105,9 +105,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python38", @@ -387,7 +384,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "ExampleTableWithStream", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -443,9 +440,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python38", @@ -580,7 +574,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "eventbridge.custom.event.sender", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -603,9 +597,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python38", @@ -750,7 +741,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -778,9 +769,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python38", @@ -922,7 +910,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "EXAMPLE", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -946,9 +934,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python38", @@ -1088,7 +1073,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "example-bucket", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -1123,9 +1108,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python38", @@ -1265,7 +1247,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "sns-lambda", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1289,9 +1271,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python38", @@ -1430,7 +1409,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "my-queue", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1454,9 +1433,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python38", @@ -1601,7 +1577,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1627,9 +1603,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python38", diff --git a/tests/integration/snapshots/logs/async-metrics_python39.log b/tests/integration/snapshots/logs/async-metrics_python39.log index 1383dd98..4d86be91 100644 --- a/tests/integration/snapshots/logs/async-metrics_python39.log +++ b/tests/integration/snapshots/logs/async-metrics_python39.log @@ -77,7 +77,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "XXXX.execute-api.us-east-2.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -105,9 +105,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python39", @@ -387,7 +384,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "ExampleTableWithStream", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -443,9 +440,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python39", @@ -580,7 +574,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "eventbridge.custom.event.sender", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -603,9 +597,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python39", @@ -750,7 +741,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -778,9 +769,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python39", @@ -922,7 +910,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "EXAMPLE", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -946,9 +934,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python39", @@ -1088,7 +1073,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "example-bucket", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -1123,9 +1108,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python39", @@ -1265,7 +1247,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "sns-lambda", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1289,9 +1271,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python39", @@ -1430,7 +1409,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "my-queue", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1454,9 +1433,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python39", @@ -1601,7 +1577,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1627,9 +1603,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python39", diff --git a/tests/integration/snapshots/logs/sync-metrics_python310.log b/tests/integration/snapshots/logs/sync-metrics_python310.log index e61f2015..5bf79798 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python310.log +++ b/tests/integration/snapshots/logs/sync-metrics_python310.log @@ -25,7 +25,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -60,7 +59,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "XXXX.execute-api.us-east-2.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -89,9 +88,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python310", @@ -401,7 +397,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -434,7 +429,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "ExampleTableWithStream", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -491,9 +486,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python310", @@ -634,7 +626,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -660,7 +651,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "eventbridge.custom.event.sender", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -684,9 +675,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python310", @@ -827,7 +815,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -863,7 +850,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -892,9 +879,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python310", @@ -1035,7 +1019,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1068,7 +1051,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "EXAMPLE", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1093,9 +1076,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python310", @@ -1235,7 +1215,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A { "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1267,7 +1246,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "example-bucket", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -1303,9 +1282,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python310", @@ -1446,7 +1422,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1477,7 +1452,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "sns-lambda", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1502,9 +1477,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python310", @@ -1645,7 +1617,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1675,7 +1646,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "my-queue", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1700,9 +1671,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python310", @@ -1843,7 +1811,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1879,7 +1846,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1906,9 +1873,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python310", diff --git a/tests/integration/snapshots/logs/sync-metrics_python311.log b/tests/integration/snapshots/logs/sync-metrics_python311.log index 5f5c9ae9..7bcdf78a 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python311.log +++ b/tests/integration/snapshots/logs/sync-metrics_python311.log @@ -25,7 +25,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -60,7 +59,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "XXXX.execute-api.us-east-2.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -89,9 +88,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python311", @@ -401,7 +397,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -434,7 +429,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "ExampleTableWithStream", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -491,9 +486,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python311", @@ -634,7 +626,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -660,7 +651,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "eventbridge.custom.event.sender", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -684,9 +675,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python311", @@ -827,7 +815,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -863,7 +850,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -892,9 +879,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python311", @@ -1035,7 +1019,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1068,7 +1051,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "EXAMPLE", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1093,9 +1076,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python311", @@ -1235,7 +1215,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A { "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1267,7 +1246,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "example-bucket", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -1303,9 +1282,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python311", @@ -1446,7 +1422,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1477,7 +1452,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "sns-lambda", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1502,9 +1477,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python311", @@ -1645,7 +1617,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1675,7 +1646,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "my-queue", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1700,9 +1671,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python311", @@ -1843,7 +1811,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1879,7 +1846,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1906,9 +1873,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python311", diff --git a/tests/integration/snapshots/logs/sync-metrics_python312.log b/tests/integration/snapshots/logs/sync-metrics_python312.log index 5d316187..060e6b92 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python312.log +++ b/tests/integration/snapshots/logs/sync-metrics_python312.log @@ -25,7 +25,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -60,7 +59,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "XXXX.execute-api.us-east-2.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -89,9 +88,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python312", @@ -401,7 +397,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -434,7 +429,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "ExampleTableWithStream", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -491,9 +486,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python312", @@ -634,7 +626,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -660,7 +651,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "eventbridge.custom.event.sender", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -684,9 +675,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python312", @@ -827,7 +815,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -863,7 +850,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -892,9 +879,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python312", @@ -1035,7 +1019,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1068,7 +1051,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "EXAMPLE", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1093,9 +1076,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python312", @@ -1235,7 +1215,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A { "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1267,7 +1246,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "example-bucket", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -1303,9 +1282,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python312", @@ -1446,7 +1422,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1477,7 +1452,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "sns-lambda", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1502,9 +1477,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python312", @@ -1645,7 +1617,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1675,7 +1646,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "my-queue", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1700,9 +1671,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python312", @@ -1843,7 +1811,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1879,7 +1846,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1906,9 +1873,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python312", diff --git a/tests/integration/snapshots/logs/sync-metrics_python313.log b/tests/integration/snapshots/logs/sync-metrics_python313.log index 5f36fcaa..eb651a8a 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python313.log +++ b/tests/integration/snapshots/logs/sync-metrics_python313.log @@ -25,7 +25,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -60,7 +59,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "XXXX.execute-api.us-east-2.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -89,9 +88,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python313", @@ -401,7 +397,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -434,7 +429,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "ExampleTableWithStream", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -491,9 +486,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python313", @@ -634,7 +626,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -660,7 +651,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "eventbridge.custom.event.sender", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -684,9 +675,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python313", @@ -827,7 +815,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -863,7 +850,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -892,9 +879,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python313", @@ -1035,7 +1019,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1068,7 +1051,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "EXAMPLE", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1093,9 +1076,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python313", @@ -1235,7 +1215,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A { "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1267,7 +1246,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "example-bucket", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -1303,9 +1282,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python313", @@ -1446,7 +1422,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1477,7 +1452,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "sns-lambda", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1502,9 +1477,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python313", @@ -1645,7 +1617,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1675,7 +1646,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "my-queue", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1700,9 +1671,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python313", @@ -1843,7 +1811,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1879,7 +1846,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1906,9 +1873,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python313", diff --git a/tests/integration/snapshots/logs/sync-metrics_python314.log b/tests/integration/snapshots/logs/sync-metrics_python314.log index f9b4399d..d8539ac8 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python314.log +++ b/tests/integration/snapshots/logs/sync-metrics_python314.log @@ -25,7 +25,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -60,7 +59,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "XXXX.execute-api.us-east-2.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -89,9 +88,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python314", @@ -401,7 +397,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -434,7 +429,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "ExampleTableWithStream", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -491,9 +486,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python314", @@ -634,7 +626,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -660,7 +651,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "eventbridge.custom.event.sender", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -684,9 +675,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python314", @@ -827,7 +815,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -863,7 +850,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -892,9 +879,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python314", @@ -1035,7 +1019,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1068,7 +1051,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "EXAMPLE", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1093,9 +1076,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python314", @@ -1235,7 +1215,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs { "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1267,7 +1246,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "example-bucket", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -1303,9 +1282,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python314", @@ -1446,7 +1422,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1477,7 +1452,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "sns-lambda", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1502,9 +1477,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python314", @@ -1645,7 +1617,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1675,7 +1646,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "my-queue", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1700,9 +1671,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python314", @@ -1843,7 +1811,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { - "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1879,7 +1846,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1906,9 +1873,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python314", diff --git a/tests/integration/snapshots/logs/sync-metrics_python38.log b/tests/integration/snapshots/logs/sync-metrics_python38.log index 1293ded9..9d1eb30a 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python38.log +++ b/tests/integration/snapshots/logs/sync-metrics_python38.log @@ -57,7 +57,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "XXXX.execute-api.us-east-2.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -85,9 +85,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python38", @@ -405,7 +402,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "ExampleTableWithStream", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -461,9 +458,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python38", @@ -617,7 +611,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "eventbridge.custom.event.sender", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -640,9 +634,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python38", @@ -806,7 +797,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -834,9 +825,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python38", @@ -997,7 +985,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "EXAMPLE", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1021,9 +1009,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python38", @@ -1182,7 +1167,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "example-bucket", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -1217,9 +1202,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python38", @@ -1378,7 +1360,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "sns-lambda", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1402,9 +1384,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python38", @@ -1562,7 +1541,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "my-queue", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1586,9 +1565,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python38", @@ -1752,7 +1728,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1778,9 +1754,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python38", diff --git a/tests/integration/snapshots/logs/sync-metrics_python39.log b/tests/integration/snapshots/logs/sync-metrics_python39.log index 507eeda0..945ee3f8 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python39.log +++ b/tests/integration/snapshots/logs/sync-metrics_python39.log @@ -57,7 +57,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "XXXX.execute-api.us-east-2.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -85,9 +85,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python39", @@ -405,7 +402,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "ExampleTableWithStream", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -461,9 +458,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python39", @@ -617,7 +611,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "eventbridge.custom.event.sender", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -640,9 +634,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python39", @@ -806,7 +797,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -834,9 +825,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python39", @@ -997,7 +985,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "EXAMPLE", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1021,9 +1009,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python39", @@ -1182,7 +1167,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "example-bucket", + "service": "integration-tests-python", "span_id": "XXXX", "span_links": [ { @@ -1217,9 +1202,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python39", @@ -1378,7 +1360,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "sns-lambda", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1402,9 +1384,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python39", @@ -1562,7 +1541,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "my-queue", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1586,9 +1565,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python39", @@ -1752,7 +1728,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "XXXX.execute-api.eu-west-1.amazonaws.com", + "service": "integration-tests-python", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1778,9 +1754,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, - "metrics": { - "_dd.top_level": 1 - }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python39", From 3193c847174c5daac2697d8ccbd41b1ee370a795 Mon Sep 17 00:00:00 2001 From: Zarir Hamza Date: Thu, 18 Jun 2026 17:20:15 -0400 Subject: [PATCH 5/6] fix: use DD_SERVICE for inferred spans only when integration names removed Gate the DD_SERVICE inferred-span service resolution behind DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED: when enabled (and DD_SERVICE is set), inferred (synthetic) spans use the base service name instead of the AWS resource/instance representation. Default behavior (flag off) is unchanged, so integration snapshots match main. Reverts the earlier unconditional DD_SERVICE-first and experimental peer.service / span.kind changes. --- datadog_lambda/config.py | 3 + datadog_lambda/tracing.py | 12 +-- .../logs/async-metrics_python310.log | 54 ++++++++-- .../logs/async-metrics_python311.log | 54 ++++++++-- .../logs/async-metrics_python312.log | 54 ++++++++-- .../logs/async-metrics_python313.log | 54 ++++++++-- .../logs/async-metrics_python314.log | 54 ++++++++-- .../snapshots/logs/async-metrics_python38.log | 45 ++++++-- .../snapshots/logs/async-metrics_python39.log | 45 ++++++-- .../snapshots/logs/sync-metrics_python310.log | 54 ++++++++-- .../snapshots/logs/sync-metrics_python311.log | 54 ++++++++-- .../snapshots/logs/sync-metrics_python312.log | 54 ++++++++-- .../snapshots/logs/sync-metrics_python313.log | 54 ++++++++-- .../snapshots/logs/sync-metrics_python314.log | 54 ++++++++-- .../snapshots/logs/sync-metrics_python38.log | 45 ++++++-- .../snapshots/logs/sync-metrics_python39.log | 45 ++++++-- tests/test_tracing.py | 100 ++++++++++-------- 17 files changed, 661 insertions(+), 174 deletions(-) diff --git a/datadog_lambda/config.py b/datadog_lambda/config.py index 5181b57e..b92c37ee 100644 --- a/datadog_lambda/config.py +++ b/datadog_lambda/config.py @@ -78,6 +78,9 @@ def _resolve_env(self, key, default=None, cast=None, depends_on_tracing=False): aws_service_representation_enabled = _get_env( "DD_TRACE_AWS_SERVICE_REPRESENTATION_ENABLED", "true", as_bool ) + remove_integration_service_names_enabled = _get_env( + "DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED", "false", as_bool + ) enhanced_metrics_enabled = _get_env("DD_ENHANCED_METRICS", "true", as_bool) diff --git a/datadog_lambda/tracing.py b/datadog_lambda/tracing.py index 2974ba30..893df2c4 100644 --- a/datadog_lambda/tracing.py +++ b/datadog_lambda/tracing.py @@ -893,12 +893,6 @@ def create_service_mapping(val): def determine_service_name( service_mapping, specific_key, generic_key, extracted_key, fallback=None ): - # DD_SERVICE (the base service name) takes top priority for inferred - # (synthetic) spans. When it is set, use it as the service regardless of - # any AWS service representation or service mapping. - if config.service: - return config.service - # Check for mapped service (specific key first, then generic key) mapped_service = service_mapping.get(specific_key) or service_mapping.get( generic_key @@ -906,6 +900,12 @@ def determine_service_name( if mapped_service: return mapped_service + # When integration service names are removed, inferred (synthetic) spans use + # the base service name (DD_SERVICE) instead of the AWS resource/instance + # representation. + if config.remove_integration_service_names_enabled and config.service: + return config.service + # Check if AWS service representation is disabled if not config.aws_service_representation_enabled: return fallback diff --git a/tests/integration/snapshots/logs/async-metrics_python310.log b/tests/integration/snapshots/logs/async-metrics_python310.log index 727c5f0a..14d4bd67 100644 --- a/tests/integration/snapshots/logs/async-metrics_python310.log +++ b/tests/integration/snapshots/logs/async-metrics_python310.log @@ -45,6 +45,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -79,7 +80,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "integration-tests-python", + "service": "XXXX.execute-api.us-east-2.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -108,6 +109,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python310", @@ -371,6 +375,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -403,7 +408,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "integration-tests-python", + "service": "ExampleTableWithStream", "span_id": "XXXX", "span_links": [ { @@ -460,6 +465,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python310", @@ -577,6 +585,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -602,7 +611,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "integration-tests-python", + "service": "eventbridge.custom.event.sender", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -626,6 +635,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python310", @@ -743,6 +755,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -778,7 +791,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -807,6 +820,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python310", @@ -924,6 +940,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -956,7 +973,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "integration-tests-python", + "service": "EXAMPLE", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -981,6 +998,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python310", @@ -1097,6 +1117,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A { "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1128,7 +1149,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "integration-tests-python", + "service": "example-bucket", "span_id": "XXXX", "span_links": [ { @@ -1164,6 +1185,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python310", @@ -1281,6 +1305,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1311,7 +1336,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "integration-tests-python", + "service": "sns-lambda", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1336,6 +1361,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python310", @@ -1453,6 +1481,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1482,7 +1511,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "integration-tests-python", + "service": "my-queue", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1507,6 +1536,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python310", @@ -1624,6 +1656,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1659,7 +1692,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1686,6 +1719,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python310", diff --git a/tests/integration/snapshots/logs/async-metrics_python311.log b/tests/integration/snapshots/logs/async-metrics_python311.log index 992bae82..62054e97 100644 --- a/tests/integration/snapshots/logs/async-metrics_python311.log +++ b/tests/integration/snapshots/logs/async-metrics_python311.log @@ -45,6 +45,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -79,7 +80,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "integration-tests-python", + "service": "XXXX.execute-api.us-east-2.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -108,6 +109,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python311", @@ -371,6 +375,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -403,7 +408,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "integration-tests-python", + "service": "ExampleTableWithStream", "span_id": "XXXX", "span_links": [ { @@ -460,6 +465,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python311", @@ -577,6 +585,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -602,7 +611,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "integration-tests-python", + "service": "eventbridge.custom.event.sender", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -626,6 +635,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python311", @@ -743,6 +755,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -778,7 +791,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -807,6 +820,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python311", @@ -924,6 +940,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -956,7 +973,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "integration-tests-python", + "service": "EXAMPLE", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -981,6 +998,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python311", @@ -1097,6 +1117,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A { "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1128,7 +1149,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "integration-tests-python", + "service": "example-bucket", "span_id": "XXXX", "span_links": [ { @@ -1164,6 +1185,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python311", @@ -1281,6 +1305,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1311,7 +1336,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "integration-tests-python", + "service": "sns-lambda", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1336,6 +1361,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python311", @@ -1453,6 +1481,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1482,7 +1511,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "integration-tests-python", + "service": "my-queue", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1507,6 +1536,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python311", @@ -1624,6 +1656,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1659,7 +1692,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1686,6 +1719,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python311", diff --git a/tests/integration/snapshots/logs/async-metrics_python312.log b/tests/integration/snapshots/logs/async-metrics_python312.log index 4b1b1319..8217a757 100644 --- a/tests/integration/snapshots/logs/async-metrics_python312.log +++ b/tests/integration/snapshots/logs/async-metrics_python312.log @@ -45,6 +45,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -79,7 +80,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "integration-tests-python", + "service": "XXXX.execute-api.us-east-2.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -108,6 +109,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python312", @@ -371,6 +375,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -403,7 +408,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "integration-tests-python", + "service": "ExampleTableWithStream", "span_id": "XXXX", "span_links": [ { @@ -460,6 +465,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python312", @@ -577,6 +585,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -602,7 +611,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "integration-tests-python", + "service": "eventbridge.custom.event.sender", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -626,6 +635,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python312", @@ -743,6 +755,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -778,7 +791,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -807,6 +820,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python312", @@ -924,6 +940,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -956,7 +973,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "integration-tests-python", + "service": "EXAMPLE", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -981,6 +998,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python312", @@ -1097,6 +1117,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A { "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1128,7 +1149,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "integration-tests-python", + "service": "example-bucket", "span_id": "XXXX", "span_links": [ { @@ -1164,6 +1185,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python312", @@ -1281,6 +1305,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1311,7 +1336,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "integration-tests-python", + "service": "sns-lambda", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1336,6 +1361,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python312", @@ -1453,6 +1481,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1482,7 +1511,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "integration-tests-python", + "service": "my-queue", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1507,6 +1536,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python312", @@ -1624,6 +1656,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1659,7 +1692,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1686,6 +1719,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python312", diff --git a/tests/integration/snapshots/logs/async-metrics_python313.log b/tests/integration/snapshots/logs/async-metrics_python313.log index 97ac1317..b1b5afd6 100644 --- a/tests/integration/snapshots/logs/async-metrics_python313.log +++ b/tests/integration/snapshots/logs/async-metrics_python313.log @@ -45,6 +45,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -79,7 +80,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "integration-tests-python", + "service": "XXXX.execute-api.us-east-2.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -108,6 +109,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python313", @@ -371,6 +375,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -403,7 +408,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "integration-tests-python", + "service": "ExampleTableWithStream", "span_id": "XXXX", "span_links": [ { @@ -460,6 +465,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python313", @@ -577,6 +585,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -602,7 +611,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "integration-tests-python", + "service": "eventbridge.custom.event.sender", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -626,6 +635,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python313", @@ -743,6 +755,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -778,7 +791,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -807,6 +820,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python313", @@ -924,6 +940,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -956,7 +973,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "integration-tests-python", + "service": "EXAMPLE", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -981,6 +998,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python313", @@ -1097,6 +1117,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A { "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1128,7 +1149,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "integration-tests-python", + "service": "example-bucket", "span_id": "XXXX", "span_links": [ { @@ -1164,6 +1185,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python313", @@ -1281,6 +1305,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1311,7 +1336,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "integration-tests-python", + "service": "sns-lambda", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1336,6 +1361,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python313", @@ -1453,6 +1481,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1482,7 +1511,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "integration-tests-python", + "service": "my-queue", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1507,6 +1536,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python313", @@ -1624,6 +1656,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1659,7 +1692,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1686,6 +1719,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python313", diff --git a/tests/integration/snapshots/logs/async-metrics_python314.log b/tests/integration/snapshots/logs/async-metrics_python314.log index cc69d5c5..51fb9799 100644 --- a/tests/integration/snapshots/logs/async-metrics_python314.log +++ b/tests/integration/snapshots/logs/async-metrics_python314.log @@ -45,6 +45,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -79,7 +80,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "integration-tests-python", + "service": "XXXX.execute-api.us-east-2.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -108,6 +109,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python314", @@ -371,6 +375,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -403,7 +408,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "integration-tests-python", + "service": "ExampleTableWithStream", "span_id": "XXXX", "span_links": [ { @@ -460,6 +465,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python314", @@ -577,6 +585,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -602,7 +611,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "integration-tests-python", + "service": "eventbridge.custom.event.sender", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -626,6 +635,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python314", @@ -743,6 +755,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -778,7 +791,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -807,6 +820,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python314", @@ -924,6 +940,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -956,7 +973,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "integration-tests-python", + "service": "EXAMPLE", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -981,6 +998,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python314", @@ -1097,6 +1117,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs { "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1128,7 +1149,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "integration-tests-python", + "service": "example-bucket", "span_id": "XXXX", "span_links": [ { @@ -1164,6 +1185,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python314", @@ -1281,6 +1305,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1311,7 +1336,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "integration-tests-python", + "service": "sns-lambda", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1336,6 +1361,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python314", @@ -1453,6 +1481,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1482,7 +1511,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "integration-tests-python", + "service": "my-queue", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1507,6 +1536,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python314", @@ -1624,6 +1656,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1659,7 +1692,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1686,6 +1719,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python314", diff --git a/tests/integration/snapshots/logs/async-metrics_python38.log b/tests/integration/snapshots/logs/async-metrics_python38.log index fa01a5f1..d086acb2 100644 --- a/tests/integration/snapshots/logs/async-metrics_python38.log +++ b/tests/integration/snapshots/logs/async-metrics_python38.log @@ -77,7 +77,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "integration-tests-python", + "service": "XXXX.execute-api.us-east-2.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -105,6 +105,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python38", @@ -384,7 +387,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "integration-tests-python", + "service": "ExampleTableWithStream", "span_id": "XXXX", "span_links": [ { @@ -440,6 +443,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python38", @@ -574,7 +580,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "integration-tests-python", + "service": "eventbridge.custom.event.sender", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -597,6 +603,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python38", @@ -741,7 +750,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -769,6 +778,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python38", @@ -910,7 +922,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "integration-tests-python", + "service": "EXAMPLE", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -934,6 +946,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python38", @@ -1073,7 +1088,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "integration-tests-python", + "service": "example-bucket", "span_id": "XXXX", "span_links": [ { @@ -1108,6 +1123,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python38", @@ -1247,7 +1265,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "integration-tests-python", + "service": "sns-lambda", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1271,6 +1289,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python38", @@ -1409,7 +1430,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "integration-tests-python", + "service": "my-queue", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1433,6 +1454,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python38", @@ -1577,7 +1601,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1603,6 +1627,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python38", diff --git a/tests/integration/snapshots/logs/async-metrics_python39.log b/tests/integration/snapshots/logs/async-metrics_python39.log index 4d86be91..1383dd98 100644 --- a/tests/integration/snapshots/logs/async-metrics_python39.log +++ b/tests/integration/snapshots/logs/async-metrics_python39.log @@ -77,7 +77,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "integration-tests-python", + "service": "XXXX.execute-api.us-east-2.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -105,6 +105,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python39", @@ -384,7 +387,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "integration-tests-python", + "service": "ExampleTableWithStream", "span_id": "XXXX", "span_links": [ { @@ -440,6 +443,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python39", @@ -574,7 +580,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "integration-tests-python", + "service": "eventbridge.custom.event.sender", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -597,6 +603,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python39", @@ -741,7 +750,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -769,6 +778,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python39", @@ -910,7 +922,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "integration-tests-python", + "service": "EXAMPLE", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -934,6 +946,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python39", @@ -1073,7 +1088,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "integration-tests-python", + "service": "example-bucket", "span_id": "XXXX", "span_links": [ { @@ -1108,6 +1123,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python39", @@ -1247,7 +1265,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "integration-tests-python", + "service": "sns-lambda", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1271,6 +1289,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python39", @@ -1409,7 +1430,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "integration-tests-python", + "service": "my-queue", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1433,6 +1454,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python39", @@ -1577,7 +1601,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1603,6 +1627,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-async-metrics_python39", diff --git a/tests/integration/snapshots/logs/sync-metrics_python310.log b/tests/integration/snapshots/logs/sync-metrics_python310.log index 5bf79798..e61f2015 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python310.log +++ b/tests/integration/snapshots/logs/sync-metrics_python310.log @@ -25,6 +25,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -59,7 +60,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "integration-tests-python", + "service": "XXXX.execute-api.us-east-2.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -88,6 +89,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python310", @@ -397,6 +401,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -429,7 +434,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "integration-tests-python", + "service": "ExampleTableWithStream", "span_id": "XXXX", "span_links": [ { @@ -486,6 +491,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python310", @@ -626,6 +634,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -651,7 +660,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "integration-tests-python", + "service": "eventbridge.custom.event.sender", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -675,6 +684,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python310", @@ -815,6 +827,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -850,7 +863,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -879,6 +892,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python310", @@ -1019,6 +1035,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1051,7 +1068,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "integration-tests-python", + "service": "EXAMPLE", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1076,6 +1093,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python310", @@ -1215,6 +1235,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A { "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1246,7 +1267,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "integration-tests-python", + "service": "example-bucket", "span_id": "XXXX", "span_links": [ { @@ -1282,6 +1303,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python310", @@ -1422,6 +1446,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1452,7 +1477,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "integration-tests-python", + "service": "sns-lambda", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1477,6 +1502,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python310", @@ -1617,6 +1645,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1646,7 +1675,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "integration-tests-python", + "service": "my-queue", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1671,6 +1700,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python310", @@ -1811,6 +1843,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1846,7 +1879,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1873,6 +1906,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python310", diff --git a/tests/integration/snapshots/logs/sync-metrics_python311.log b/tests/integration/snapshots/logs/sync-metrics_python311.log index 7bcdf78a..5f5c9ae9 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python311.log +++ b/tests/integration/snapshots/logs/sync-metrics_python311.log @@ -25,6 +25,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -59,7 +60,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "integration-tests-python", + "service": "XXXX.execute-api.us-east-2.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -88,6 +89,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python311", @@ -397,6 +401,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -429,7 +434,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "integration-tests-python", + "service": "ExampleTableWithStream", "span_id": "XXXX", "span_links": [ { @@ -486,6 +491,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python311", @@ -626,6 +634,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -651,7 +660,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "integration-tests-python", + "service": "eventbridge.custom.event.sender", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -675,6 +684,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python311", @@ -815,6 +827,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -850,7 +863,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -879,6 +892,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python311", @@ -1019,6 +1035,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1051,7 +1068,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "integration-tests-python", + "service": "EXAMPLE", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1076,6 +1093,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python311", @@ -1215,6 +1235,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A { "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1246,7 +1267,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "integration-tests-python", + "service": "example-bucket", "span_id": "XXXX", "span_links": [ { @@ -1282,6 +1303,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python311", @@ -1422,6 +1446,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1452,7 +1477,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "integration-tests-python", + "service": "sns-lambda", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1477,6 +1502,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python311", @@ -1617,6 +1645,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1646,7 +1675,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "integration-tests-python", + "service": "my-queue", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1671,6 +1700,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python311", @@ -1811,6 +1843,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1846,7 +1879,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1873,6 +1906,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python311", diff --git a/tests/integration/snapshots/logs/sync-metrics_python312.log b/tests/integration/snapshots/logs/sync-metrics_python312.log index 060e6b92..5d316187 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python312.log +++ b/tests/integration/snapshots/logs/sync-metrics_python312.log @@ -25,6 +25,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -59,7 +60,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "integration-tests-python", + "service": "XXXX.execute-api.us-east-2.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -88,6 +89,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python312", @@ -397,6 +401,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -429,7 +434,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "integration-tests-python", + "service": "ExampleTableWithStream", "span_id": "XXXX", "span_links": [ { @@ -486,6 +491,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python312", @@ -626,6 +634,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -651,7 +660,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "integration-tests-python", + "service": "eventbridge.custom.event.sender", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -675,6 +684,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python312", @@ -815,6 +827,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -850,7 +863,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -879,6 +892,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python312", @@ -1019,6 +1035,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1051,7 +1068,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "integration-tests-python", + "service": "EXAMPLE", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1076,6 +1093,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python312", @@ -1215,6 +1235,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A { "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1246,7 +1267,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "integration-tests-python", + "service": "example-bucket", "span_id": "XXXX", "span_links": [ { @@ -1282,6 +1303,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python312", @@ -1422,6 +1446,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1452,7 +1477,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "integration-tests-python", + "service": "sns-lambda", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1477,6 +1502,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python312", @@ -1617,6 +1645,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1646,7 +1675,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "integration-tests-python", + "service": "my-queue", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1671,6 +1700,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python312", @@ -1811,6 +1843,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1846,7 +1879,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1873,6 +1906,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python312", diff --git a/tests/integration/snapshots/logs/sync-metrics_python313.log b/tests/integration/snapshots/logs/sync-metrics_python313.log index eb651a8a..5f36fcaa 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python313.log +++ b/tests/integration/snapshots/logs/sync-metrics_python313.log @@ -25,6 +25,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -59,7 +60,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "integration-tests-python", + "service": "XXXX.execute-api.us-east-2.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -88,6 +89,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python313", @@ -397,6 +401,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -429,7 +434,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "integration-tests-python", + "service": "ExampleTableWithStream", "span_id": "XXXX", "span_links": [ { @@ -486,6 +491,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python313", @@ -626,6 +634,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -651,7 +660,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "integration-tests-python", + "service": "eventbridge.custom.event.sender", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -675,6 +684,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python313", @@ -815,6 +827,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -850,7 +863,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -879,6 +892,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python313", @@ -1019,6 +1035,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1051,7 +1068,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "integration-tests-python", + "service": "EXAMPLE", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1076,6 +1093,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python313", @@ -1215,6 +1235,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A { "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1246,7 +1267,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "integration-tests-python", + "service": "example-bucket", "span_id": "XXXX", "span_links": [ { @@ -1282,6 +1303,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python313", @@ -1422,6 +1446,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1452,7 +1477,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "integration-tests-python", + "service": "sns-lambda", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1477,6 +1502,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python313", @@ -1617,6 +1645,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1646,7 +1675,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "integration-tests-python", + "service": "my-queue", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1671,6 +1700,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python313", @@ -1811,6 +1843,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1846,7 +1879,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1873,6 +1906,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python313", diff --git a/tests/integration/snapshots/logs/sync-metrics_python314.log b/tests/integration/snapshots/logs/sync-metrics_python314.log index d8539ac8..f9b4399d 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python314.log +++ b/tests/integration/snapshots/logs/sync-metrics_python314.log @@ -25,6 +25,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -59,7 +60,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "integration-tests-python", + "service": "XXXX.execute-api.us-east-2.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -88,6 +89,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python314", @@ -397,6 +401,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -429,7 +434,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "integration-tests-python", + "service": "ExampleTableWithStream", "span_id": "XXXX", "span_links": [ { @@ -486,6 +491,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python314", @@ -626,6 +634,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -651,7 +660,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "integration-tests-python", + "service": "eventbridge.custom.event.sender", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -675,6 +684,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python314", @@ -815,6 +827,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -850,7 +863,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -879,6 +892,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python314", @@ -1019,6 +1035,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1051,7 +1068,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "integration-tests-python", + "service": "EXAMPLE", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1076,6 +1093,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python314", @@ -1215,6 +1235,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs { "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1246,7 +1267,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "integration-tests-python", + "service": "example-bucket", "span_id": "XXXX", "span_links": [ { @@ -1282,6 +1303,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python314", @@ -1422,6 +1446,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1452,7 +1477,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "integration-tests-python", + "service": "sns-lambda", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1477,6 +1502,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python314", @@ -1617,6 +1645,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1646,7 +1675,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "integration-tests-python", + "service": "my-queue", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1671,6 +1700,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python314", @@ -1811,6 +1843,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "error": 0, "meta": { + "_dd.base_service": "integration-tests-python", "_dd.origin": "lambda", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", @@ -1846,7 +1879,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1873,6 +1906,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python314", diff --git a/tests/integration/snapshots/logs/sync-metrics_python38.log b/tests/integration/snapshots/logs/sync-metrics_python38.log index 9d1eb30a..1293ded9 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python38.log +++ b/tests/integration/snapshots/logs/sync-metrics_python38.log @@ -57,7 +57,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "integration-tests-python", + "service": "XXXX.execute-api.us-east-2.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -85,6 +85,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python38", @@ -402,7 +405,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "integration-tests-python", + "service": "ExampleTableWithStream", "span_id": "XXXX", "span_links": [ { @@ -458,6 +461,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python38", @@ -611,7 +617,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "integration-tests-python", + "service": "eventbridge.custom.event.sender", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -634,6 +640,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python38", @@ -797,7 +806,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -825,6 +834,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python38", @@ -985,7 +997,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "integration-tests-python", + "service": "EXAMPLE", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1009,6 +1021,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python38", @@ -1167,7 +1182,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "integration-tests-python", + "service": "example-bucket", "span_id": "XXXX", "span_links": [ { @@ -1202,6 +1217,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python38", @@ -1360,7 +1378,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "integration-tests-python", + "service": "sns-lambda", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1384,6 +1402,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python38", @@ -1541,7 +1562,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "integration-tests-python", + "service": "my-queue", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1565,6 +1586,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python38", @@ -1728,7 +1752,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1754,6 +1778,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python38", diff --git a/tests/integration/snapshots/logs/sync-metrics_python39.log b/tests/integration/snapshots/logs/sync-metrics_python39.log index 945ee3f8..507eeda0 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python39.log +++ b/tests/integration/snapshots/logs/sync-metrics_python39.log @@ -57,7 +57,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway", "parent_id": "XXXX", "resource": "GET /", - "service": "integration-tests-python", + "service": "XXXX.execute-api.us-east-2.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -85,6 +85,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python39", @@ -402,7 +405,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.dynamodb", "parent_id": "XXXX", "resource": "ExampleTableWithStream", - "service": "integration-tests-python", + "service": "ExampleTableWithStream", "span_id": "XXXX", "span_links": [ { @@ -458,6 +461,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python39", @@ -611,7 +617,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.eventbridge", "parent_id": "XXXX", "resource": "eventbridge.custom.event.sender", - "service": "integration-tests-python", + "service": "eventbridge.custom.event.sender", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -634,6 +640,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python39", @@ -797,7 +806,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.httpapi", "parent_id": "XXXX", "resource": "GET /httpapi/get", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -825,6 +834,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python39", @@ -985,7 +997,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.kinesis", "parent_id": "XXXX", "resource": "EXAMPLE", - "service": "integration-tests-python", + "service": "EXAMPLE", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1009,6 +1021,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python39", @@ -1167,7 +1182,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.s3", "parent_id": "XXXX", "resource": "example-bucket", - "service": "integration-tests-python", + "service": "example-bucket", "span_id": "XXXX", "span_links": [ { @@ -1202,6 +1217,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python39", @@ -1360,7 +1378,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sns", "parent_id": "XXXX", "resource": "sns-lambda", - "service": "integration-tests-python", + "service": "sns-lambda", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1384,6 +1402,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python39", @@ -1541,7 +1562,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.sqs", "parent_id": "XXXX", "resource": "my-queue", - "service": "integration-tests-python", + "service": "my-queue", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1565,6 +1586,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python39", @@ -1728,7 +1752,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "name": "aws.apigateway.websocket", "parent_id": "XXXX", "resource": "$default", - "service": "integration-tests-python", + "service": "XXXX.execute-api.eu-west-1.amazonaws.com", "span_id": "XXXX", "start": "XXXX", "trace_id": "XXXX", @@ -1754,6 +1778,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.kind": "server", "span.name": "aws.lambda" }, + "metrics": { + "_dd.top_level": 1 + }, "name": "aws.lambda", "parent_id": "XXXX", "resource": "integration-tests-python-XXXX-sync-metrics_python39", diff --git a/tests/test_tracing.py b/tests/test_tracing.py index e2ba6664..4270c902 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -1549,34 +1549,23 @@ def test_determine_service_name(self): del os.environ["DD_SERVICE_MAPPING"] - def test_determine_service_name_prefers_dd_service(self): - # When DD_SERVICE is set, inferred spans always use the base service - # name (DD_SERVICE), regardless of any other configuration. + def test_determine_service_name_with_remove_integration_flag(self): + # By default (flag off), inferred spans use the AWS resource name even + # when DD_SERVICE is set. with patch("datadog_lambda.config.Config.service", "my-service"): self.assertEqual( determine_service_name( {}, "queue-name", "lambda_sqs", "queue-name", "sqs" ), - "my-service", - ) - - # DD_SERVICE takes precedence over an explicit service mapping. - self.assertEqual( - determine_service_name( - {"lambda_sqs": "mapped-service"}, - "queue-name", - "lambda_sqs", - "queue-name", - "sqs", - ), - "my-service", + "queue-name", ) - # DD_SERVICE takes precedence over a disabled AWS service - # representation. + # With DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED, inferred + # spans use DD_SERVICE instead of the AWS resource name. with patch( - "datadog_lambda.config.Config.aws_service_representation_enabled", - False, + "datadog_lambda.config.Config." + "remove_integration_service_names_enabled", + True, ): self.assertEqual( determine_service_name( @@ -1585,25 +1574,45 @@ def test_determine_service_name_prefers_dd_service(self): "my-service", ) - # When DD_SERVICE is not set, fall back to the existing behavior - # (service mapping, then AWS service representation / extracted key). + # An explicit service mapping still wins over DD_SERVICE. + self.assertEqual( + determine_service_name( + {"lambda_sqs": "mapped-service"}, + "queue-name", + "lambda_sqs", + "queue-name", + "sqs", + ), + "mapped-service", + ) + + # DD_SERVICE is used even when AWS service representation is + # disabled. + with patch( + "datadog_lambda.config.Config." + "aws_service_representation_enabled", + False, + ): + self.assertEqual( + determine_service_name( + {}, "queue-name", "lambda_sqs", "queue-name", "sqs" + ), + "my-service", + ) + + # When DD_SERVICE is not set, the flag has no effect (resource name). with patch("datadog_lambda.config.Config.service", None): - self.assertEqual( - determine_service_name( - {"lambda_sqs": "mapped-service"}, - "queue-name", - "lambda_sqs", + with patch( + "datadog_lambda.config.Config." + "remove_integration_service_names_enabled", + True, + ): + self.assertEqual( + determine_service_name( + {}, "queue-name", "lambda_sqs", "queue-name", "sqs" + ), "queue-name", - "sqs", - ), - "mapped-service", - ) - self.assertEqual( - determine_service_name( - {}, "queue-name", "lambda_sqs", "queue-name", "sqs" - ), - "queue-name", - ) + ) def test_remaps_all_inferred_span_service_names_from_api_gateway_event(self): new_service_mapping = {"lambda_api_gateway": "new-name"} @@ -1793,9 +1802,11 @@ def test_remaps_specific_inferred_span_service_names_from_sqs_event(self): self.assertEqual(span2.get_tag("operation_name"), "aws.sqs") self.assertEqual(span2.service, "different-sqs-url") - def test_create_inferred_span_uses_dd_service_when_set(self): - # When DD_SERVICE is set, inferred spans use it as the service, - # taking precedence over any AWS service representation or mapping. + def test_create_inferred_span_uses_dd_service_with_remove_integration_flag( + self, + ): + # With DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED and DD_SERVICE + # set, inferred spans use DD_SERVICE instead of the AWS resource name. event_sample_source = "sqs-string-msg-attribute" test_file = event_samples + event_sample_source + ".json" with open(test_file, "r") as event: @@ -1804,8 +1815,13 @@ def test_create_inferred_span_uses_dd_service_when_set(self): ctx = get_mock_context() ctx.aws_request_id = "123" - self.set_service_mapping({"lambda_sqs": "mapped-name"}) - with patch("datadog_lambda.config.Config.service", "my-dd-service"): + with patch( + "datadog_lambda.config.Config.service", "my-dd-service" + ), patch( + "datadog_lambda.config.Config." + "remove_integration_service_names_enabled", + True, + ): span = create_inferred_span(original_event, ctx) self.assertEqual(span.get_tag("operation_name"), "aws.sqs") self.assertEqual(span.service, "my-dd-service") From e1cfa5e85fd0b068541168f39267283a872a9c08 Mon Sep 17 00:00:00 2001 From: Zarir Hamza Date: Thu, 18 Jun 2026 17:52:12 -0400 Subject: [PATCH 6/6] style: apply black formatting to test_tracing.py --- tests/test_tracing.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/test_tracing.py b/tests/test_tracing.py index 4270c902..f0579da7 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -1815,11 +1815,8 @@ def test_create_inferred_span_uses_dd_service_with_remove_integration_flag( ctx = get_mock_context() ctx.aws_request_id = "123" - with patch( - "datadog_lambda.config.Config.service", "my-dd-service" - ), patch( - "datadog_lambda.config.Config." - "remove_integration_service_names_enabled", + with patch("datadog_lambda.config.Config.service", "my-dd-service"), patch( + "datadog_lambda.config.Config." "remove_integration_service_names_enabled", True, ): span = create_inferred_span(original_event, ctx)