From 51c92f7b1c76494bbcf7534ac2957196bf8ac263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?jordan=20gonz=C3=A1lez?= <30836115+duncanista@users.noreply.github.com> Date: Tue, 23 May 2023 15:45:39 -0400 Subject: [PATCH 1/8] update fallback service on wrapping --- datadog_lambda/wrapper.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/datadog_lambda/wrapper.py b/datadog_lambda/wrapper.py index 57b540f6..4dae5c86 100644 --- a/datadog_lambda/wrapper.py +++ b/datadog_lambda/wrapper.py @@ -54,8 +54,6 @@ dd_capture_lambda_payload_enabled = ( os.environ.get("DD_CAPTURE_LAMBDA_PAYLOAD", "false").lower() == "true" ) -service_env_var = os.environ.get("DD_SERVICE", "DefaultServiceName") -env_env_var = os.environ.get("DD_ENV", None) DD_FLUSH_TO_LOG = "DD_FLUSH_TO_LOG" DD_LOGS_INJECTION = "DD_LOGS_INJECTION" @@ -70,6 +68,11 @@ DD_COLD_START_TRACE_SKIP_LIB = "DD_COLD_START_TRACE_SKIP_LIB" DD_REQUESTS_SERVICE_NAME = "DD_REQUESTS_SERVICE_NAME" DD_SERVICE = "DD_SERVICE" +DD_ENV = "DD_ENV" + +env_env_var = os.environ.get(DD_ENV, None) +function_env_var = os.environ.get(AWS_LAMBDA_FUNCTION_NAME, "function") +service_env_var = os.environ.get(DD_SERVICE, function_env_var) """ Usage: @@ -131,7 +134,7 @@ def __init__(self, func): self.merge_xray_traces = ( os.environ.get(DD_MERGE_XRAY_TRACES, "false").lower() == "true" ) - self.function_name = os.environ.get(AWS_LAMBDA_FUNCTION_NAME, "function") + self.function_name = function_env_var self.extractor_env = os.environ.get(DD_TRACE_EXTRACTOR, None) self.trace_extractor = None self.span = None From d91cf97b3eed25437a097599afd2a4a443bc73c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?jordan=20gonz=C3=A1lez?= <30836115+duncanista@users.noreply.github.com> Date: Tue, 23 May 2023 15:45:54 -0400 Subject: [PATCH 2/8] add `peer.service` for inferred spans --- datadog_lambda/tracing.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/datadog_lambda/tracing.py b/datadog_lambda/tracing.py index 7879697e..9a1c0ea7 100644 --- a/datadog_lambda/tracing.py +++ b/datadog_lambda/tracing.py @@ -43,9 +43,15 @@ logger = logging.getLogger(__name__) +AWS_LAMBDA_FUNCTION_NAME = "AWS_LAMBDA_FUNCTION_NAME" +DD_SERVICE = "DD_SERVICE" + dd_trace_context = {} dd_tracing_enabled = os.environ.get("DD_TRACE_ENABLED", "false").lower() == "true" +function_env_var = os.environ.get(AWS_LAMBDA_FUNCTION_NAME, "function") +service_env_var = os.environ.get(DD_SERVICE, function_env_var) + propagator = HTTPPropagator() @@ -698,6 +704,7 @@ def create_inferred_span_from_lambda_function_url_event(event, context): "http.method": method, "resource_names": domain + path, "request_id": context.aws_request_id, + "peer.service": service_env_var, } request_time_epoch = request_context.get("timeEpoch") args = { @@ -802,6 +809,7 @@ def create_inferred_span_from_api_gateway_websocket_event( "connection_id": request_context.get("connectionId"), "event_type": request_context.get("eventType"), "message_direction": request_context.get("messageDirection"), + "peer.service": service_env_var, } request_time_epoch_ms = int(request_context.get("requestTimeEpoch")) if is_api_gateway_invocation_async(event): @@ -851,6 +859,7 @@ def create_inferred_span_from_api_gateway_event( "apiname": request_context.get("apiId"), "stage": request_context.get("stage"), "request_id": context.aws_request_id, + "peer.service": service_env_var, } request_time_epoch_ms = int(request_context.get("requestTimeEpoch")) if is_api_gateway_invocation_async(event): @@ -904,6 +913,7 @@ def create_inferred_span_from_http_api_event( "apiid": request_context.get("apiId"), "apiname": request_context.get("apiId"), "stage": request_context.get("stage"), + "peer.service": service_env_var, } request_time_epoch_ms = int(request_context.get("timeEpoch")) if is_api_gateway_invocation_async(event): @@ -943,6 +953,7 @@ def create_inferred_span_from_sqs_event(event, context): "event_source_arn": event_source_arn, "receipt_handle": event_record.get("receiptHandle"), "sender_id": event_record.get("attributes", {}).get("SenderId"), + "peer.service": service_env_var, } InferredSpanInfo.set_tags(tags, tag_source="self", synchronicity="async") request_time_epoch = event_record.get("attributes", {}).get("SentTimestamp") @@ -997,6 +1008,7 @@ def create_inferred_span_from_sns_event(event, context): "topic_arn": topic_arn, "message_id": sns_message.get("MessageId"), "type": sns_message.get("Type"), + "peer.service": service_env_var, } # Subject not available in SNS => SQS scenario @@ -1037,6 +1049,7 @@ def create_inferred_span_from_kinesis_event(event, context): "event_name": event_record.get("eventName"), "event_version": event_record.get("eventVersion"), "partition_key": event_record.get("kinesis", {}).get("partitionKey"), + "peer.service": service_env_var, } InferredSpanInfo.set_tags(tags, tag_source="self", synchronicity="async") request_time_epoch = event_record.get("kinesis", {}).get( @@ -1071,6 +1084,7 @@ def create_inferred_span_from_dynamodb_event(event, context): "event_version": event_record.get("eventVersion"), "stream_view_type": dynamodb_message.get("StreamViewType"), "size_bytes": str(dynamodb_message.get("SizeBytes")), + "peer.service": service_env_var, } InferredSpanInfo.set_tags(tags, synchronicity="async", tag_source="self") request_time_epoch = event_record.get("dynamodb", {}).get( @@ -1102,6 +1116,7 @@ def create_inferred_span_from_s3_event(event, context): "object_key": event_record.get("s3", {}).get("object", {}).get("key"), "object_size": str(event_record.get("s3", {}).get("object", {}).get("size")), "object_etag": event_record.get("s3", {}).get("object", {}).get("eTag"), + "peer.service": service_env_var, } InferredSpanInfo.set_tags(tags, synchronicity="async", tag_source="self") dt_format = "%Y-%m-%dT%H:%M:%S.%fZ" @@ -1127,6 +1142,7 @@ def create_inferred_span_from_eventbridge_event(event, context): "operation_name": "aws.eventbridge", "resource_names": source, "detail_type": event.get("detail-type"), + "peer.service": service_env_var, } InferredSpanInfo.set_tags( tags, From 4bf4458298b36c73b7c098cfff5d84c4e1bdedd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?jordan=20gonz=C3=A1lez?= <30836115+duncanista@users.noreply.github.com> Date: Tue, 23 May 2023 16:50:54 -0400 Subject: [PATCH 3/8] add tests --- tests/test_tracing.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/test_tracing.py b/tests/test_tracing.py index e19c66aa..5edb2fff 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -764,6 +764,7 @@ def test_create_inferred_span_from_api_gateway_event(self): self.assertEqual(span.span_type, "http") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "sync") + self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_api_gateway_non_proxy_event_async(self): event_sample_source = "api-gateway-non-proxy-async" @@ -796,6 +797,7 @@ def test_create_inferred_span_from_api_gateway_non_proxy_event_async(self): self.assertEqual(span.span_type, "http") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async") + self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_api_gateway_non_proxy_event_sync(self): event_sample_source = "api-gateway-non-proxy" @@ -828,6 +830,7 @@ def test_create_inferred_span_from_api_gateway_non_proxy_event_sync(self): self.assertEqual(span.span_type, "http") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "sync") + self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_http_api_event(self): event_sample_source = "http-api" @@ -863,6 +866,7 @@ def test_create_inferred_span_from_http_api_event(self): self.assertEqual(span.span_type, "http") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "sync") + self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_api_gateway_websocket_default_event(self): event_sample_source = "api-gateway-websocket-default" @@ -898,6 +902,7 @@ def test_create_inferred_span_from_api_gateway_websocket_default_event(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "sync") + self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_api_gateway_websocket_connect_event(self): event_sample_source = "api-gateway-websocket-connect" @@ -933,6 +938,7 @@ def test_create_inferred_span_from_api_gateway_websocket_connect_event(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "sync") + self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_api_gateway_websocket_disconnect_event(self): event_sample_source = "api-gateway-websocket-disconnect" @@ -968,6 +974,7 @@ def test_create_inferred_span_from_api_gateway_websocket_disconnect_event(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "sync") + self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_sqs_event_string_msg_attr(self): event_sample_name = "sqs-string-msg-attribute" @@ -1006,6 +1013,7 @@ def test_create_inferred_span_from_sqs_event_string_msg_attr(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async") + self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_sns_event_string_msg_attr(self): event_sample_name = "sns-string-msg-attribute" @@ -1044,6 +1052,7 @@ def test_create_inferred_span_from_sns_event_string_msg_attr(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async") + self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_sns_event_b64_msg_attr(self): event_sample_name = "sns-b64-msg-attribute" @@ -1082,6 +1091,7 @@ def test_create_inferred_span_from_sns_event_b64_msg_attr(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async") + self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_kinesis_event(self): event_sample_source = "kinesis" @@ -1124,6 +1134,7 @@ def test_create_inferred_span_from_kinesis_event(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async") + self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_dynamodb_event(self): event_sample_source = "dynamodb" @@ -1163,6 +1174,7 @@ def test_create_inferred_span_from_dynamodb_event(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async") + self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_s3_event(self): event_sample_source = "s3" @@ -1200,6 +1212,7 @@ def test_create_inferred_span_from_s3_event(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async") + self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_eventbridge_event(self): event_sample_source = "eventbridge-custom" @@ -1229,6 +1242,7 @@ def test_create_inferred_span_from_eventbridge_event(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async") + self.assertEqual(span.get_tag("peer.service"), "function") def test_extract_context_from_eventbridge_event(self): event_sample_source = "eventbridge-custom" From 6f74908584dc8a937cfe026b4807b4a71dffc08e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?jordan=20gonz=C3=A1lez?= <30836115+duncanista@users.noreply.github.com> Date: Wed, 24 May 2023 13:06:28 -0400 Subject: [PATCH 4/8] update integration tests --- .../snapshots/logs/async-metrics_python310.log | 9 +++++++++ .../snapshots/logs/async-metrics_python37.log | 9 +++++++++ .../snapshots/logs/async-metrics_python38.log | 9 +++++++++ .../snapshots/logs/async-metrics_python39.log | 9 +++++++++ .../snapshots/logs/sync-metrics_python310.log | 13 +++++++++++-- .../snapshots/logs/sync-metrics_python37.log | 11 ++++++++++- .../snapshots/logs/sync-metrics_python38.log | 9 +++++++++ .../snapshots/logs/sync-metrics_python39.log | 11 ++++++++++- 8 files changed, 76 insertions(+), 4 deletions(-) diff --git a/tests/integration/snapshots/logs/async-metrics_python310.log b/tests/integration/snapshots/logs/async-metrics_python310.log index a7ad8826..fb5b0b26 100644 --- a/tests/integration/snapshots/logs/async-metrics_python310.log +++ b/tests/integration/snapshots/logs/async-metrics_python310.log @@ -63,6 +63,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiname": "XXXX", "stage": "Prod", "request_id": "XXXX", + "peer.service": "integration-tests-python-XXXX-async-metrics_python310", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", @@ -226,6 +227,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_version": "1.1", "stream_view_type": "NEW_AND_OLD_IMAGES", "size_bytes": "26", + "peer.service": "integration-tests-python-XXXX-async-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -378,6 +380,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "detail_type": "testdetail", + "peer.service": "integration-tests-python-XXXX-async-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -538,6 +541,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiid": "XXXX", "apiname": "XXXX", "stage": "$default", + "peer.service": "integration-tests-python-XXXX-async-metrics_python310", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", @@ -701,6 +705,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_name": "aws:kinesis:record", "event_version": "1.0", "partition_key": "XXXX", + "peer.service": "integration-tests-python-XXXX-async-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -856,6 +861,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "object_key": "test/key", "object_size": "1024", "object_etag": "XXXX", + "peer.service": "integration-tests-python-XXXX-async-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -1011,6 +1017,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "message_id": "XXXX", "type": "Notification", + "peer.service": "integration-tests-python-XXXX-async-metrics_python310", "subject": "TestInvoke", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", @@ -1167,6 +1174,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...", "sender_id": "AIDAIENQZJOLO23YVJ4VO", + "peer.service": "integration-tests-python-XXXX-async-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -1327,6 +1335,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "connection_id": "XXXX=", "event_type": "MESSAGE", "message_direction": "IN", + "peer.service": "integration-tests-python-XXXX-async-metrics_python310", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", diff --git a/tests/integration/snapshots/logs/async-metrics_python37.log b/tests/integration/snapshots/logs/async-metrics_python37.log index 46a4f336..0cab43b6 100644 --- a/tests/integration/snapshots/logs/async-metrics_python37.log +++ b/tests/integration/snapshots/logs/async-metrics_python37.log @@ -63,6 +63,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiname": "XXXX", "stage": "Prod", "request_id": "XXXX", + "peer.service": "integration-tests-python-XXXX-async-metrics_python37", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", @@ -226,6 +227,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_version": "1.1", "stream_view_type": "NEW_AND_OLD_IMAGES", "size_bytes": "26", + "peer.service": "integration-tests-python-XXXX-async-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -378,6 +380,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "detail_type": "testdetail", + "peer.service": "integration-tests-python-XXXX-async-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -538,6 +541,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiid": "XXXX", "apiname": "XXXX", "stage": "$default", + "peer.service": "integration-tests-python-XXXX-async-metrics_python37", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", @@ -701,6 +705,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_name": "aws:kinesis:record", "event_version": "1.0", "partition_key": "XXXX", + "peer.service": "integration-tests-python-XXXX-async-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -856,6 +861,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "object_key": "test/key", "object_size": "1024", "object_etag": "XXXX", + "peer.service": "integration-tests-python-XXXX-async-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -1011,6 +1017,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "message_id": "XXXX", "type": "Notification", + "peer.service": "integration-tests-python-XXXX-async-metrics_python37", "subject": "TestInvoke", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", @@ -1167,6 +1174,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...", "sender_id": "AIDAIENQZJOLO23YVJ4VO", + "peer.service": "integration-tests-python-XXXX-async-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -1327,6 +1335,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "connection_id": "XXXX=", "event_type": "MESSAGE", "message_direction": "IN", + "peer.service": "integration-tests-python-XXXX-async-metrics_python37", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", diff --git a/tests/integration/snapshots/logs/async-metrics_python38.log b/tests/integration/snapshots/logs/async-metrics_python38.log index f27dfcd9..74cf3ce3 100644 --- a/tests/integration/snapshots/logs/async-metrics_python38.log +++ b/tests/integration/snapshots/logs/async-metrics_python38.log @@ -63,6 +63,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiname": "XXXX", "stage": "Prod", "request_id": "XXXX", + "peer.service": "integration-tests-python-XXXX-async-metrics_python38", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", @@ -226,6 +227,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_version": "1.1", "stream_view_type": "NEW_AND_OLD_IMAGES", "size_bytes": "26", + "peer.service": "integration-tests-python-XXXX-async-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -378,6 +380,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "detail_type": "testdetail", + "peer.service": "integration-tests-python-XXXX-async-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -538,6 +541,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiid": "XXXX", "apiname": "XXXX", "stage": "$default", + "peer.service": "integration-tests-python-XXXX-async-metrics_python38", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", @@ -701,6 +705,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_name": "aws:kinesis:record", "event_version": "1.0", "partition_key": "XXXX", + "peer.service": "integration-tests-python-XXXX-async-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -856,6 +861,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "object_key": "test/key", "object_size": "1024", "object_etag": "XXXX", + "peer.service": "integration-tests-python-XXXX-async-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -1011,6 +1017,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "message_id": "XXXX", "type": "Notification", + "peer.service": "integration-tests-python-XXXX-async-metrics_python38", "subject": "TestInvoke", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", @@ -1167,6 +1174,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...", "sender_id": "AIDAIENQZJOLO23YVJ4VO", + "peer.service": "integration-tests-python-XXXX-async-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -1327,6 +1335,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "connection_id": "XXXX=", "event_type": "MESSAGE", "message_direction": "IN", + "peer.service": "integration-tests-python-XXXX-async-metrics_python38", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", diff --git a/tests/integration/snapshots/logs/async-metrics_python39.log b/tests/integration/snapshots/logs/async-metrics_python39.log index 1968de5e..40a1f3d5 100644 --- a/tests/integration/snapshots/logs/async-metrics_python39.log +++ b/tests/integration/snapshots/logs/async-metrics_python39.log @@ -63,6 +63,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiname": "XXXX", "stage": "Prod", "request_id": "XXXX", + "peer.service": "integration-tests-python-XXXX-async-metrics_python39", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", @@ -226,6 +227,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_version": "1.1", "stream_view_type": "NEW_AND_OLD_IMAGES", "size_bytes": "26", + "peer.service": "integration-tests-python-XXXX-async-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -378,6 +380,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "detail_type": "testdetail", + "peer.service": "integration-tests-python-XXXX-async-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -538,6 +541,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiid": "XXXX", "apiname": "XXXX", "stage": "$default", + "peer.service": "integration-tests-python-XXXX-async-metrics_python39", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", @@ -701,6 +705,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_name": "aws:kinesis:record", "event_version": "1.0", "partition_key": "XXXX", + "peer.service": "integration-tests-python-XXXX-async-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -856,6 +861,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "object_key": "test/key", "object_size": "1024", "object_etag": "XXXX", + "peer.service": "integration-tests-python-XXXX-async-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -1011,6 +1017,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "message_id": "XXXX", "type": "Notification", + "peer.service": "integration-tests-python-XXXX-async-metrics_python39", "subject": "TestInvoke", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", @@ -1167,6 +1174,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...", "sender_id": "AIDAIENQZJOLO23YVJ4VO", + "peer.service": "integration-tests-python-XXXX-async-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -1327,6 +1335,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "connection_id": "XXXX=", "event_type": "MESSAGE", "message_direction": "IN", + "peer.service": "integration-tests-python-XXXX-async-metrics_python39", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", diff --git a/tests/integration/snapshots/logs/sync-metrics_python310.log b/tests/integration/snapshots/logs/sync-metrics_python310.log index a8266552..0abb8605 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python310.log +++ b/tests/integration/snapshots/logs/sync-metrics_python310.log @@ -43,6 +43,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiname": "XXXX", "stage": "Prod", "request_id": "XXXX", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python310", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", @@ -224,6 +225,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_version": "1.1", "stream_view_type": "NEW_AND_OLD_IMAGES", "size_bytes": "26", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -394,6 +396,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "detail_type": "testdetail", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -572,6 +575,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiid": "XXXX", "apiname": "XXXX", "stage": "$default", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python310", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", @@ -753,6 +757,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_name": "aws:kinesis:record", "event_version": "1.0", "partition_key": "XXXX", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -926,6 +931,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "object_key": "test/key", "object_size": "1024", "object_etag": "XXXX", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -1099,6 +1105,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "message_id": "XXXX", "type": "Notification", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python310", "subject": "TestInvoke", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", @@ -1194,6 +1201,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] } HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}]} +END Duration: XXXX ms Memory Used: XXXX MB { "traces": [ [ @@ -1231,7 +1239,6 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept ] ] } -END Duration: XXXX ms Memory Used: XXXX MB START { "m": "aws.lambda.enhanced.invocations", @@ -1273,6 +1280,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...", "sender_id": "AIDAIENQZJOLO23YVJ4VO", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -1367,6 +1375,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] } HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}]} +END Duration: XXXX ms Memory Used: XXXX MB { "traces": [ [ @@ -1404,7 +1413,6 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept ] ] } -END Duration: XXXX ms Memory Used: XXXX MB START { "m": "aws.lambda.enhanced.invocations", @@ -1451,6 +1459,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "connection_id": "XXXX=", "event_type": "MESSAGE", "message_direction": "IN", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python310", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", diff --git a/tests/integration/snapshots/logs/sync-metrics_python37.log b/tests/integration/snapshots/logs/sync-metrics_python37.log index 33853293..33a970bb 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python37.log +++ b/tests/integration/snapshots/logs/sync-metrics_python37.log @@ -43,6 +43,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiname": "XXXX", "stage": "Prod", "request_id": "XXXX", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python37", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", @@ -224,6 +225,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_version": "1.1", "stream_view_type": "NEW_AND_OLD_IMAGES", "size_bytes": "26", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -394,6 +396,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "detail_type": "testdetail", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -572,6 +575,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiid": "XXXX", "apiname": "XXXX", "stage": "$default", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python37", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", @@ -753,6 +757,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_name": "aws:kinesis:record", "event_version": "1.0", "partition_key": "XXXX", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -926,6 +931,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "object_key": "test/key", "object_size": "1024", "object_etag": "XXXX", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -1099,6 +1105,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "message_id": "XXXX", "type": "Notification", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python37", "subject": "TestInvoke", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", @@ -1273,6 +1280,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...", "sender_id": "AIDAIENQZJOLO23YVJ4VO", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -1367,6 +1375,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] } HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}]} +END Duration: XXXX ms Memory Used: XXXX MB { "traces": [ [ @@ -1404,7 +1413,6 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept ] ] } -END Duration: XXXX ms Memory Used: XXXX MB START { "m": "aws.lambda.enhanced.invocations", @@ -1451,6 +1459,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "connection_id": "XXXX=", "event_type": "MESSAGE", "message_direction": "IN", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python37", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", diff --git a/tests/integration/snapshots/logs/sync-metrics_python38.log b/tests/integration/snapshots/logs/sync-metrics_python38.log index c62928a3..3f9db12b 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python38.log +++ b/tests/integration/snapshots/logs/sync-metrics_python38.log @@ -43,6 +43,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiname": "XXXX", "stage": "Prod", "request_id": "XXXX", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python38", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", @@ -224,6 +225,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_version": "1.1", "stream_view_type": "NEW_AND_OLD_IMAGES", "size_bytes": "26", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -394,6 +396,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "detail_type": "testdetail", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -572,6 +575,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiid": "XXXX", "apiname": "XXXX", "stage": "$default", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python38", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", @@ -753,6 +757,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_name": "aws:kinesis:record", "event_version": "1.0", "partition_key": "XXXX", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -926,6 +931,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "object_key": "test/key", "object_size": "1024", "object_etag": "XXXX", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -1099,6 +1105,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "message_id": "XXXX", "type": "Notification", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python38", "subject": "TestInvoke", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", @@ -1273,6 +1280,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...", "sender_id": "AIDAIENQZJOLO23YVJ4VO", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -1451,6 +1459,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "connection_id": "XXXX=", "event_type": "MESSAGE", "message_direction": "IN", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python38", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", diff --git a/tests/integration/snapshots/logs/sync-metrics_python39.log b/tests/integration/snapshots/logs/sync-metrics_python39.log index fbde4bcd..d0aa2057 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python39.log +++ b/tests/integration/snapshots/logs/sync-metrics_python39.log @@ -43,6 +43,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiname": "XXXX", "stage": "Prod", "request_id": "XXXX", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python39", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", @@ -142,7 +143,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] } HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}]} -END Duration: XXXX ms (init: XXXX ms) Memory Used: XXXX MB { "traces": [ [ @@ -180,6 +180,7 @@ END Duration: XXXX ms (init: XXXX ms) Memory Used: XXXX MB ] ] } +END Duration: XXXX ms (init: XXXX ms) Memory Used: XXXX MB START { "m": "aws.lambda.enhanced.invocations", @@ -224,6 +225,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_version": "1.1", "stream_view_type": "NEW_AND_OLD_IMAGES", "size_bytes": "26", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -394,6 +396,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "detail_type": "testdetail", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -572,6 +575,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiid": "XXXX", "apiname": "XXXX", "stage": "$default", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python39", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", @@ -753,6 +757,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_name": "aws:kinesis:record", "event_version": "1.0", "partition_key": "XXXX", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -926,6 +931,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "object_key": "test/key", "object_size": "1024", "object_etag": "XXXX", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -1099,6 +1105,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "message_id": "XXXX", "type": "Notification", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python39", "subject": "TestInvoke", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", @@ -1273,6 +1280,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...", "sender_id": "AIDAIENQZJOLO23YVJ4VO", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", "_dd.p.dm": "-0", @@ -1451,6 +1459,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "connection_id": "XXXX=", "event_type": "MESSAGE", "message_direction": "IN", + "peer.service": "integration-tests-python-XXXX-sync-metrics_python39", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", From db7e66d99c6078ea695f76395dc5105a3bc3e836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?jordan=20gonz=C3=A1lez?= <30836115+duncanista@users.noreply.github.com> Date: Wed, 31 May 2023 16:14:12 -0400 Subject: [PATCH 5/8] change fallback to previous value this should be handled in a profiling PR --- datadog_lambda/wrapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datadog_lambda/wrapper.py b/datadog_lambda/wrapper.py index 4dae5c86..c033e216 100644 --- a/datadog_lambda/wrapper.py +++ b/datadog_lambda/wrapper.py @@ -72,7 +72,7 @@ env_env_var = os.environ.get(DD_ENV, None) function_env_var = os.environ.get(AWS_LAMBDA_FUNCTION_NAME, "function") -service_env_var = os.environ.get(DD_SERVICE, function_env_var) +service_env_var = os.environ.get(DD_SERVICE, "DefaultServiceName") """ Usage: From 5bf492b7120c9ee115402656d8dca72e50974d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?jordan=20gonz=C3=A1lez?= <30836115+duncanista@users.noreply.github.com> Date: Mon, 5 Jun 2023 11:11:12 -0400 Subject: [PATCH 6/8] remove logic from `tracing.py` --- datadog_lambda/tracing.py | 16 ---------------- tests/test_tracing.py | 14 -------------- 2 files changed, 30 deletions(-) diff --git a/datadog_lambda/tracing.py b/datadog_lambda/tracing.py index 8078ad8a..eca0e10b 100644 --- a/datadog_lambda/tracing.py +++ b/datadog_lambda/tracing.py @@ -43,15 +43,9 @@ logger = logging.getLogger(__name__) -AWS_LAMBDA_FUNCTION_NAME = "AWS_LAMBDA_FUNCTION_NAME" -DD_SERVICE = "DD_SERVICE" - dd_trace_context = {} dd_tracing_enabled = os.environ.get("DD_TRACE_ENABLED", "false").lower() == "true" -function_env_var = os.environ.get(AWS_LAMBDA_FUNCTION_NAME, "function") -service_env_var = os.environ.get(DD_SERVICE, function_env_var) - propagator = HTTPPropagator() @@ -703,7 +697,6 @@ def create_inferred_span_from_lambda_function_url_event(event, context): "http.method": method, "resource_names": domain + path, "request_id": context.aws_request_id, - "peer.service": service_env_var, } request_time_epoch = request_context.get("timeEpoch") args = { @@ -808,7 +801,6 @@ def create_inferred_span_from_api_gateway_websocket_event( "connection_id": request_context.get("connectionId"), "event_type": request_context.get("eventType"), "message_direction": request_context.get("messageDirection"), - "peer.service": service_env_var, } request_time_epoch_ms = int(request_context.get("requestTimeEpoch")) if is_api_gateway_invocation_async(event): @@ -858,7 +850,6 @@ def create_inferred_span_from_api_gateway_event( "apiname": request_context.get("apiId"), "stage": request_context.get("stage"), "request_id": context.aws_request_id, - "peer.service": service_env_var, } request_time_epoch_ms = int(request_context.get("requestTimeEpoch")) if is_api_gateway_invocation_async(event): @@ -912,7 +903,6 @@ def create_inferred_span_from_http_api_event( "apiid": request_context.get("apiId"), "apiname": request_context.get("apiId"), "stage": request_context.get("stage"), - "peer.service": service_env_var, } request_time_epoch_ms = int(request_context.get("timeEpoch")) if is_api_gateway_invocation_async(event): @@ -952,7 +942,6 @@ def create_inferred_span_from_sqs_event(event, context): "event_source_arn": event_source_arn, "receipt_handle": event_record.get("receiptHandle"), "sender_id": event_record.get("attributes", {}).get("SenderId"), - "peer.service": service_env_var, } InferredSpanInfo.set_tags(tags, tag_source="self", synchronicity="async") request_time_epoch = event_record.get("attributes", {}).get("SentTimestamp") @@ -1007,7 +996,6 @@ def create_inferred_span_from_sns_event(event, context): "topic_arn": topic_arn, "message_id": sns_message.get("MessageId"), "type": sns_message.get("Type"), - "peer.service": service_env_var, } # Subject not available in SNS => SQS scenario @@ -1048,7 +1036,6 @@ def create_inferred_span_from_kinesis_event(event, context): "event_name": event_record.get("eventName"), "event_version": event_record.get("eventVersion"), "partition_key": event_record.get("kinesis", {}).get("partitionKey"), - "peer.service": service_env_var, } InferredSpanInfo.set_tags(tags, tag_source="self", synchronicity="async") request_time_epoch = event_record.get("kinesis", {}).get( @@ -1083,7 +1070,6 @@ def create_inferred_span_from_dynamodb_event(event, context): "event_version": event_record.get("eventVersion"), "stream_view_type": dynamodb_message.get("StreamViewType"), "size_bytes": str(dynamodb_message.get("SizeBytes")), - "peer.service": service_env_var, } InferredSpanInfo.set_tags(tags, synchronicity="async", tag_source="self") request_time_epoch = event_record.get("dynamodb", {}).get( @@ -1115,7 +1101,6 @@ def create_inferred_span_from_s3_event(event, context): "object_key": event_record.get("s3", {}).get("object", {}).get("key"), "object_size": str(event_record.get("s3", {}).get("object", {}).get("size")), "object_etag": event_record.get("s3", {}).get("object", {}).get("eTag"), - "peer.service": service_env_var, } InferredSpanInfo.set_tags(tags, synchronicity="async", tag_source="self") dt_format = "%Y-%m-%dT%H:%M:%S.%fZ" @@ -1141,7 +1126,6 @@ def create_inferred_span_from_eventbridge_event(event, context): "operation_name": "aws.eventbridge", "resource_names": source, "detail_type": event.get("detail-type"), - "peer.service": service_env_var, } InferredSpanInfo.set_tags( tags, diff --git a/tests/test_tracing.py b/tests/test_tracing.py index 1538a654..07a053fa 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -805,7 +805,6 @@ def test_create_inferred_span_from_api_gateway_event(self): self.assertEqual(span.span_type, "http") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "sync") - self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_api_gateway_non_proxy_event_async(self): event_sample_source = "api-gateway-non-proxy-async" @@ -838,7 +837,6 @@ def test_create_inferred_span_from_api_gateway_non_proxy_event_async(self): self.assertEqual(span.span_type, "http") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async") - self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_api_gateway_non_proxy_event_sync(self): event_sample_source = "api-gateway-non-proxy" @@ -871,7 +869,6 @@ def test_create_inferred_span_from_api_gateway_non_proxy_event_sync(self): self.assertEqual(span.span_type, "http") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "sync") - self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_http_api_event(self): event_sample_source = "http-api" @@ -907,7 +904,6 @@ def test_create_inferred_span_from_http_api_event(self): self.assertEqual(span.span_type, "http") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "sync") - self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_api_gateway_websocket_default_event(self): event_sample_source = "api-gateway-websocket-default" @@ -943,7 +939,6 @@ def test_create_inferred_span_from_api_gateway_websocket_default_event(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "sync") - self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_api_gateway_websocket_connect_event(self): event_sample_source = "api-gateway-websocket-connect" @@ -979,7 +974,6 @@ def test_create_inferred_span_from_api_gateway_websocket_connect_event(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "sync") - self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_api_gateway_websocket_disconnect_event(self): event_sample_source = "api-gateway-websocket-disconnect" @@ -1015,7 +1009,6 @@ def test_create_inferred_span_from_api_gateway_websocket_disconnect_event(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "sync") - self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_sqs_event_string_msg_attr(self): event_sample_name = "sqs-string-msg-attribute" @@ -1054,7 +1047,6 @@ def test_create_inferred_span_from_sqs_event_string_msg_attr(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async") - self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_sns_event_string_msg_attr(self): event_sample_name = "sns-string-msg-attribute" @@ -1093,7 +1085,6 @@ def test_create_inferred_span_from_sns_event_string_msg_attr(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async") - self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_sns_event_b64_msg_attr(self): event_sample_name = "sns-b64-msg-attribute" @@ -1132,7 +1123,6 @@ def test_create_inferred_span_from_sns_event_b64_msg_attr(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async") - self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_kinesis_event(self): event_sample_source = "kinesis" @@ -1175,7 +1165,6 @@ def test_create_inferred_span_from_kinesis_event(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async") - self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_dynamodb_event(self): event_sample_source = "dynamodb" @@ -1215,7 +1204,6 @@ def test_create_inferred_span_from_dynamodb_event(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async") - self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_s3_event(self): event_sample_source = "s3" @@ -1253,7 +1241,6 @@ def test_create_inferred_span_from_s3_event(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async") - self.assertEqual(span.get_tag("peer.service"), "function") def test_create_inferred_span_from_eventbridge_event(self): event_sample_source = "eventbridge-custom" @@ -1283,7 +1270,6 @@ def test_create_inferred_span_from_eventbridge_event(self): self.assertEqual(span.span_type, "web") self.assertEqual(span.get_tag(InferredSpanInfo.TAG_SOURCE), "self") self.assertEqual(span.get_tag(InferredSpanInfo.SYNCHRONICITY), "async") - self.assertEqual(span.get_tag("peer.service"), "function") def test_extract_context_from_eventbridge_event(self): event_sample_source = "eventbridge-custom" From 6c28e39a3b10d3c8b66bb55e49f1e452923ab894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?jordan=20gonz=C3=A1lez?= <30836115+duncanista@users.noreply.github.com> Date: Mon, 5 Jun 2023 11:11:41 -0400 Subject: [PATCH 7/8] move `peer.service` one level up on span finish --- datadog_lambda/wrapper.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/datadog_lambda/wrapper.py b/datadog_lambda/wrapper.py index c033e216..6e838421 100644 --- a/datadog_lambda/wrapper.py +++ b/datadog_lambda/wrapper.py @@ -71,8 +71,6 @@ DD_ENV = "DD_ENV" env_env_var = os.environ.get(DD_ENV, None) -function_env_var = os.environ.get(AWS_LAMBDA_FUNCTION_NAME, "function") -service_env_var = os.environ.get(DD_SERVICE, "DefaultServiceName") """ Usage: @@ -134,7 +132,8 @@ def __init__(self, func): self.merge_xray_traces = ( os.environ.get(DD_MERGE_XRAY_TRACES, "false").lower() == "true" ) - self.function_name = function_env_var + self.function_name = os.environ.get(AWS_LAMBDA_FUNCTION_NAME, "function") + self.service = os.environ.get(DD_SERVICE, None) self.extractor_env = os.environ.get(DD_TRACE_EXTRACTOR, None) self.trace_extractor = None self.span = None @@ -175,7 +174,7 @@ def __init__(self, func): logger.debug(f"Malformatted for env {DD_COLD_START_TRACE_SKIP_LIB}") self.response = None if profiling_env_var: - self.prof = profiler.Profiler(env=env_env_var, service=service_env_var) + self.prof = profiler.Profiler(env=env_env_var, service=self.service) if self.extractor_env: extractor_parts = self.extractor_env.rsplit(".", 1) if len(extractor_parts) == 2: @@ -318,6 +317,9 @@ def _after(self, event, context): if status_code: self.inferred_span.set_tag("http.status_code", status_code) + if self.service: + self.inferred_span.set_tag("peer.service", self.service) + if InferredSpanInfo.is_async(self.inferred_span) and self.span: self.inferred_span.finish(finish_time=self.span.start) else: From 1826abea3abb6fdf250433ee2db5c0529364c43f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?jordan=20gonz=C3=A1lez?= <30836115+duncanista@users.noreply.github.com> Date: Mon, 5 Jun 2023 14:59:40 -0400 Subject: [PATCH 8/8] add `service` to integration tests --- tests/integration/serverless.yml | 1 + .../logs/async-metrics_python310.log | 81 +++++++----- .../snapshots/logs/async-metrics_python37.log | 81 +++++++----- .../snapshots/logs/async-metrics_python38.log | 81 +++++++----- .../snapshots/logs/async-metrics_python39.log | 81 +++++++----- .../snapshots/logs/sync-metrics_python310.log | 123 ++++++++++-------- .../snapshots/logs/sync-metrics_python37.log | 119 +++++++++-------- .../snapshots/logs/sync-metrics_python38.log | 117 +++++++++-------- .../snapshots/logs/sync-metrics_python39.log | 117 +++++++++-------- 9 files changed, 437 insertions(+), 364 deletions(-) diff --git a/tests/integration/serverless.yml b/tests/integration/serverless.yml index 27112f54..bb64c397 100644 --- a/tests/integration/serverless.yml +++ b/tests/integration/serverless.yml @@ -12,6 +12,7 @@ provider: DD_API_KEY: ${env:DD_API_KEY} DD_TRACE_MANAGED_SERVICES: true DD_COLD_START_TRACING: false + DD_SERVICE: ${self:service} timeout: 15 deploymentBucket: name: integration-tests-serververless-deployment-bucket diff --git a/tests/integration/snapshots/logs/async-metrics_python310.log b/tests/integration/snapshots/logs/async-metrics_python310.log index fb5b0b26..d746aba4 100644 --- a/tests/integration/snapshots/logs/async-metrics_python310.log +++ b/tests/integration/snapshots/logs/async-metrics_python310.log @@ -63,10 +63,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiname": "XXXX", "stage": "Prod", "request_id": "XXXX", - "peer.service": "integration-tests-python-XXXX-async-metrics_python310", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -115,7 +115,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -131,7 +131,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -139,7 +140,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -227,9 +228,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_version": "1.1", "stream_view_type": "NEW_AND_OLD_IMAGES", "size_bytes": "26", - "peer.service": "integration-tests-python-XXXX-async-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -274,7 +275,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -290,7 +291,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -298,7 +300,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -380,9 +382,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "detail_type": "testdetail", - "peer.service": "integration-tests-python-XXXX-async-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -426,7 +428,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -442,7 +444,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -450,7 +453,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -541,10 +544,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiid": "XXXX", "apiname": "XXXX", "stage": "$default", - "peer.service": "integration-tests-python-XXXX-async-metrics_python310", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -593,7 +596,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -609,7 +612,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -617,7 +621,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -705,9 +709,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_name": "aws:kinesis:record", "event_version": "1.0", "partition_key": "XXXX", - "peer.service": "integration-tests-python-XXXX-async-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -752,7 +756,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -768,7 +772,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -776,7 +781,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -861,9 +866,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "object_key": "test/key", "object_size": "1024", "object_etag": "XXXX", - "peer.service": "integration-tests-python-XXXX-async-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -908,7 +913,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -924,7 +929,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -932,7 +938,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1017,10 +1023,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "message_id": "XXXX", "type": "Notification", - "peer.service": "integration-tests-python-XXXX-async-metrics_python310", "subject": "TestInvoke", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1065,7 +1071,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1081,7 +1087,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1089,7 +1096,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1174,9 +1181,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...", "sender_id": "AIDAIENQZJOLO23YVJ4VO", - "peer.service": "integration-tests-python-XXXX-async-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1221,7 +1228,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1237,7 +1244,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1245,7 +1253,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1335,10 +1343,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "connection_id": "XXXX=", "event_type": "MESSAGE", "message_direction": "IN", - "peer.service": "integration-tests-python-XXXX-async-metrics_python310", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1385,7 +1393,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1401,7 +1409,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1409,7 +1418,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, diff --git a/tests/integration/snapshots/logs/async-metrics_python37.log b/tests/integration/snapshots/logs/async-metrics_python37.log index 0cab43b6..e28bb9b3 100644 --- a/tests/integration/snapshots/logs/async-metrics_python37.log +++ b/tests/integration/snapshots/logs/async-metrics_python37.log @@ -63,10 +63,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiname": "XXXX", "stage": "Prod", "request_id": "XXXX", - "peer.service": "integration-tests-python-XXXX-async-metrics_python37", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -115,7 +115,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -131,7 +131,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -139,7 +140,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -227,9 +228,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_version": "1.1", "stream_view_type": "NEW_AND_OLD_IMAGES", "size_bytes": "26", - "peer.service": "integration-tests-python-XXXX-async-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -274,7 +275,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -290,7 +291,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -298,7 +300,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -380,9 +382,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "detail_type": "testdetail", - "peer.service": "integration-tests-python-XXXX-async-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -426,7 +428,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -442,7 +444,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -450,7 +453,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -541,10 +544,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiid": "XXXX", "apiname": "XXXX", "stage": "$default", - "peer.service": "integration-tests-python-XXXX-async-metrics_python37", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -593,7 +596,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -609,7 +612,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -617,7 +621,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -705,9 +709,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_name": "aws:kinesis:record", "event_version": "1.0", "partition_key": "XXXX", - "peer.service": "integration-tests-python-XXXX-async-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -752,7 +756,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -768,7 +772,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -776,7 +781,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -861,9 +866,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "object_key": "test/key", "object_size": "1024", "object_etag": "XXXX", - "peer.service": "integration-tests-python-XXXX-async-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -908,7 +913,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -924,7 +929,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -932,7 +938,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1017,10 +1023,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "message_id": "XXXX", "type": "Notification", - "peer.service": "integration-tests-python-XXXX-async-metrics_python37", "subject": "TestInvoke", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1065,7 +1071,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1081,7 +1087,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1089,7 +1096,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1174,9 +1181,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...", "sender_id": "AIDAIENQZJOLO23YVJ4VO", - "peer.service": "integration-tests-python-XXXX-async-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1221,7 +1228,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1237,7 +1244,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1245,7 +1253,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1335,10 +1343,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "connection_id": "XXXX=", "event_type": "MESSAGE", "message_direction": "IN", - "peer.service": "integration-tests-python-XXXX-async-metrics_python37", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1385,7 +1393,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1401,7 +1409,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1409,7 +1418,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, diff --git a/tests/integration/snapshots/logs/async-metrics_python38.log b/tests/integration/snapshots/logs/async-metrics_python38.log index 74cf3ce3..c146ef0f 100644 --- a/tests/integration/snapshots/logs/async-metrics_python38.log +++ b/tests/integration/snapshots/logs/async-metrics_python38.log @@ -63,10 +63,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiname": "XXXX", "stage": "Prod", "request_id": "XXXX", - "peer.service": "integration-tests-python-XXXX-async-metrics_python38", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -115,7 +115,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -131,7 +131,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -139,7 +140,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -227,9 +228,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_version": "1.1", "stream_view_type": "NEW_AND_OLD_IMAGES", "size_bytes": "26", - "peer.service": "integration-tests-python-XXXX-async-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -274,7 +275,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -290,7 +291,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -298,7 +300,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -380,9 +382,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "detail_type": "testdetail", - "peer.service": "integration-tests-python-XXXX-async-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -426,7 +428,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -442,7 +444,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -450,7 +453,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -541,10 +544,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiid": "XXXX", "apiname": "XXXX", "stage": "$default", - "peer.service": "integration-tests-python-XXXX-async-metrics_python38", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -593,7 +596,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -609,7 +612,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -617,7 +621,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -705,9 +709,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_name": "aws:kinesis:record", "event_version": "1.0", "partition_key": "XXXX", - "peer.service": "integration-tests-python-XXXX-async-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -752,7 +756,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -768,7 +772,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -776,7 +781,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -861,9 +866,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "object_key": "test/key", "object_size": "1024", "object_etag": "XXXX", - "peer.service": "integration-tests-python-XXXX-async-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -908,7 +913,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -924,7 +929,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -932,7 +938,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1017,10 +1023,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "message_id": "XXXX", "type": "Notification", - "peer.service": "integration-tests-python-XXXX-async-metrics_python38", "subject": "TestInvoke", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1065,7 +1071,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1081,7 +1087,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1089,7 +1096,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1174,9 +1181,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...", "sender_id": "AIDAIENQZJOLO23YVJ4VO", - "peer.service": "integration-tests-python-XXXX-async-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1221,7 +1228,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1237,7 +1244,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1245,7 +1253,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1335,10 +1343,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "connection_id": "XXXX=", "event_type": "MESSAGE", "message_direction": "IN", - "peer.service": "integration-tests-python-XXXX-async-metrics_python38", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1385,7 +1393,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1401,7 +1409,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1409,7 +1418,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, diff --git a/tests/integration/snapshots/logs/async-metrics_python39.log b/tests/integration/snapshots/logs/async-metrics_python39.log index 40a1f3d5..bc0fb4e8 100644 --- a/tests/integration/snapshots/logs/async-metrics_python39.log +++ b/tests/integration/snapshots/logs/async-metrics_python39.log @@ -63,10 +63,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiname": "XXXX", "stage": "Prod", "request_id": "XXXX", - "peer.service": "integration-tests-python-XXXX-async-metrics_python39", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -115,7 +115,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -131,7 +131,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -139,7 +140,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -227,9 +228,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_version": "1.1", "stream_view_type": "NEW_AND_OLD_IMAGES", "size_bytes": "26", - "peer.service": "integration-tests-python-XXXX-async-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -274,7 +275,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -290,7 +291,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -298,7 +300,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -380,9 +382,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "detail_type": "testdetail", - "peer.service": "integration-tests-python-XXXX-async-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -426,7 +428,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -442,7 +444,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -450,7 +453,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -541,10 +544,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiid": "XXXX", "apiname": "XXXX", "stage": "$default", - "peer.service": "integration-tests-python-XXXX-async-metrics_python39", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -593,7 +596,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -609,7 +612,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -617,7 +621,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -705,9 +709,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_name": "aws:kinesis:record", "event_version": "1.0", "partition_key": "XXXX", - "peer.service": "integration-tests-python-XXXX-async-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -752,7 +756,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -768,7 +772,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -776,7 +781,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -861,9 +866,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "object_key": "test/key", "object_size": "1024", "object_etag": "XXXX", - "peer.service": "integration-tests-python-XXXX-async-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -908,7 +913,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -924,7 +929,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -932,7 +938,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1017,10 +1023,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "message_id": "XXXX", "type": "Notification", - "peer.service": "integration-tests-python-XXXX-async-metrics_python39", "subject": "TestInvoke", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1065,7 +1071,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1081,7 +1087,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1089,7 +1096,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1174,9 +1181,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...", "sender_id": "AIDAIENQZJOLO23YVJ4VO", - "peer.service": "integration-tests-python-XXXX-async-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1221,7 +1228,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1237,7 +1244,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1245,7 +1253,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1335,10 +1343,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "connection_id": "XXXX=", "event_type": "MESSAGE", "message_direction": "IN", - "peer.service": "integration-tests-python-XXXX-async-metrics_python39", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1385,7 +1393,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1401,7 +1409,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1409,7 +1418,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, diff --git a/tests/integration/snapshots/logs/sync-metrics_python310.log b/tests/integration/snapshots/logs/sync-metrics_python310.log index 0abb8605..a72a34a9 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python310.log +++ b/tests/integration/snapshots/logs/sync-metrics_python310.log @@ -43,10 +43,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiname": "XXXX", "stage": "Prod", "request_id": "XXXX", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python310", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -95,7 +95,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -111,7 +111,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -119,7 +120,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -142,7 +143,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -150,7 +151,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -225,9 +226,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_version": "1.1", "stream_view_type": "NEW_AND_OLD_IMAGES", "size_bytes": "26", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -272,7 +273,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -288,7 +289,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -296,7 +298,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -319,7 +321,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -327,7 +329,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -396,9 +398,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "detail_type": "testdetail", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -442,7 +444,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -458,7 +460,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -466,7 +469,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -489,7 +492,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -497,7 +500,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -575,10 +578,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiid": "XXXX", "apiname": "XXXX", "stage": "$default", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python310", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -627,7 +630,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -643,7 +646,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -651,7 +655,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -674,7 +678,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X", "service:integration-tests-python"], "interval": 10}]} +END Duration: XXXX ms Memory Used: XXXX MB { "traces": [ [ @@ -682,7 +687,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -712,7 +717,6 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept ] ] } -END Duration: XXXX ms Memory Used: XXXX MB START { "m": "aws.lambda.enhanced.invocations", @@ -757,9 +761,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_name": "aws:kinesis:record", "event_version": "1.0", "partition_key": "XXXX", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -804,7 +808,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -820,7 +824,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -828,7 +833,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -851,7 +856,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -859,7 +864,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -931,9 +936,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "object_key": "test/key", "object_size": "1024", "object_etag": "XXXX", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -978,7 +983,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -994,7 +999,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1002,7 +1008,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1025,7 +1031,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -1033,7 +1039,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1105,10 +1111,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "message_id": "XXXX", "type": "Notification", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python310", "subject": "TestInvoke", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1153,7 +1159,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1169,7 +1175,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1177,7 +1184,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1200,8 +1207,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}]} -END Duration: XXXX ms Memory Used: XXXX MB +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -1209,7 +1215,7 @@ END Duration: XXXX ms Memory Used: XXXX MB "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1239,6 +1245,7 @@ END Duration: XXXX ms Memory Used: XXXX MB ] ] } +END Duration: XXXX ms Memory Used: XXXX MB START { "m": "aws.lambda.enhanced.invocations", @@ -1280,9 +1287,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...", "sender_id": "AIDAIENQZJOLO23YVJ4VO", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python310", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1327,7 +1334,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1343,7 +1350,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1351,7 +1359,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1374,8 +1382,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}]} -END Duration: XXXX ms Memory Used: XXXX MB +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -1383,7 +1390,7 @@ END Duration: XXXX ms Memory Used: XXXX MB "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1413,6 +1420,7 @@ END Duration: XXXX ms Memory Used: XXXX MB ] ] } +END Duration: XXXX ms Memory Used: XXXX MB START { "m": "aws.lambda.enhanced.invocations", @@ -1459,10 +1467,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "connection_id": "XXXX=", "event_type": "MESSAGE", "message_direction": "IN", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python310", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1509,7 +1517,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1525,7 +1533,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1533,7 +1542,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1556,7 +1565,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python310_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -1564,7 +1573,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, diff --git a/tests/integration/snapshots/logs/sync-metrics_python37.log b/tests/integration/snapshots/logs/sync-metrics_python37.log index 33a970bb..5bc76a99 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python37.log +++ b/tests/integration/snapshots/logs/sync-metrics_python37.log @@ -43,10 +43,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiname": "XXXX", "stage": "Prod", "request_id": "XXXX", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python37", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -95,7 +95,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -111,7 +111,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -119,7 +120,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -142,7 +143,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -150,7 +151,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -225,9 +226,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_version": "1.1", "stream_view_type": "NEW_AND_OLD_IMAGES", "size_bytes": "26", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -272,7 +273,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -288,7 +289,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -296,7 +298,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -319,7 +321,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -327,7 +329,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -396,9 +398,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "detail_type": "testdetail", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -442,7 +444,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -458,7 +460,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -466,7 +469,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -489,7 +492,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -497,7 +500,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -575,10 +578,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiid": "XXXX", "apiname": "XXXX", "stage": "$default", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python37", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -627,7 +630,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -643,7 +646,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -651,7 +655,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -674,7 +678,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -682,7 +686,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -757,9 +761,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_name": "aws:kinesis:record", "event_version": "1.0", "partition_key": "XXXX", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -804,7 +808,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -820,7 +824,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -828,7 +833,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -851,7 +856,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -859,7 +864,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -931,9 +936,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "object_key": "test/key", "object_size": "1024", "object_etag": "XXXX", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -978,7 +983,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -994,7 +999,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1002,7 +1008,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1025,7 +1031,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -1033,7 +1039,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1105,10 +1111,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "message_id": "XXXX", "type": "Notification", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python37", "subject": "TestInvoke", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1153,7 +1159,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1169,7 +1175,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1177,7 +1184,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1200,7 +1207,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -1208,7 +1215,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1280,9 +1287,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...", "sender_id": "AIDAIENQZJOLO23YVJ4VO", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python37", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1327,7 +1334,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1343,7 +1350,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1351,7 +1359,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1374,8 +1382,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}]} -END Duration: XXXX ms Memory Used: XXXX MB +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -1383,7 +1390,7 @@ END Duration: XXXX ms Memory Used: XXXX MB "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1413,6 +1420,7 @@ END Duration: XXXX ms Memory Used: XXXX MB ] ] } +END Duration: XXXX ms Memory Used: XXXX MB START { "m": "aws.lambda.enhanced.invocations", @@ -1459,10 +1467,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "connection_id": "XXXX=", "event_type": "MESSAGE", "message_direction": "IN", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python37", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1509,7 +1517,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1525,7 +1533,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1533,7 +1542,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1556,7 +1565,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python37_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -1564,7 +1573,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, diff --git a/tests/integration/snapshots/logs/sync-metrics_python38.log b/tests/integration/snapshots/logs/sync-metrics_python38.log index 3f9db12b..213e64aa 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python38.log +++ b/tests/integration/snapshots/logs/sync-metrics_python38.log @@ -43,10 +43,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiname": "XXXX", "stage": "Prod", "request_id": "XXXX", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python38", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -95,7 +95,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -111,7 +111,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -119,7 +120,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -142,7 +143,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -150,7 +151,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -225,9 +226,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_version": "1.1", "stream_view_type": "NEW_AND_OLD_IMAGES", "size_bytes": "26", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -272,7 +273,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -288,7 +289,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -296,7 +298,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -319,7 +321,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -327,7 +329,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -396,9 +398,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "detail_type": "testdetail", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -442,7 +444,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -458,7 +460,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -466,7 +469,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -489,7 +492,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -497,7 +500,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -575,10 +578,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiid": "XXXX", "apiname": "XXXX", "stage": "$default", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python38", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -627,7 +630,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -643,7 +646,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -651,7 +655,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -674,7 +678,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -682,7 +686,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -757,9 +761,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_name": "aws:kinesis:record", "event_version": "1.0", "partition_key": "XXXX", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -804,7 +808,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -820,7 +824,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -828,7 +833,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -851,7 +856,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -859,7 +864,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -931,9 +936,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "object_key": "test/key", "object_size": "1024", "object_etag": "XXXX", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -978,7 +983,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -994,7 +999,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1002,7 +1008,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1025,7 +1031,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -1033,7 +1039,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1105,10 +1111,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "message_id": "XXXX", "type": "Notification", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python38", "subject": "TestInvoke", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1153,7 +1159,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1169,7 +1175,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1177,7 +1184,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1200,7 +1207,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -1208,7 +1215,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1280,9 +1287,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...", "sender_id": "AIDAIENQZJOLO23YVJ4VO", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python38", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1327,7 +1334,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1343,7 +1350,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1351,7 +1359,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1374,7 +1382,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -1382,7 +1390,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1459,10 +1467,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "connection_id": "XXXX=", "event_type": "MESSAGE", "message_direction": "IN", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python38", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1509,7 +1517,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1525,7 +1533,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1533,7 +1542,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1556,7 +1565,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python38_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -1564,7 +1573,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, diff --git a/tests/integration/snapshots/logs/sync-metrics_python39.log b/tests/integration/snapshots/logs/sync-metrics_python39.log index d0aa2057..54ab2bad 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python39.log +++ b/tests/integration/snapshots/logs/sync-metrics_python39.log @@ -43,10 +43,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiname": "XXXX", "stage": "Prod", "request_id": "XXXX", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python39", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -95,7 +95,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -111,7 +111,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -119,7 +120,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -142,7 +143,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -150,7 +151,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -225,9 +226,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_version": "1.1", "stream_view_type": "NEW_AND_OLD_IMAGES", "size_bytes": "26", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -272,7 +273,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -288,7 +289,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -296,7 +298,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -319,7 +321,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -327,7 +329,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -396,9 +398,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "detail_type": "testdetail", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -442,7 +444,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -458,7 +460,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -466,7 +469,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -489,7 +492,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -497,7 +500,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -575,10 +578,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "apiid": "XXXX", "apiname": "XXXX", "stage": "$default", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python39", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -627,7 +630,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -643,7 +646,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -651,7 +655,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -674,7 +678,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -682,7 +686,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -757,9 +761,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_name": "aws:kinesis:record", "event_version": "1.0", "partition_key": "XXXX", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -804,7 +808,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -820,7 +824,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -828,7 +833,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -851,7 +856,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -859,7 +864,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -931,9 +936,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "object_key": "test/key", "object_size": "1024", "object_etag": "XXXX", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -978,7 +983,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -994,7 +999,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1002,7 +1008,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1025,7 +1031,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -1033,7 +1039,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1105,10 +1111,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "topic_arn": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "message_id": "XXXX", "type": "Notification", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python39", "subject": "TestInvoke", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1153,7 +1159,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1169,7 +1175,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1177,7 +1184,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1200,7 +1207,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -1208,7 +1215,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1280,9 +1287,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "event_source_arn": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...", "sender_id": "AIDAIENQZJOLO23YVJ4VO", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python39", "_inferred_span.synchronicity": "async", "_inferred_span.tag_source": "self", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1327,7 +1334,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1343,7 +1350,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1351,7 +1359,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1374,7 +1382,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -1382,7 +1390,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1459,10 +1467,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "connection_id": "XXXX=", "event_type": "MESSAGE", "message_direction": "IN", - "peer.service": "integration-tests-python-XXXX-sync-metrics_python39", "_inferred_span.synchronicity": "sync", "_inferred_span.tag_source": "self", "http.status_code": "200", + "peer.service": "integration-tests-python", "_dd.p.dm": "-0", "language": "python" }, @@ -1509,7 +1517,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1525,7 +1533,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "http.useragent": "python-requests/X.X.X" }, "metrics": { - "_dd.measured": 1 + "_dd.measured": 1, + "_dd.top_level": 1 }, "type": "http" }, @@ -1533,7 +1542,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0, @@ -1556,7 +1565,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate", " ] ] } -HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X"], "interval": 10}]} +HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "DD-API-KEY:XXXX", "User-Agent:datadogpy/XX (python XX; os linux; arch x86_64)", "traceparent:XXX", "tracestate:dd=s:1;t.dm:-0", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-tags:_dd.p.dm=-0", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X", "service:integration-tests-python"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python39_X.X.X", "service:integration-tests-python"], "interval": 10}]} { "traces": [ [ @@ -1564,7 +1573,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", - "service": "aws.lambda", + "service": "integration-tests-python", "resource": "requests.request", "name": "requests.request", "error": 0,