From 044a23e1a596a149fc8d6eca5f199ad3bdf25084 Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 1 May 2026 10:20:53 -0400 Subject: [PATCH 01/17] Replace use of _SpanPointer --- pyproject.toml | 2 +- tests/test_tracing.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 79dc6ffa..105fa4d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ datadog = ">=0.51.0,<1.0.0" wrapt = "^1.11.2" ddtrace = [ {version = ">=3.19.1,<4", python = ">=3.8,<3.10"}, - {version = ">=4.1.1,<5,!=4.6.*,<4.8.0", python = ">=3.10"} + {version = ">=4.1.1,<5,!=4.6.*", python = ">=3.10"} ] ujson = [ {version = ">=5.10.0,<5.12.0", python = ">=3.8,<3.10"}, diff --git a/tests/test_tracing.py b/tests/test_tracing.py index 3a3d9e89..e53ddbef 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -12,7 +12,7 @@ import ddtrace from ddtrace.trace import Context, tracer -from ddtrace._trace._span_pointer import _SpanPointer +from ddtrace._trace._span_link import _SpanLink from ddtrace._trace._span_pointer import _SpanPointerDirection from ddtrace._trace._span_pointer import _SpanPointerDescription @@ -1154,13 +1154,13 @@ def test_function_with_span_pointers(self): self.assertEqual( span._links, [ - _SpanPointer( + _SpanLink._SpanPointer( pointer_kind="some.kind", pointer_direction=_SpanPointerDirection.UPSTREAM, pointer_hash="some.hash", extra_attributes={}, ), - _SpanPointer( + _SpanLink._SpanPointer( pointer_kind="other.kind", pointer_direction=_SpanPointerDirection.DOWNSTREAM, pointer_hash="other.hash", From 60e03d48e4ea39f1751bb92aa85b02ac869a044f Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 1 May 2026 10:45:05 -0400 Subject: [PATCH 02/17] Use SpanLink --- tests/test_tracing.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/test_tracing.py b/tests/test_tracing.py index e53ddbef..9818b52d 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -12,7 +12,8 @@ import ddtrace from ddtrace.trace import Context, tracer -from ddtrace._trace._span_link import _SpanLink +from ddtrace._trace.span import Span +from ddtrace._trace._span_link import SpanLink from ddtrace._trace._span_pointer import _SpanPointerDirection from ddtrace._trace._span_pointer import _SpanPointerDescription @@ -1152,15 +1153,15 @@ def test_function_with_span_pointers(self): ], ) self.assertEqual( - span._links, + Span._get_links(span), [ - _SpanLink._SpanPointer( + SpanLink( pointer_kind="some.kind", pointer_direction=_SpanPointerDirection.UPSTREAM, pointer_hash="some.hash", extra_attributes={}, ), - _SpanLink._SpanPointer( + SpanLink( pointer_kind="other.kind", pointer_direction=_SpanPointerDirection.DOWNSTREAM, pointer_hash="other.hash", From 6ac63ccd3a7779ef0a3e2b9485ddf5ccf25011b2 Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 1 May 2026 11:17:22 -0400 Subject: [PATCH 03/17] fix --- tests/test_tracing.py | 62 ++++++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/tests/test_tracing.py b/tests/test_tracing.py index 9818b52d..7c620f10 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -14,6 +14,7 @@ from ddtrace.trace import Context, tracer from ddtrace._trace.span import Span from ddtrace._trace._span_link import SpanLink +from ddtrace._trace._span_link import SpanLinkKind from ddtrace._trace._span_pointer import _SpanPointerDirection from ddtrace._trace._span_pointer import _SpanPointerDescription @@ -1054,6 +1055,30 @@ def test_set_correlation_ids_handle_empty_trace_context(self): self.assertIsNone(span) +def _expected_span_pointer_span_link( + pointer_kind, + pointer_direction, + pointer_hash, + extra_attributes=None, +): + """ + Span-link payload for span pointers (same encoding as ddtrace _SpanPointer). + + Span pointers use trace_id and span_id 0; SpanLink.__init__ rejects those + values, so we construct instances without running SpanLink.__post_init__. + """ + extra_attributes = extra_attributes or {} + attrs = { + "ptr.kind": pointer_kind, + "ptr.dir": pointer_direction.value, + "ptr.hash": pointer_hash, + **extra_attributes, + } + link = SpanLink() + link.attributes = attrs + return link + + class TestFunctionSpanTags(unittest.TestCase): def test_function(self): ctx = get_mock_context() @@ -1071,7 +1096,7 @@ def test_function(self): self.assertEqual(span.get_tag("function_version"), "$LATEST") self.assertEqual(span.get_tag("resource_names"), "Function") self.assertEqual(span.get_tag("functionname"), "function") - self.assertEqual(span._links, []) + self.assertEqual(Span._get_links(span), []) def test_function_with_version(self): function_version = "1" @@ -1152,23 +1177,24 @@ def test_function_with_span_pointers(self): ), ], ) - self.assertEqual( - Span._get_links(span), - [ - SpanLink( - pointer_kind="some.kind", - pointer_direction=_SpanPointerDirection.UPSTREAM, - pointer_hash="some.hash", - extra_attributes={}, - ), - SpanLink( - pointer_kind="other.kind", - pointer_direction=_SpanPointerDirection.DOWNSTREAM, - pointer_hash="other.hash", - extra_attributes={"extra": "stuff"}, - ), - ], - ) + actual_links = Span._get_links(span) + expected_links = [ + _expected_span_pointer_span_link( + "some.kind", + _SpanPointerDirection.UPSTREAM, + "some.hash", + {}, + ), + _expected_span_pointer_span_link( + "other.kind", + _SpanPointerDirection.DOWNSTREAM, + "other.hash", + {"extra": "stuff"}, + ), + ] + self.assertEqual(len(actual_links), len(expected_links)) + for actual, expected in zip(actual_links, expected_links): + self.assertEqual(actual.attributes, expected.attributes) class TestSetTraceRootSpan(unittest.TestCase): From dc29414d682572059596bf2ac69990104bc55309 Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 1 May 2026 11:22:07 -0400 Subject: [PATCH 04/17] add trace id and span id --- tests/test_tracing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_tracing.py b/tests/test_tracing.py index 7c620f10..51bb1375 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -1074,7 +1074,7 @@ def _expected_span_pointer_span_link( "ptr.hash": pointer_hash, **extra_attributes, } - link = SpanLink() + link = SpanLink(trace_id=0, span_id=0) link.attributes = attrs return link From 2774a5147bf0e006e5cddbf9018fc9ad2eae467e Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 1 May 2026 11:24:02 -0400 Subject: [PATCH 05/17] change how ids are added --- tests/test_tracing.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/test_tracing.py b/tests/test_tracing.py index 51bb1375..e25e9f50 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -1074,7 +1074,9 @@ def _expected_span_pointer_span_link( "ptr.hash": pointer_hash, **extra_attributes, } - link = SpanLink(trace_id=0, span_id=0) + link = object.__new__(SpanLink) + link.trace_id = 0 + link.span_id = 0 link.attributes = attrs return link @@ -1194,6 +1196,8 @@ def test_function_with_span_pointers(self): ] self.assertEqual(len(actual_links), len(expected_links)) for actual, expected in zip(actual_links, expected_links): + self.assertEqual(actual.trace_id, expected.trace_id) + self.assertEqual(actual.span_id, expected.span_id) self.assertEqual(actual.attributes, expected.attributes) From 2fbcba9c94d278efdca472fd0487c95ceeab409a Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 1 May 2026 12:24:56 -0400 Subject: [PATCH 06/17] new spanlink --- tests/test_tracing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_tracing.py b/tests/test_tracing.py index e25e9f50..8c529082 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -1074,7 +1074,7 @@ def _expected_span_pointer_span_link( "ptr.hash": pointer_hash, **extra_attributes, } - link = object.__new__(SpanLink) + link = SpanLink.__new__() link.trace_id = 0 link.span_id = 0 link.attributes = attrs From 9c062a443ed637baae2d3615c5fa9a9491dcef2c Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 1 May 2026 12:32:11 -0400 Subject: [PATCH 07/17] fix new spanlink --- tests/test_tracing.py | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/tests/test_tracing.py b/tests/test_tracing.py index 8c529082..ff285c1d 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -6,6 +6,7 @@ import pytest import os import unittest +from types import SimpleNamespace from unittest.mock import Mock, patch, call, ANY @@ -13,8 +14,6 @@ from ddtrace.trace import Context, tracer from ddtrace._trace.span import Span -from ddtrace._trace._span_link import SpanLink -from ddtrace._trace._span_link import SpanLinkKind from ddtrace._trace._span_pointer import _SpanPointerDirection from ddtrace._trace._span_pointer import _SpanPointerDescription @@ -1055,30 +1054,29 @@ def test_set_correlation_ids_handle_empty_trace_context(self): self.assertIsNone(span) -def _expected_span_pointer_span_link( +# Span-link kind value used by ddtrace for span-pointer links (SpanLinkKind.SPAN_POINTER). +_SPAN_POINTER_LINK_KIND = "span-pointer" + + +def _expected_span_pointer_link( pointer_kind, pointer_direction, pointer_hash, extra_attributes=None, ): - """ - Span-link payload for span pointers (same encoding as ddtrace _SpanPointer). - - Span pointers use trace_id and span_id 0; SpanLink.__init__ rejects those - values, so we construct instances without running SpanLink.__post_init__. - """ + """Expected trace_id, span_id, and attributes for a span-pointer link on the root span.""" extra_attributes = extra_attributes or {} - attrs = { - "ptr.kind": pointer_kind, - "ptr.dir": pointer_direction.value, - "ptr.hash": pointer_hash, - **extra_attributes, - } - link = SpanLink.__new__() - link.trace_id = 0 - link.span_id = 0 - link.attributes = attrs - return link + return SimpleNamespace( + trace_id=0, + span_id=0, + attributes={ + "ptr.kind": pointer_kind, + "ptr.dir": pointer_direction.value, + "ptr.hash": pointer_hash, + "link.kind": _SPAN_POINTER_LINK_KIND, + **extra_attributes, + }, + ) class TestFunctionSpanTags(unittest.TestCase): @@ -1181,13 +1179,13 @@ def test_function_with_span_pointers(self): ) actual_links = Span._get_links(span) expected_links = [ - _expected_span_pointer_span_link( + _expected_span_pointer_link( "some.kind", _SpanPointerDirection.UPSTREAM, "some.hash", {}, ), - _expected_span_pointer_span_link( + _expected_span_pointer_link( "other.kind", _SpanPointerDirection.DOWNSTREAM, "other.hash", From 6f45e7ab91091ffdd28b889a92013737480e446a Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 1 May 2026 12:50:00 -0400 Subject: [PATCH 08/17] cleanup --- tests/test_tracing.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/test_tracing.py b/tests/test_tracing.py index ff285c1d..27a1b2b0 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -1054,17 +1054,12 @@ def test_set_correlation_ids_handle_empty_trace_context(self): self.assertIsNone(span) -# Span-link kind value used by ddtrace for span-pointer links (SpanLinkKind.SPAN_POINTER). -_SPAN_POINTER_LINK_KIND = "span-pointer" - - def _expected_span_pointer_link( pointer_kind, pointer_direction, pointer_hash, extra_attributes=None, ): - """Expected trace_id, span_id, and attributes for a span-pointer link on the root span.""" extra_attributes = extra_attributes or {} return SimpleNamespace( trace_id=0, @@ -1073,7 +1068,7 @@ def _expected_span_pointer_link( "ptr.kind": pointer_kind, "ptr.dir": pointer_direction.value, "ptr.hash": pointer_hash, - "link.kind": _SPAN_POINTER_LINK_KIND, + "link.kind": "span-pointer", **extra_attributes, }, ) From c1cb26c4c8aec73837e7d91add8ec314fc56510a Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 1 May 2026 12:53:03 -0400 Subject: [PATCH 09/17] try not patching agentwriter --- tests/test_wrapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_wrapper.py b/tests/test_wrapper.py index b1aa1ae8..37e6294a 100644 --- a/tests/test_wrapper.py +++ b/tests/test_wrapper.py @@ -26,7 +26,7 @@ def setUp(self): # Force @datadog_lambda_wrapper to always create a real # (not no-op) wrapper. patch("ddtrace.internal.remoteconfig.worker.RemoteConfigPoller").start() - patch("ddtrace.internal.writer.AgentWriter.flush_queue").start() + #patch("ddtrace.internal.writer.AgentWriter.flush_queue").start() wrapper.datadog_lambda_wrapper._force_wrap = True patcher = patch( From 3f7eec116b0dfdf03cebf5450abf2a02cbc9221a Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 1 May 2026 13:06:04 -0400 Subject: [PATCH 10/17] try except for Span._get_links --- tests/test_tracing.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/test_tracing.py b/tests/test_tracing.py index 27a1b2b0..986bc9e4 100644 --- a/tests/test_tracing.py +++ b/tests/test_tracing.py @@ -1091,7 +1091,10 @@ def test_function(self): self.assertEqual(span.get_tag("function_version"), "$LATEST") self.assertEqual(span.get_tag("resource_names"), "Function") self.assertEqual(span.get_tag("functionname"), "function") - self.assertEqual(Span._get_links(span), []) + try: + self.assertEqual(Span._get_links(span), []) + except: + self.assertEqual(span._links, []) def test_function_with_version(self): function_version = "1" @@ -1172,7 +1175,10 @@ def test_function_with_span_pointers(self): ), ], ) - actual_links = Span._get_links(span) + try: + actual_links = Span._get_links(span) + except: + actual_links = span._links expected_links = [ _expected_span_pointer_link( "some.kind", From 2f07766461b44c0c6f2a1def543a3f6ddebeecd3 Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 1 May 2026 13:07:49 -0400 Subject: [PATCH 11/17] Remove AgentWriter patch --- tests/test_wrapper.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_wrapper.py b/tests/test_wrapper.py index 37e6294a..56c8e612 100644 --- a/tests/test_wrapper.py +++ b/tests/test_wrapper.py @@ -26,7 +26,6 @@ def setUp(self): # Force @datadog_lambda_wrapper to always create a real # (not no-op) wrapper. patch("ddtrace.internal.remoteconfig.worker.RemoteConfigPoller").start() - #patch("ddtrace.internal.writer.AgentWriter.flush_queue").start() wrapper.datadog_lambda_wrapper._force_wrap = True patcher = patch( From 2a965896b56b55fb4b0958ac6faf8773deebb845 Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 1 May 2026 13:53:04 -0400 Subject: [PATCH 12/17] update amd snapshots --- pyproject.toml.bak | 70 +++++++++ .../logs/async-metrics_python310.log | 126 +++++++++++---- .../logs/async-metrics_python311.log | 124 +++++++++++---- .../logs/async-metrics_python312.log | 126 +++++++++++---- .../logs/async-metrics_python313.log | 128 +++++++++++---- .../logs/async-metrics_python314.log | 126 +++++++++++---- .../snapshots/logs/sync-metrics_python310.log | 142 +++++++++++++---- .../snapshots/logs/sync-metrics_python311.log | 146 +++++++++++++---- .../snapshots/logs/sync-metrics_python312.log | 148 ++++++++++++++---- .../snapshots/logs/sync-metrics_python313.log | 148 ++++++++++++++---- .../snapshots/logs/sync-metrics_python314.log | 146 +++++++++++++---- 11 files changed, 1140 insertions(+), 290 deletions(-) create mode 100644 pyproject.toml.bak diff --git a/pyproject.toml.bak b/pyproject.toml.bak new file mode 100644 index 00000000..105fa4d5 --- /dev/null +++ b/pyproject.toml.bak @@ -0,0 +1,70 @@ +[tool.poetry] +name = "datadog_lambda" +version = "8.125.0.dev0" +description = "The Datadog AWS Lambda Library" +authors = ["Datadog, Inc. "] +license = "Apache-2.0" +readme = "README.md" +repository = "https://github.com/DataDog/datadog-lambda-python" +keywords = [ + "datadog", + "aws", + "lambda", + "layer", +] +packages = [ + { include = "datadog_lambda" } +] +classifiers = [ + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", +] + +[tool.poetry.dependencies] +python = ">=3.8.0,<3.15" +datadog = ">=0.51.0,<1.0.0" +wrapt = "^1.11.2" +ddtrace = [ + {version = ">=3.19.1,<4", python = ">=3.8,<3.10"}, + {version = ">=4.1.1,<5,!=4.6.*", python = ">=3.10"} +] +ujson = [ + {version = ">=5.10.0,<5.12.0", python = ">=3.8,<3.10"}, + {version = "^5.12.0", python = ">=3.10"}, +] +urllib3 = [ + {version = ">=1.25.4,<1.27", python = ">=3.8,<3.10"}, + {version = "^2.6.3", python = ">=3.10"}, +] +botocore = { version = "^1.34.0", optional = true } +requests = [ + { version = "^2.22.0", optional = true, python = ">=3.8,<3.10" }, + { version = "^2.33.0", optional = true, python = ">=3.10" }, +] +pytest = [ + { version = "^8.3.4", optional = true, python = ">=3.8,<3.10" }, + { version = "^9.0.3", optional = true, python = ">=3.10" }, +] +pytest-benchmark = { version = "^4.0", optional = true } +flake8 = { version = "^5.0.4", optional = true } + +[tool.poetry.extras] +dev = [ + "botocore", + "flake8", + "pytest", + "pytest-benchmark", + "requests", +] + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" + +[tool.pytest.ini_options] +addopts = "--benchmark-disable --benchmark-autosave" diff --git a/tests/integration/snapshots/logs/async-metrics_python310.log b/tests/integration/snapshots/logs/async-metrics_python310.log index 5aef301e..3dbcfe0a 100644 --- a/tests/integration/snapshots/logs/async-metrics_python310.log +++ b/tests/integration/snapshots/logs/async-metrics_python310.log @@ -54,6 +54,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/", "endpoint": "/", "http.method": "GET", @@ -71,6 +72,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/70ixmpl4fl/stages/Prod", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -96,6 +98,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "true", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python310", @@ -130,13 +133,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -157,13 +162,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -229,6 +236,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python310", @@ -261,13 +269,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -287,13 +297,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -368,6 +380,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.dynamodb", "resource_names": "ExampleTableWithStream", "span.kind": "server", @@ -383,6 +396,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:dynamodb:us-east-1:XXXX:us-east-1/ExampleTableWithStream/stream/2015-06-27T00:48:05.899", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -400,19 +414,19 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.kind": "aws.dynamodb.item", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { + "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "link.kind": "span-pointer" } }, @@ -420,10 +434,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { + "link.kind": "span-pointer", "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } } ] @@ -440,6 +454,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python310", @@ -470,13 +485,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -497,13 +514,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -569,6 +588,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "span.kind": "server", @@ -577,6 +597,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "_inferred_span.tag_source": "self", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -602,6 +623,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python310", @@ -631,13 +653,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -658,13 +682,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -730,6 +756,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "endpoint": "/httpapi/get", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", "http.method": "GET", @@ -748,6 +775,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/x02yirxc7a/stages/$default", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -773,6 +801,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python310", @@ -807,13 +836,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -834,13 +865,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -906,6 +939,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.kinesis", "resource_names": "EXAMPLE", "span.kind": "server", @@ -921,6 +955,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:kinesis:EXAMPLE", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -946,6 +981,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python310", @@ -976,13 +1012,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1003,13 +1041,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1073,6 +1113,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.s3", "resource_names": "example-bucket", "span.kind": "server", @@ -1087,6 +1128,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:s3:::example-bucket", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1104,10 +1146,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.s3.object", - "ptr.dir": "u", "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", - "link.kind": "span-pointer" + "ptr.kind": "aws.s3.object", + "link.kind": "span-pointer", + "ptr.dir": "u" } } ] @@ -1124,6 +1166,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python310", @@ -1154,13 +1197,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1181,13 +1226,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1253,6 +1300,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sns", "resource_names": "sns-lambda", "span.kind": "server", @@ -1266,6 +1314,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1291,6 +1340,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python310", @@ -1321,13 +1371,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1348,13 +1400,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1420,6 +1474,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sqs", "resource_names": "my-queue", "span.kind": "server", @@ -1432,6 +1487,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1457,6 +1513,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python310", @@ -1487,13 +1544,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1514,13 +1573,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1586,6 +1647,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.apigateway.websocket", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com$default", "endpoint": "$default", @@ -1604,6 +1666,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/p62c47itsb/stages/dev", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1629,6 +1692,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python310", @@ -1661,13 +1725,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1688,13 +1754,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 diff --git a/tests/integration/snapshots/logs/async-metrics_python311.log b/tests/integration/snapshots/logs/async-metrics_python311.log index d662cb7a..063f9fe0 100644 --- a/tests/integration/snapshots/logs/async-metrics_python311.log +++ b/tests/integration/snapshots/logs/async-metrics_python311.log @@ -54,6 +54,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/", "endpoint": "/", "http.method": "GET", @@ -71,6 +72,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/70ixmpl4fl/stages/Prod", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -96,6 +98,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "true", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python311", @@ -130,13 +133,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -157,13 +162,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -229,6 +236,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python311", @@ -261,13 +269,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -287,13 +297,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -368,6 +380,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.dynamodb", "resource_names": "ExampleTableWithStream", "span.kind": "server", @@ -383,6 +396,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:dynamodb:us-east-1:XXXX:us-east-1/ExampleTableWithStream/stream/2015-06-27T00:48:05.899", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -402,28 +416,28 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "attributes": { "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { + "link.kind": "span-pointer", "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "ptr.dir": "u" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.kind": "aws.dynamodb.item" } } ] @@ -440,6 +454,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python311", @@ -470,13 +485,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -497,13 +514,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -569,6 +588,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "span.kind": "server", @@ -577,6 +597,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "_inferred_span.tag_source": "self", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -602,6 +623,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python311", @@ -631,13 +653,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -658,13 +682,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -730,6 +756,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "endpoint": "/httpapi/get", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", "http.method": "GET", @@ -748,6 +775,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/x02yirxc7a/stages/$default", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -773,6 +801,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python311", @@ -807,13 +836,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -834,13 +865,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -906,6 +939,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.kinesis", "resource_names": "EXAMPLE", "span.kind": "server", @@ -921,6 +955,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:kinesis:EXAMPLE", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -946,6 +981,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python311", @@ -976,13 +1012,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1003,13 +1041,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1073,6 +1113,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.s3", "resource_names": "example-bucket", "span.kind": "server", @@ -1087,6 +1128,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:s3:::example-bucket", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1106,8 +1148,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "attributes": { "ptr.kind": "aws.s3.object", "ptr.dir": "u", - "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788" } } ] @@ -1124,6 +1166,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python311", @@ -1154,13 +1197,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1181,13 +1226,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1253,6 +1300,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sns", "resource_names": "sns-lambda", "span.kind": "server", @@ -1266,6 +1314,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1291,6 +1340,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python311", @@ -1321,13 +1371,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1348,13 +1400,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1420,6 +1474,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sqs", "resource_names": "my-queue", "span.kind": "server", @@ -1432,6 +1487,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1457,6 +1513,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python311", @@ -1487,13 +1544,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1514,13 +1573,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1586,6 +1647,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.apigateway.websocket", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com$default", "endpoint": "$default", @@ -1604,6 +1666,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/p62c47itsb/stages/dev", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1629,6 +1692,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python311", @@ -1661,13 +1725,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1688,13 +1754,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 diff --git a/tests/integration/snapshots/logs/async-metrics_python312.log b/tests/integration/snapshots/logs/async-metrics_python312.log index 0e492dac..af235bb7 100644 --- a/tests/integration/snapshots/logs/async-metrics_python312.log +++ b/tests/integration/snapshots/logs/async-metrics_python312.log @@ -54,6 +54,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/", "endpoint": "/", "http.method": "GET", @@ -71,6 +72,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/70ixmpl4fl/stages/Prod", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -96,6 +98,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "true", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python312", @@ -130,13 +133,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -157,13 +162,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -229,6 +236,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python312", @@ -261,13 +269,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -287,13 +297,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -368,6 +380,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.dynamodb", "resource_names": "ExampleTableWithStream", "span.kind": "server", @@ -383,6 +396,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:dynamodb:us-east-1:XXXX:us-east-1/ExampleTableWithStream/stream/2015-06-27T00:48:05.899", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -400,10 +414,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "ptr.kind": "aws.dynamodb.item", + "link.kind": "span-pointer", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } }, { @@ -412,8 +426,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "attributes": { "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } }, { @@ -421,9 +435,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span_id": "XXXX", "attributes": { "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u", + "link.kind": "span-pointer", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "ptr.dir": "u" } } ] @@ -440,6 +454,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python312", @@ -470,13 +485,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -497,13 +514,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -569,6 +588,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "span.kind": "server", @@ -577,6 +597,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "_inferred_span.tag_source": "self", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -602,6 +623,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python312", @@ -631,13 +653,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -658,13 +682,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -730,6 +756,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "endpoint": "/httpapi/get", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", "http.method": "GET", @@ -748,6 +775,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/x02yirxc7a/stages/$default", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -773,6 +801,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python312", @@ -807,13 +836,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -834,13 +865,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -906,6 +939,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.kinesis", "resource_names": "EXAMPLE", "span.kind": "server", @@ -921,6 +955,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:kinesis:EXAMPLE", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -946,6 +981,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python312", @@ -976,13 +1012,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1003,13 +1041,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1073,6 +1113,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.s3", "resource_names": "example-bucket", "span.kind": "server", @@ -1087,6 +1128,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:s3:::example-bucket", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1104,10 +1146,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.s3.object", "ptr.dir": "u", "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.kind": "aws.s3.object" } } ] @@ -1124,6 +1166,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python312", @@ -1154,13 +1197,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1181,13 +1226,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1253,6 +1300,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sns", "resource_names": "sns-lambda", "span.kind": "server", @@ -1266,6 +1314,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1291,6 +1340,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python312", @@ -1321,13 +1371,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1348,13 +1400,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1420,6 +1474,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sqs", "resource_names": "my-queue", "span.kind": "server", @@ -1432,6 +1487,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1457,6 +1513,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python312", @@ -1487,13 +1544,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1514,13 +1573,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1586,6 +1647,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.apigateway.websocket", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com$default", "endpoint": "$default", @@ -1604,6 +1666,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/p62c47itsb/stages/dev", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1629,6 +1692,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python312", @@ -1661,13 +1725,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1688,13 +1754,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 diff --git a/tests/integration/snapshots/logs/async-metrics_python313.log b/tests/integration/snapshots/logs/async-metrics_python313.log index 6466246c..4914615d 100644 --- a/tests/integration/snapshots/logs/async-metrics_python313.log +++ b/tests/integration/snapshots/logs/async-metrics_python313.log @@ -54,6 +54,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/", "endpoint": "/", "http.method": "GET", @@ -71,6 +72,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/70ixmpl4fl/stages/Prod", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -96,6 +98,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "true", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python313", @@ -130,13 +133,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -157,13 +162,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -229,6 +236,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python313", @@ -261,13 +269,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -287,13 +297,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -368,6 +380,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.dynamodb", "resource_names": "ExampleTableWithStream", "span.kind": "server", @@ -383,6 +396,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:dynamodb:us-east-1:XXXX:us-east-1/ExampleTableWithStream/stream/2015-06-27T00:48:05.899", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -400,30 +414,30 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { + "link.kind": "span-pointer", "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "ptr.dir": "u" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.kind": "aws.dynamodb.item" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u", + "link.kind": "span-pointer", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "ptr.kind": "aws.dynamodb.item", + "ptr.dir": "u" } } ] @@ -440,6 +454,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python313", @@ -470,13 +485,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -497,13 +514,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -569,6 +588,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "span.kind": "server", @@ -577,6 +597,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "_inferred_span.tag_source": "self", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -602,6 +623,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python313", @@ -631,13 +653,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -658,13 +682,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -730,6 +756,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "endpoint": "/httpapi/get", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", "http.method": "GET", @@ -748,6 +775,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/x02yirxc7a/stages/$default", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -773,6 +801,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python313", @@ -807,13 +836,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -834,13 +865,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -890,6 +923,7 @@ START } HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX +END Duration: XXXX ms Memory Used: XXXX MB { "traces": [ [ @@ -906,6 +940,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.kinesis", "resource_names": "EXAMPLE", "span.kind": "server", @@ -921,6 +956,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:kinesis:EXAMPLE", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -946,6 +982,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python313", @@ -976,13 +1013,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1003,13 +1042,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1019,7 +1060,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A ] ] } -END Duration: XXXX ms Memory Used: XXXX MB START { "m": "aws.lambda.enhanced.invocations", @@ -1073,6 +1113,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.s3", "resource_names": "example-bucket", "span.kind": "server", @@ -1087,6 +1128,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:s3:::example-bucket", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1104,10 +1146,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.s3.object", "ptr.dir": "u", + "link.kind": "span-pointer", "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", - "link.kind": "span-pointer" + "ptr.kind": "aws.s3.object" } } ] @@ -1124,6 +1166,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python313", @@ -1154,13 +1197,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1181,13 +1226,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1253,6 +1300,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sns", "resource_names": "sns-lambda", "span.kind": "server", @@ -1266,6 +1314,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1291,6 +1340,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python313", @@ -1321,13 +1371,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1348,13 +1400,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1420,6 +1474,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sqs", "resource_names": "my-queue", "span.kind": "server", @@ -1432,6 +1487,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1457,6 +1513,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python313", @@ -1487,13 +1544,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1514,13 +1573,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1586,6 +1647,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.apigateway.websocket", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com$default", "endpoint": "$default", @@ -1604,6 +1666,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/p62c47itsb/stages/dev", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1629,6 +1692,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python313", @@ -1661,13 +1725,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1688,13 +1754,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 diff --git a/tests/integration/snapshots/logs/async-metrics_python314.log b/tests/integration/snapshots/logs/async-metrics_python314.log index 2ff4a6c1..c0516a3b 100644 --- a/tests/integration/snapshots/logs/async-metrics_python314.log +++ b/tests/integration/snapshots/logs/async-metrics_python314.log @@ -54,6 +54,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/", "endpoint": "/", "http.method": "GET", @@ -71,6 +72,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/70ixmpl4fl/stages/Prod", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -96,6 +98,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "true", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python314", @@ -130,13 +133,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -157,13 +162,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -229,6 +236,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python314", @@ -261,13 +269,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -287,13 +297,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -368,6 +380,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.dynamodb", "resource_names": "ExampleTableWithStream", "span.kind": "server", @@ -383,6 +396,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "dd_resource_key": "arn:aws:dynamodb:us-east-1:XXXX:us-east-1/ExampleTableWithStream/stream/2015-06-27T00:48:05.899", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -400,20 +414,20 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.kind": "aws.dynamodb.item", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { + "link.kind": "span-pointer", "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "ptr.dir": "u" } }, { @@ -421,9 +435,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span_id": "XXXX", "attributes": { "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.dir": "u" } } ] @@ -440,6 +454,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python314", @@ -470,13 +485,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -497,13 +514,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -569,6 +588,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "span.kind": "server", @@ -577,6 +597,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "_inferred_span.tag_source": "self", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -602,6 +623,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python314", @@ -631,13 +653,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -658,13 +682,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -730,6 +756,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "endpoint": "/httpapi/get", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", "http.method": "GET", @@ -748,6 +775,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/x02yirxc7a/stages/$default", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -773,6 +801,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python314", @@ -807,13 +836,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -834,13 +865,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -906,6 +939,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.kinesis", "resource_names": "EXAMPLE", "span.kind": "server", @@ -921,6 +955,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "dd_resource_key": "arn:aws:kinesis:EXAMPLE", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -946,6 +981,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python314", @@ -976,13 +1012,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1003,13 +1041,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1073,6 +1113,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.s3", "resource_names": "example-bucket", "span.kind": "server", @@ -1087,6 +1128,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "dd_resource_key": "arn:aws:s3:::example-bucket", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1106,8 +1148,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "attributes": { "ptr.kind": "aws.s3.object", "ptr.dir": "u", - "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788" } } ] @@ -1124,6 +1166,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python314", @@ -1154,13 +1197,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1181,13 +1226,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1253,6 +1300,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sns", "resource_names": "sns-lambda", "span.kind": "server", @@ -1266,6 +1314,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "dd_resource_key": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1291,6 +1340,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python314", @@ -1321,13 +1371,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1348,13 +1400,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1420,6 +1474,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sqs", "resource_names": "my-queue", "span.kind": "server", @@ -1432,6 +1487,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "dd_resource_key": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1457,6 +1513,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python314", @@ -1487,13 +1544,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1514,13 +1573,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1586,6 +1647,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.apigateway.websocket", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com$default", "endpoint": "$default", @@ -1604,6 +1666,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/p62c47itsb/stages/dev", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1629,6 +1692,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python314", @@ -1661,13 +1725,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1688,13 +1754,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 diff --git a/tests/integration/snapshots/logs/sync-metrics_python310.log b/tests/integration/snapshots/logs/sync-metrics_python310.log index 997cc0e3..4cdb2c1f 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python310.log +++ b/tests/integration/snapshots/logs/sync-metrics_python310.log @@ -34,6 +34,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/", "endpoint": "/", "http.method": "GET", @@ -51,6 +52,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/70ixmpl4fl/stages/Prod", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -76,6 +78,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "true", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310", @@ -110,13 +113,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -137,13 +142,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -170,6 +177,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -177,6 +185,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -229,6 +238,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310", @@ -261,13 +271,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -287,13 +299,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -320,6 +334,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -327,6 +342,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -388,6 +404,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.dynamodb", "resource_names": "ExampleTableWithStream", "span.kind": "server", @@ -403,6 +420,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:dynamodb:us-east-1:XXXX:us-east-1/ExampleTableWithStream/stream/2015-06-27T00:48:05.899", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -420,29 +438,29 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { + "link.kind": "span-pointer", "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "ptr.dir": "u" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { + "link.kind": "span-pointer", "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { + "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "link.kind": "span-pointer" } } @@ -460,6 +478,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310", @@ -490,13 +509,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -517,13 +538,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -550,6 +573,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -557,6 +581,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -609,6 +634,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "span.kind": "server", @@ -617,6 +643,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "_inferred_span.tag_source": "self", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -642,6 +669,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310", @@ -671,13 +699,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -698,13 +728,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -731,6 +763,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -738,6 +771,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -790,6 +824,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "endpoint": "/httpapi/get", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", "http.method": "GET", @@ -808,6 +843,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/x02yirxc7a/stages/$default", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -833,6 +869,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310", @@ -867,13 +904,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -894,13 +933,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -927,6 +968,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -934,6 +976,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -986,6 +1029,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.kinesis", "resource_names": "EXAMPLE", "span.kind": "server", @@ -1001,6 +1045,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:kinesis:EXAMPLE", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1026,6 +1071,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310", @@ -1056,13 +1102,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1083,13 +1131,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1116,6 +1166,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1123,6 +1174,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1173,6 +1225,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.s3", "resource_names": "example-bucket", "span.kind": "server", @@ -1187,6 +1240,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:s3:::example-bucket", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1205,9 +1259,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span_id": "XXXX", "attributes": { "ptr.kind": "aws.s3.object", + "link.kind": "span-pointer", "ptr.dir": "u", - "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", - "link.kind": "span-pointer" + "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788" } } ] @@ -1224,6 +1278,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310", @@ -1254,13 +1309,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1281,13 +1338,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1314,6 +1373,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1321,6 +1381,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1373,6 +1434,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sns", "resource_names": "sns-lambda", "span.kind": "server", @@ -1386,6 +1448,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1411,6 +1474,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310", @@ -1441,13 +1505,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1468,13 +1534,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1501,6 +1569,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1508,6 +1577,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1560,6 +1630,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sqs", "resource_names": "my-queue", "span.kind": "server", @@ -1572,6 +1643,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1597,6 +1669,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310", @@ -1627,13 +1700,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1654,13 +1729,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1687,6 +1764,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1694,6 +1772,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1746,6 +1825,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.apigateway.websocket", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com$default", "endpoint": "$default", @@ -1764,6 +1844,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/p62c47itsb/stages/dev", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1789,6 +1870,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310", @@ -1821,13 +1903,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1848,13 +1932,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1881,6 +1967,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1888,6 +1975,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", diff --git a/tests/integration/snapshots/logs/sync-metrics_python311.log b/tests/integration/snapshots/logs/sync-metrics_python311.log index 4880a904..7f8b86b1 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python311.log +++ b/tests/integration/snapshots/logs/sync-metrics_python311.log @@ -34,6 +34,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/", "endpoint": "/", "http.method": "GET", @@ -51,6 +52,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/70ixmpl4fl/stages/Prod", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -76,6 +78,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "true", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python311", @@ -110,13 +113,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -137,13 +142,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -170,6 +177,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -177,6 +185,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -229,6 +238,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python311", @@ -261,13 +271,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -287,13 +299,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -320,6 +334,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -327,6 +342,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -388,6 +404,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.dynamodb", "resource_names": "ExampleTableWithStream", "span.kind": "server", @@ -403,6 +420,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:dynamodb:us-east-1:XXXX:us-east-1/ExampleTableWithStream/stream/2015-06-27T00:48:05.899", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -420,20 +438,20 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u", + "link.kind": "span-pointer", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "ptr.dir": "u", + "ptr.kind": "aws.dynamodb.item" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u", + "link.kind": "span-pointer", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "ptr.dir": "u", + "ptr.kind": "aws.dynamodb.item" } }, { @@ -460,6 +478,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python311", @@ -490,13 +509,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -517,13 +538,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -550,6 +573,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -557,6 +581,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -609,6 +634,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "span.kind": "server", @@ -617,6 +643,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "_inferred_span.tag_source": "self", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -642,6 +669,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python311", @@ -671,13 +699,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -698,13 +728,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -731,6 +763,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -738,6 +771,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -790,6 +824,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "endpoint": "/httpapi/get", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", "http.method": "GET", @@ -808,6 +843,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/x02yirxc7a/stages/$default", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -833,6 +869,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python311", @@ -867,13 +904,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -894,13 +933,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -927,6 +968,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -934,6 +976,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -986,6 +1029,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.kinesis", "resource_names": "EXAMPLE", "span.kind": "server", @@ -1001,6 +1045,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:kinesis:EXAMPLE", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1026,6 +1071,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python311", @@ -1056,13 +1102,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1083,13 +1131,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1116,6 +1166,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1123,6 +1174,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1173,6 +1225,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.s3", "resource_names": "example-bucket", "span.kind": "server", @@ -1187,6 +1240,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:s3:::example-bucket", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1204,10 +1258,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.s3.object", - "ptr.dir": "u", "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.kind": "aws.s3.object", + "ptr.dir": "u" } } ] @@ -1224,6 +1278,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python311", @@ -1254,13 +1309,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1281,13 +1338,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1314,6 +1373,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1321,6 +1381,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1373,6 +1434,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sns", "resource_names": "sns-lambda", "span.kind": "server", @@ -1386,6 +1448,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1411,6 +1474,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python311", @@ -1441,13 +1505,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1468,13 +1534,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1501,6 +1569,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1508,6 +1577,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1560,6 +1630,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sqs", "resource_names": "my-queue", "span.kind": "server", @@ -1572,6 +1643,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1597,6 +1669,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python311", @@ -1627,13 +1700,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1654,13 +1729,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1687,6 +1764,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1694,6 +1772,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1746,6 +1825,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.apigateway.websocket", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com$default", "endpoint": "$default", @@ -1764,6 +1844,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/p62c47itsb/stages/dev", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1789,6 +1870,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python311", @@ -1821,13 +1903,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1848,13 +1932,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1881,6 +1967,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1888,6 +1975,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", diff --git a/tests/integration/snapshots/logs/sync-metrics_python312.log b/tests/integration/snapshots/logs/sync-metrics_python312.log index 0ed8cb0f..ae9a959c 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python312.log +++ b/tests/integration/snapshots/logs/sync-metrics_python312.log @@ -34,6 +34,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/", "endpoint": "/", "http.method": "GET", @@ -51,6 +52,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/70ixmpl4fl/stages/Prod", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -76,6 +78,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "true", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python312", @@ -110,13 +113,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -137,13 +142,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -170,6 +177,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -177,6 +185,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -229,6 +238,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python312", @@ -261,13 +271,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -287,13 +299,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -320,6 +334,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -327,6 +342,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -388,6 +404,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.dynamodb", "resource_names": "ExampleTableWithStream", "span.kind": "server", @@ -403,6 +420,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:dynamodb:us-east-1:XXXX:us-east-1/ExampleTableWithStream/stream/2015-06-27T00:48:05.899", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -420,19 +438,19 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.dir": "u", + "ptr.kind": "aws.dynamodb.item" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", + "ptr.dir": "u", + "ptr.kind": "aws.dynamodb.item", "link.kind": "span-pointer" } }, @@ -440,10 +458,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.kind": "aws.dynamodb.item" } } ] @@ -460,6 +478,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python312", @@ -490,13 +509,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -517,13 +538,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -550,6 +573,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -557,6 +581,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -609,6 +634,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "span.kind": "server", @@ -617,6 +643,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "_inferred_span.tag_source": "self", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -642,6 +669,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python312", @@ -671,13 +699,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -698,13 +728,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -731,6 +763,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -738,6 +771,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -790,6 +824,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "endpoint": "/httpapi/get", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", "http.method": "GET", @@ -808,6 +843,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/x02yirxc7a/stages/$default", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -833,6 +869,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python312", @@ -867,13 +904,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -894,13 +933,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -927,6 +968,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -934,6 +976,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -986,6 +1029,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.kinesis", "resource_names": "EXAMPLE", "span.kind": "server", @@ -1001,6 +1045,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:kinesis:EXAMPLE", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1026,6 +1071,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python312", @@ -1056,13 +1102,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1083,13 +1131,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1116,6 +1166,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1123,6 +1174,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1173,6 +1225,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.s3", "resource_names": "example-bucket", "span.kind": "server", @@ -1187,6 +1240,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:s3:::example-bucket", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1204,10 +1258,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.s3.object", - "ptr.dir": "u", "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", - "link.kind": "span-pointer" + "ptr.dir": "u", + "link.kind": "span-pointer", + "ptr.kind": "aws.s3.object" } } ] @@ -1224,6 +1278,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python312", @@ -1254,13 +1309,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1281,13 +1338,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1314,6 +1373,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1321,6 +1381,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1373,6 +1434,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sns", "resource_names": "sns-lambda", "span.kind": "server", @@ -1386,6 +1448,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1411,6 +1474,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python312", @@ -1441,13 +1505,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1468,13 +1534,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1501,6 +1569,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1508,6 +1577,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1560,6 +1630,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sqs", "resource_names": "my-queue", "span.kind": "server", @@ -1572,6 +1643,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1597,6 +1669,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python312", @@ -1627,13 +1700,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1654,13 +1729,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1687,6 +1764,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1694,6 +1772,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1746,6 +1825,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.apigateway.websocket", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com$default", "endpoint": "$default", @@ -1764,6 +1844,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/p62c47itsb/stages/dev", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1789,6 +1870,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python312", @@ -1821,13 +1903,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1848,13 +1932,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1881,6 +1967,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1888,6 +1975,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", diff --git a/tests/integration/snapshots/logs/sync-metrics_python313.log b/tests/integration/snapshots/logs/sync-metrics_python313.log index fca4631c..34a85e8b 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python313.log +++ b/tests/integration/snapshots/logs/sync-metrics_python313.log @@ -34,6 +34,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/", "endpoint": "/", "http.method": "GET", @@ -51,6 +52,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/70ixmpl4fl/stages/Prod", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -76,6 +78,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "true", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python313", @@ -110,13 +113,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -137,13 +142,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -170,6 +177,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -177,6 +185,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -229,6 +238,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python313", @@ -261,13 +271,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -287,13 +299,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -320,6 +334,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -327,6 +342,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -388,6 +404,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.dynamodb", "resource_names": "ExampleTableWithStream", "span.kind": "server", @@ -403,6 +420,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:dynamodb:us-east-1:XXXX:us-east-1/ExampleTableWithStream/stream/2015-06-27T00:48:05.899", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -420,10 +438,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { + "link.kind": "span-pointer", "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "ptr.dir": "u" } }, { @@ -431,19 +449,19 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span_id": "XXXX", "attributes": { "ptr.kind": "aws.dynamodb.item", + "link.kind": "span-pointer", "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.kind": "aws.dynamodb.item", + "ptr.dir": "u" } } ] @@ -460,6 +478,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python313", @@ -490,13 +509,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -517,13 +538,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -550,6 +573,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -557,6 +581,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -609,6 +634,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "span.kind": "server", @@ -617,6 +643,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "_inferred_span.tag_source": "self", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -642,6 +669,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python313", @@ -671,13 +699,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -698,13 +728,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -731,6 +763,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -738,6 +771,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -790,6 +824,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "endpoint": "/httpapi/get", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", "http.method": "GET", @@ -808,6 +843,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/x02yirxc7a/stages/$default", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -833,6 +869,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python313", @@ -867,13 +904,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -894,13 +933,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -927,6 +968,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -934,6 +976,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -986,6 +1029,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.kinesis", "resource_names": "EXAMPLE", "span.kind": "server", @@ -1001,6 +1045,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:kinesis:EXAMPLE", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1026,6 +1071,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python313", @@ -1056,13 +1102,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1083,13 +1131,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1116,6 +1166,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1123,6 +1174,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1173,6 +1225,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.s3", "resource_names": "example-bucket", "span.kind": "server", @@ -1187,6 +1240,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:s3:::example-bucket", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1204,10 +1258,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.s3.object", "ptr.dir": "u", - "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", - "link.kind": "span-pointer" + "ptr.kind": "aws.s3.object", + "link.kind": "span-pointer", + "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788" } } ] @@ -1224,6 +1278,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python313", @@ -1254,13 +1309,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1281,13 +1338,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1314,6 +1373,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1321,6 +1381,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1373,6 +1434,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sns", "resource_names": "sns-lambda", "span.kind": "server", @@ -1386,6 +1448,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1411,6 +1474,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python313", @@ -1441,13 +1505,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1468,13 +1534,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1501,6 +1569,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1508,6 +1577,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1560,6 +1630,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sqs", "resource_names": "my-queue", "span.kind": "server", @@ -1572,6 +1643,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1597,6 +1669,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python313", @@ -1627,13 +1700,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1654,13 +1729,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1687,6 +1764,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1694,6 +1772,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1746,6 +1825,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.apigateway.websocket", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com$default", "endpoint": "$default", @@ -1764,6 +1844,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/p62c47itsb/stages/dev", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1789,6 +1870,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python313", @@ -1821,13 +1903,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1848,13 +1932,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1881,6 +1967,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1888,6 +1975,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", diff --git a/tests/integration/snapshots/logs/sync-metrics_python314.log b/tests/integration/snapshots/logs/sync-metrics_python314.log index 8b6eb8f0..b6f6aa81 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python314.log +++ b/tests/integration/snapshots/logs/sync-metrics_python314.log @@ -34,6 +34,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/", "endpoint": "/", "http.method": "GET", @@ -51,6 +52,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/70ixmpl4fl/stages/Prod", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -76,6 +78,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "true", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python314", @@ -110,13 +113,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -137,13 +142,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -170,6 +177,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -177,6 +185,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -229,6 +238,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python314", @@ -261,13 +271,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -287,13 +299,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -320,6 +334,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -327,6 +342,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -388,6 +404,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.dynamodb", "resource_names": "ExampleTableWithStream", "span.kind": "server", @@ -403,6 +420,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "dd_resource_key": "arn:aws:dynamodb:us-east-1:XXXX:us-east-1/ExampleTableWithStream/stream/2015-06-27T00:48:05.899", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -420,9 +438,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", + "ptr.kind": "aws.dynamodb.item", "link.kind": "span-pointer" } }, @@ -430,10 +448,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.kind": "aws.dynamodb.item", + "ptr.dir": "u" } }, { @@ -442,8 +460,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "attributes": { "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } } ] @@ -460,6 +478,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python314", @@ -490,13 +509,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -517,13 +538,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -550,6 +573,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -557,6 +581,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -609,6 +634,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.eventbridge", "resource_names": "eventbridge.custom.event.sender", "span.kind": "server", @@ -617,6 +643,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "_inferred_span.tag_source": "self", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -642,6 +669,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python314", @@ -671,13 +699,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -698,13 +728,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -731,6 +763,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -738,6 +771,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -790,6 +824,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "endpoint": "/httpapi/get", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", "http.method": "GET", @@ -808,6 +843,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/x02yirxc7a/stages/$default", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -833,6 +869,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python314", @@ -867,13 +904,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -894,13 +933,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -927,6 +968,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -934,6 +976,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -986,6 +1029,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.kinesis", "resource_names": "EXAMPLE", "span.kind": "server", @@ -1001,6 +1045,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "dd_resource_key": "arn:aws:kinesis:EXAMPLE", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1026,6 +1071,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python314", @@ -1056,13 +1102,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1083,13 +1131,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1116,6 +1166,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1123,6 +1174,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1173,6 +1225,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.s3", "resource_names": "example-bucket", "span.kind": "server", @@ -1187,6 +1240,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "dd_resource_key": "arn:aws:s3:::example-bucket", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1204,10 +1258,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.s3.object", - "ptr.dir": "u", "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.kind": "aws.s3.object", + "ptr.dir": "u" } } ] @@ -1224,6 +1278,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python314", @@ -1254,13 +1309,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1281,13 +1338,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1314,6 +1373,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1321,6 +1381,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1373,6 +1434,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sns", "resource_names": "sns-lambda", "span.kind": "server", @@ -1386,6 +1448,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "dd_resource_key": "arn:aws:sns:us-east-2:XXXX:us-east-2-lambda", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1411,6 +1474,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python314", @@ -1441,13 +1505,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1468,13 +1534,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1501,6 +1569,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1508,6 +1577,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1560,6 +1630,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.sqs", "resource_names": "my-queue", "span.kind": "server", @@ -1572,6 +1643,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "dd_resource_key": "arn:aws:sqs:us-east-2:XXXX:us-east-2-queue", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1597,6 +1669,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python314", @@ -1627,13 +1700,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1654,13 +1729,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1687,6 +1764,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1694,6 +1772,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1746,6 +1825,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "m", "operation_name": "aws.apigateway.websocket", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com$default", "endpoint": "$default", @@ -1764,6 +1844,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "dd_resource_key": "arn:aws:apigateway:eu-west-1:XXXX:eu-west-1/restapis/p62c47itsb/stages/dev", "peer.service": "integration-tests-python", "_dd.peer.service.source": "peer.service", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", @@ -1789,6 +1870,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "m", "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python314", @@ -1821,13 +1903,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://datadoghq.com/", "out.host": "datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1, @@ -1848,13 +1932,15 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "meta": { "_dd.p.tid": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "GET", "http.url": "https://www.datadoghq.com/", "out.host": "www.datadoghq.com", "http.status_code": "200", - "http.useragent": "python-requests/X.X.X" + "http.useragent": "python-requests/X.X.X", + "_dd.base_service": "integration-tests-python" }, "metrics": { "_dd.measured": 1 @@ -1881,6 +1967,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "_dd.svc_src": "requests", "component": "requests", "span.kind": "client", "http.method": "POST", @@ -1888,6 +1975,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept "out.host": "api.datadoghq.com", "http.status_code": "202", "http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)", + "_dd.base_service": "integration-tests-python", "_dd.p.dm": "-0", "_dd.p.tid": "XXXX", "language": "python", From 12b287b5a7d879fd9efe3a6c7a1467adfd3e4544 Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 1 May 2026 13:53:25 -0400 Subject: [PATCH 13/17] remove extra file --- pyproject.toml.bak | 70 ---------------------------------------------- 1 file changed, 70 deletions(-) delete mode 100644 pyproject.toml.bak diff --git a/pyproject.toml.bak b/pyproject.toml.bak deleted file mode 100644 index 105fa4d5..00000000 --- a/pyproject.toml.bak +++ /dev/null @@ -1,70 +0,0 @@ -[tool.poetry] -name = "datadog_lambda" -version = "8.125.0.dev0" -description = "The Datadog AWS Lambda Library" -authors = ["Datadog, Inc. "] -license = "Apache-2.0" -readme = "README.md" -repository = "https://github.com/DataDog/datadog-lambda-python" -keywords = [ - "datadog", - "aws", - "lambda", - "layer", -] -packages = [ - { include = "datadog_lambda" } -] -classifiers = [ - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "Programming Language :: Python :: 3.13", - "Programming Language :: Python :: 3.14", -] - -[tool.poetry.dependencies] -python = ">=3.8.0,<3.15" -datadog = ">=0.51.0,<1.0.0" -wrapt = "^1.11.2" -ddtrace = [ - {version = ">=3.19.1,<4", python = ">=3.8,<3.10"}, - {version = ">=4.1.1,<5,!=4.6.*", python = ">=3.10"} -] -ujson = [ - {version = ">=5.10.0,<5.12.0", python = ">=3.8,<3.10"}, - {version = "^5.12.0", python = ">=3.10"}, -] -urllib3 = [ - {version = ">=1.25.4,<1.27", python = ">=3.8,<3.10"}, - {version = "^2.6.3", python = ">=3.10"}, -] -botocore = { version = "^1.34.0", optional = true } -requests = [ - { version = "^2.22.0", optional = true, python = ">=3.8,<3.10" }, - { version = "^2.33.0", optional = true, python = ">=3.10" }, -] -pytest = [ - { version = "^8.3.4", optional = true, python = ">=3.8,<3.10" }, - { version = "^9.0.3", optional = true, python = ">=3.10" }, -] -pytest-benchmark = { version = "^4.0", optional = true } -flake8 = { version = "^5.0.4", optional = true } - -[tool.poetry.extras] -dev = [ - "botocore", - "flake8", - "pytest", - "pytest-benchmark", - "requests", -] - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" - -[tool.pytest.ini_options] -addopts = "--benchmark-disable --benchmark-autosave" From a24e6d4dd628e23b0747426e754f7be034cc79e9 Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 1 May 2026 14:56:49 -0400 Subject: [PATCH 14/17] arm snapshots --- pyproject.toml.bak | 70 +++++++++++++++++++ .../logs/async-metrics_python310.log | 6 +- .../logs/async-metrics_python311.log | 20 +++--- .../logs/async-metrics_python312.log | 20 +++--- .../logs/async-metrics_python313.log | 14 ++-- .../logs/async-metrics_python314.log | 18 ++--- .../snapshots/logs/sync-metrics_python310.log | 12 ++-- .../snapshots/logs/sync-metrics_python311.log | 18 ++--- .../snapshots/logs/sync-metrics_python312.log | 18 ++--- .../snapshots/logs/sync-metrics_python313.log | 16 ++--- .../snapshots/logs/sync-metrics_python314.log | 12 ++-- 11 files changed, 147 insertions(+), 77 deletions(-) create mode 100644 pyproject.toml.bak diff --git a/pyproject.toml.bak b/pyproject.toml.bak new file mode 100644 index 00000000..105fa4d5 --- /dev/null +++ b/pyproject.toml.bak @@ -0,0 +1,70 @@ +[tool.poetry] +name = "datadog_lambda" +version = "8.125.0.dev0" +description = "The Datadog AWS Lambda Library" +authors = ["Datadog, Inc. "] +license = "Apache-2.0" +readme = "README.md" +repository = "https://github.com/DataDog/datadog-lambda-python" +keywords = [ + "datadog", + "aws", + "lambda", + "layer", +] +packages = [ + { include = "datadog_lambda" } +] +classifiers = [ + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", +] + +[tool.poetry.dependencies] +python = ">=3.8.0,<3.15" +datadog = ">=0.51.0,<1.0.0" +wrapt = "^1.11.2" +ddtrace = [ + {version = ">=3.19.1,<4", python = ">=3.8,<3.10"}, + {version = ">=4.1.1,<5,!=4.6.*", python = ">=3.10"} +] +ujson = [ + {version = ">=5.10.0,<5.12.0", python = ">=3.8,<3.10"}, + {version = "^5.12.0", python = ">=3.10"}, +] +urllib3 = [ + {version = ">=1.25.4,<1.27", python = ">=3.8,<3.10"}, + {version = "^2.6.3", python = ">=3.10"}, +] +botocore = { version = "^1.34.0", optional = true } +requests = [ + { version = "^2.22.0", optional = true, python = ">=3.8,<3.10" }, + { version = "^2.33.0", optional = true, python = ">=3.10" }, +] +pytest = [ + { version = "^8.3.4", optional = true, python = ">=3.8,<3.10" }, + { version = "^9.0.3", optional = true, python = ">=3.10" }, +] +pytest-benchmark = { version = "^4.0", optional = true } +flake8 = { version = "^5.0.4", optional = true } + +[tool.poetry.extras] +dev = [ + "botocore", + "flake8", + "pytest", + "pytest-benchmark", + "requests", +] + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" + +[tool.pytest.ini_options] +addopts = "--benchmark-disable --benchmark-autosave" diff --git a/tests/integration/snapshots/logs/async-metrics_python310.log b/tests/integration/snapshots/logs/async-metrics_python310.log index 3dbcfe0a..ab4722cc 100644 --- a/tests/integration/snapshots/logs/async-metrics_python310.log +++ b/tests/integration/snapshots/logs/async-metrics_python310.log @@ -434,8 +434,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "link.kind": "span-pointer", "ptr.kind": "aws.dynamodb.item", + "link.kind": "span-pointer", "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } @@ -1146,10 +1146,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { + "ptr.dir": "u", "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", - "ptr.kind": "aws.s3.object", "link.kind": "span-pointer", - "ptr.dir": "u" + "ptr.kind": "aws.s3.object" } } ] diff --git a/tests/integration/snapshots/logs/async-metrics_python311.log b/tests/integration/snapshots/logs/async-metrics_python311.log index 063f9fe0..952b5a62 100644 --- a/tests/integration/snapshots/logs/async-metrics_python311.log +++ b/tests/integration/snapshots/logs/async-metrics_python311.log @@ -414,10 +414,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "link.kind": "span-pointer", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e" + "ptr.kind": "aws.dynamodb.item", + "ptr.dir": "u" } }, { @@ -426,18 +426,18 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "attributes": { "link.kind": "span-pointer", "ptr.kind": "aws.dynamodb.item", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "ptr.dir": "u" + "ptr.dir": "u", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { + "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "link.kind": "span-pointer", - "ptr.kind": "aws.dynamodb.item" + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } } ] @@ -1146,10 +1146,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.s3.object", - "ptr.dir": "u", "link.kind": "span-pointer", - "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788" + "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", + "ptr.dir": "u", + "ptr.kind": "aws.s3.object" } } ] diff --git a/tests/integration/snapshots/logs/async-metrics_python312.log b/tests/integration/snapshots/logs/async-metrics_python312.log index af235bb7..f8252c45 100644 --- a/tests/integration/snapshots/logs/async-metrics_python312.log +++ b/tests/integration/snapshots/logs/async-metrics_python312.log @@ -415,29 +415,29 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span_id": "XXXX", "attributes": { "ptr.dir": "u", - "ptr.kind": "aws.dynamodb.item", "link.kind": "span-pointer", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e" + "ptr.hash": "e2af34d333891f765c7f02d2da80895e", + "ptr.kind": "aws.dynamodb.item" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", "link.kind": "span-pointer", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e" + "ptr.hash": "e2af34d333891f765c7f02d2da80895e", + "ptr.kind": "aws.dynamodb.item" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", - "link.kind": "span-pointer", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "ptr.dir": "u" + "ptr.dir": "u", + "ptr.kind": "aws.dynamodb.item", + "link.kind": "span-pointer" } } ] @@ -1146,10 +1146,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.dir": "u", "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", - "link.kind": "span-pointer", - "ptr.kind": "aws.s3.object" + "ptr.dir": "u", + "ptr.kind": "aws.s3.object", + "link.kind": "span-pointer" } } ] diff --git a/tests/integration/snapshots/logs/async-metrics_python313.log b/tests/integration/snapshots/logs/async-metrics_python313.log index 4914615d..73d66d2b 100644 --- a/tests/integration/snapshots/logs/async-metrics_python313.log +++ b/tests/integration/snapshots/logs/async-metrics_python313.log @@ -414,20 +414,20 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "link.kind": "span-pointer", + "ptr.dir": "u", "ptr.kind": "aws.dynamodb.item", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "ptr.dir": "u" + "link.kind": "span-pointer" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.dir": "u", + "ptr.kind": "aws.dynamodb.item", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer", - "ptr.kind": "aws.dynamodb.item" + "ptr.dir": "u", + "link.kind": "span-pointer" } }, { @@ -923,7 +923,6 @@ START } HTTP GET https://datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","Accept:*/*","Connection:keep-alive","User-Agent:python-requests/X.X.X","traceparent:XXX","tracestate:XXX -END Duration: XXXX ms Memory Used: XXXX MB { "traces": [ [ @@ -1060,6 +1059,7 @@ END Duration: XXXX ms Memory Used: XXXX MB ] ] } +END Duration: XXXX ms Memory Used: XXXX MB START { "m": "aws.lambda.enhanced.invocations", @@ -1146,9 +1146,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.dir": "u", "link.kind": "span-pointer", "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", + "ptr.dir": "u", "ptr.kind": "aws.s3.object" } } diff --git a/tests/integration/snapshots/logs/async-metrics_python314.log b/tests/integration/snapshots/logs/async-metrics_python314.log index c0516a3b..7f554297 100644 --- a/tests/integration/snapshots/logs/async-metrics_python314.log +++ b/tests/integration/snapshots/logs/async-metrics_python314.log @@ -414,9 +414,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "trace_id": "XXXX", "span_id": "XXXX", "attributes": { + "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", "link.kind": "span-pointer", - "ptr.kind": "aws.dynamodb.item", "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } }, @@ -424,10 +424,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "link.kind": "span-pointer", - "ptr.kind": "aws.dynamodb.item", + "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "ptr.dir": "u" + "link.kind": "span-pointer", + "ptr.kind": "aws.dynamodb.item" } }, { @@ -435,9 +435,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "span_id": "XXXX", "attributes": { "ptr.kind": "aws.dynamodb.item", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", + "ptr.dir": "u", "link.kind": "span-pointer", - "ptr.dir": "u" + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } } ] @@ -1146,10 +1146,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.s3.object", - "ptr.dir": "u", + "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", "link.kind": "span-pointer", - "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788" + "ptr.dir": "u", + "ptr.kind": "aws.s3.object" } } ] diff --git a/tests/integration/snapshots/logs/sync-metrics_python310.log b/tests/integration/snapshots/logs/sync-metrics_python310.log index 4cdb2c1f..ba6882e3 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python310.log +++ b/tests/integration/snapshots/logs/sync-metrics_python310.log @@ -438,9 +438,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "link.kind": "span-pointer", "ptr.kind": "aws.dynamodb.item", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", + "link.kind": "span-pointer", "ptr.dir": "u" } }, @@ -448,9 +448,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "link.kind": "span-pointer", "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", + "link.kind": "span-pointer", "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } }, @@ -458,10 +458,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", + "link.kind": "span-pointer", "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", - "link.kind": "span-pointer" + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } } ] @@ -1258,10 +1258,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.s3.object", "link.kind": "span-pointer", "ptr.dir": "u", - "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788" + "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", + "ptr.kind": "aws.s3.object" } } ] diff --git a/tests/integration/snapshots/logs/sync-metrics_python311.log b/tests/integration/snapshots/logs/sync-metrics_python311.log index 7f8b86b1..72affdf9 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python311.log +++ b/tests/integration/snapshots/logs/sync-metrics_python311.log @@ -438,10 +438,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "link.kind": "span-pointer", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", + "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", - "ptr.kind": "aws.dynamodb.item" + "link.kind": "span-pointer" } }, { @@ -450,18 +450,18 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "attributes": { "link.kind": "span-pointer", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "ptr.dir": "u", - "ptr.kind": "aws.dynamodb.item" + "ptr.kind": "aws.dynamodb.item", + "ptr.dir": "u" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", + "link.kind": "span-pointer", "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "ptr.kind": "aws.dynamodb.item", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } } ] @@ -1258,10 +1258,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", + "ptr.dir": "u", "link.kind": "span-pointer", "ptr.kind": "aws.s3.object", - "ptr.dir": "u" + "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788" } } ] diff --git a/tests/integration/snapshots/logs/sync-metrics_python312.log b/tests/integration/snapshots/logs/sync-metrics_python312.log index ae9a959c..ec690994 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python312.log +++ b/tests/integration/snapshots/logs/sync-metrics_python312.log @@ -438,19 +438,19 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "link.kind": "span-pointer", - "ptr.dir": "u", - "ptr.kind": "aws.dynamodb.item" + "ptr.kind": "aws.dynamodb.item", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e", + "ptr.dir": "u" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "ptr.dir": "u", "ptr.kind": "aws.dynamodb.item", + "ptr.dir": "u", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "link.kind": "span-pointer" } }, @@ -459,9 +459,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span_id": "XXXX", "attributes": { "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", + "ptr.kind": "aws.dynamodb.item", "link.kind": "span-pointer", - "ptr.kind": "aws.dynamodb.item" + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } } ] @@ -1258,9 +1258,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", - "ptr.dir": "u", "link.kind": "span-pointer", + "ptr.dir": "u", + "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", "ptr.kind": "aws.s3.object" } } diff --git a/tests/integration/snapshots/logs/sync-metrics_python313.log b/tests/integration/snapshots/logs/sync-metrics_python313.log index 34a85e8b..1075f8e2 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python313.log +++ b/tests/integration/snapshots/logs/sync-metrics_python313.log @@ -438,28 +438,28 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "link.kind": "span-pointer", - "ptr.kind": "aws.dynamodb.item", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "ptr.dir": "u" + "ptr.dir": "u", + "link.kind": "span-pointer", + "ptr.kind": "aws.dynamodb.item" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", "link.kind": "span-pointer", - "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e" + "ptr.hash": "e2af34d333891f765c7f02d2da80895e", + "ptr.kind": "aws.dynamodb.item", + "ptr.dir": "u" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "link.kind": "span-pointer", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u" } @@ -1258,8 +1258,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.dir": "u", "ptr.kind": "aws.s3.object", + "ptr.dir": "u", "link.kind": "span-pointer", "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788" } diff --git a/tests/integration/snapshots/logs/sync-metrics_python314.log b/tests/integration/snapshots/logs/sync-metrics_python314.log index b6f6aa81..e52a19e0 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python314.log +++ b/tests/integration/snapshots/logs/sync-metrics_python314.log @@ -438,10 +438,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "ptr.kind": "aws.dynamodb.item", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.dir": "u", + "ptr.kind": "aws.dynamodb.item" } }, { @@ -458,10 +458,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "link.kind": "span-pointer", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e" + "ptr.kind": "aws.dynamodb.item" } } ] @@ -1258,9 +1258,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", "link.kind": "span-pointer", "ptr.kind": "aws.s3.object", + "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", "ptr.dir": "u" } } From 235bf4f8292e785257b6f1cc3a5ef2fd9dd5d51e Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 1 May 2026 14:57:10 -0400 Subject: [PATCH 15/17] remove extra --- pyproject.toml.bak | 70 ---------------------------------------------- 1 file changed, 70 deletions(-) delete mode 100644 pyproject.toml.bak diff --git a/pyproject.toml.bak b/pyproject.toml.bak deleted file mode 100644 index 105fa4d5..00000000 --- a/pyproject.toml.bak +++ /dev/null @@ -1,70 +0,0 @@ -[tool.poetry] -name = "datadog_lambda" -version = "8.125.0.dev0" -description = "The Datadog AWS Lambda Library" -authors = ["Datadog, Inc. "] -license = "Apache-2.0" -readme = "README.md" -repository = "https://github.com/DataDog/datadog-lambda-python" -keywords = [ - "datadog", - "aws", - "lambda", - "layer", -] -packages = [ - { include = "datadog_lambda" } -] -classifiers = [ - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "Programming Language :: Python :: 3.13", - "Programming Language :: Python :: 3.14", -] - -[tool.poetry.dependencies] -python = ">=3.8.0,<3.15" -datadog = ">=0.51.0,<1.0.0" -wrapt = "^1.11.2" -ddtrace = [ - {version = ">=3.19.1,<4", python = ">=3.8,<3.10"}, - {version = ">=4.1.1,<5,!=4.6.*", python = ">=3.10"} -] -ujson = [ - {version = ">=5.10.0,<5.12.0", python = ">=3.8,<3.10"}, - {version = "^5.12.0", python = ">=3.10"}, -] -urllib3 = [ - {version = ">=1.25.4,<1.27", python = ">=3.8,<3.10"}, - {version = "^2.6.3", python = ">=3.10"}, -] -botocore = { version = "^1.34.0", optional = true } -requests = [ - { version = "^2.22.0", optional = true, python = ">=3.8,<3.10" }, - { version = "^2.33.0", optional = true, python = ">=3.10" }, -] -pytest = [ - { version = "^8.3.4", optional = true, python = ">=3.8,<3.10" }, - { version = "^9.0.3", optional = true, python = ">=3.10" }, -] -pytest-benchmark = { version = "^4.0", optional = true } -flake8 = { version = "^5.0.4", optional = true } - -[tool.poetry.extras] -dev = [ - "botocore", - "flake8", - "pytest", - "pytest-benchmark", - "requests", -] - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" - -[tool.pytest.ini_options] -addopts = "--benchmark-disable --benchmark-autosave" From c98e8ca7a100ab2b2c95d3481bb1fa019b873c73 Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 1 May 2026 16:41:39 -0400 Subject: [PATCH 16/17] trying to fix snapshots --- pyproject.toml.bak | 70 +++++++++++++++++++ .../logs/async-metrics_python310.log | 22 +++--- .../logs/async-metrics_python311.log | 18 ++--- .../logs/async-metrics_python312.log | 14 ++-- .../logs/async-metrics_python313.log | 16 ++--- .../logs/async-metrics_python314.log | 14 ++-- .../snapshots/logs/async-metrics_python38.log | 20 +++--- .../snapshots/logs/async-metrics_python39.log | 20 +++--- .../snapshots/logs/sync-metrics_python310.log | 14 ++-- .../snapshots/logs/sync-metrics_python311.log | 18 ++--- .../snapshots/logs/sync-metrics_python312.log | 20 +++--- .../snapshots/logs/sync-metrics_python313.log | 16 ++--- .../snapshots/logs/sync-metrics_python314.log | 6 +- 13 files changed, 169 insertions(+), 99 deletions(-) create mode 100644 pyproject.toml.bak diff --git a/pyproject.toml.bak b/pyproject.toml.bak new file mode 100644 index 00000000..105fa4d5 --- /dev/null +++ b/pyproject.toml.bak @@ -0,0 +1,70 @@ +[tool.poetry] +name = "datadog_lambda" +version = "8.125.0.dev0" +description = "The Datadog AWS Lambda Library" +authors = ["Datadog, Inc. "] +license = "Apache-2.0" +readme = "README.md" +repository = "https://github.com/DataDog/datadog-lambda-python" +keywords = [ + "datadog", + "aws", + "lambda", + "layer", +] +packages = [ + { include = "datadog_lambda" } +] +classifiers = [ + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", +] + +[tool.poetry.dependencies] +python = ">=3.8.0,<3.15" +datadog = ">=0.51.0,<1.0.0" +wrapt = "^1.11.2" +ddtrace = [ + {version = ">=3.19.1,<4", python = ">=3.8,<3.10"}, + {version = ">=4.1.1,<5,!=4.6.*", python = ">=3.10"} +] +ujson = [ + {version = ">=5.10.0,<5.12.0", python = ">=3.8,<3.10"}, + {version = "^5.12.0", python = ">=3.10"}, +] +urllib3 = [ + {version = ">=1.25.4,<1.27", python = ">=3.8,<3.10"}, + {version = "^2.6.3", python = ">=3.10"}, +] +botocore = { version = "^1.34.0", optional = true } +requests = [ + { version = "^2.22.0", optional = true, python = ">=3.8,<3.10" }, + { version = "^2.33.0", optional = true, python = ">=3.10" }, +] +pytest = [ + { version = "^8.3.4", optional = true, python = ">=3.8,<3.10" }, + { version = "^9.0.3", optional = true, python = ">=3.10" }, +] +pytest-benchmark = { version = "^4.0", optional = true } +flake8 = { version = "^5.0.4", optional = true } + +[tool.poetry.extras] +dev = [ + "botocore", + "flake8", + "pytest", + "pytest-benchmark", + "requests", +] + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" + +[tool.pytest.ini_options] +addopts = "--benchmark-disable --benchmark-autosave" diff --git a/tests/integration/snapshots/logs/async-metrics_python310.log b/tests/integration/snapshots/logs/async-metrics_python310.log index ab4722cc..ef14a4db 100644 --- a/tests/integration/snapshots/logs/async-metrics_python310.log +++ b/tests/integration/snapshots/logs/async-metrics_python310.log @@ -414,30 +414,30 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.dir": "u", - "link.kind": "span-pointer", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "ptr.kind": "aws.dynamodb.item", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e" + "link.kind": "span-pointer", + "ptr.dir": "u" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", + "link.kind": "span-pointer", "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", - "link.kind": "span-pointer" + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", - "link.kind": "span-pointer", "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e" + "ptr.hash": "e2af34d333891f765c7f02d2da80895e", + "link.kind": "span-pointer", + "ptr.kind": "aws.dynamodb.item" } } ] @@ -1146,10 +1146,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.dir": "u", + "ptr.kind": "aws.s3.object", "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", - "link.kind": "span-pointer", - "ptr.kind": "aws.s3.object" + "ptr.dir": "u", + "link.kind": "span-pointer" } } ] diff --git a/tests/integration/snapshots/logs/async-metrics_python311.log b/tests/integration/snapshots/logs/async-metrics_python311.log index 952b5a62..3f71c6a5 100644 --- a/tests/integration/snapshots/logs/async-metrics_python311.log +++ b/tests/integration/snapshots/logs/async-metrics_python311.log @@ -414,20 +414,20 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "link.kind": "span-pointer", - "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u" + "ptr.dir": "u", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e", + "ptr.kind": "aws.dynamodb.item" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "link.kind": "span-pointer", - "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e" + "link.kind": "span-pointer", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e", + "ptr.kind": "aws.dynamodb.item" } }, { @@ -1146,10 +1146,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "link.kind": "span-pointer", - "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", + "ptr.kind": "aws.s3.object", "ptr.dir": "u", - "ptr.kind": "aws.s3.object" + "link.kind": "span-pointer", + "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788" } } ] diff --git a/tests/integration/snapshots/logs/async-metrics_python312.log b/tests/integration/snapshots/logs/async-metrics_python312.log index f8252c45..0c417762 100644 --- a/tests/integration/snapshots/logs/async-metrics_python312.log +++ b/tests/integration/snapshots/logs/async-metrics_python312.log @@ -415,19 +415,19 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span_id": "XXXX", "attributes": { "ptr.dir": "u", - "link.kind": "span-pointer", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "ptr.kind": "aws.dynamodb.item" + "ptr.kind": "aws.dynamodb.item", + "link.kind": "span-pointer" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.dir": "u", - "link.kind": "span-pointer", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "ptr.kind": "aws.dynamodb.item" + "ptr.kind": "aws.dynamodb.item", + "ptr.dir": "u", + "link.kind": "span-pointer" } }, { @@ -435,9 +435,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span_id": "XXXX", "attributes": { "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "ptr.dir": "u", "ptr.kind": "aws.dynamodb.item", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.dir": "u" } } ] diff --git a/tests/integration/snapshots/logs/async-metrics_python313.log b/tests/integration/snapshots/logs/async-metrics_python313.log index 73d66d2b..f09d3268 100644 --- a/tests/integration/snapshots/logs/async-metrics_python313.log +++ b/tests/integration/snapshots/logs/async-metrics_python313.log @@ -414,20 +414,20 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.dir": "u", "ptr.kind": "aws.dynamodb.item", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.dir": "u" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "ptr.dir": "u", - "link.kind": "span-pointer" + "link.kind": "span-pointer", + "ptr.kind": "aws.dynamodb.item" } }, { @@ -435,9 +435,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span_id": "XXXX", "attributes": { "link.kind": "span-pointer", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", + "ptr.dir": "u", "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u" + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } } ] @@ -1147,9 +1147,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span_id": "XXXX", "attributes": { "link.kind": "span-pointer", - "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", + "ptr.kind": "aws.s3.object", "ptr.dir": "u", - "ptr.kind": "aws.s3.object" + "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788" } } ] diff --git a/tests/integration/snapshots/logs/async-metrics_python314.log b/tests/integration/snapshots/logs/async-metrics_python314.log index 7f554297..52d887e2 100644 --- a/tests/integration/snapshots/logs/async-metrics_python314.log +++ b/tests/integration/snapshots/logs/async-metrics_python314.log @@ -414,9 +414,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", "link.kind": "span-pointer", + "ptr.kind": "aws.dynamodb.item", "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } }, @@ -424,19 +424,19 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "link.kind": "span-pointer", - "ptr.kind": "aws.dynamodb.item" + "ptr.hash": "e2af34d333891f765c7f02d2da80895e", + "ptr.kind": "aws.dynamodb.item", + "ptr.dir": "u" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { + "link.kind": "span-pointer", "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", - "link.kind": "span-pointer", "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } } @@ -1148,8 +1148,8 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "attributes": { "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", "link.kind": "span-pointer", - "ptr.dir": "u", - "ptr.kind": "aws.s3.object" + "ptr.kind": "aws.s3.object", + "ptr.dir": "u" } } ] diff --git a/tests/integration/snapshots/logs/async-metrics_python38.log b/tests/integration/snapshots/logs/async-metrics_python38.log index d4c33fe5..3e5491ed 100644 --- a/tests/integration/snapshots/logs/async-metrics_python38.log +++ b/tests/integration/snapshots/logs/async-metrics_python38.log @@ -95,6 +95,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "true", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", @@ -106,7 +107,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.name": "aws.lambda", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "XXXX", - "span.kind": "server", "http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/Prod/", "http.method": "GET", "http.route": "/", @@ -228,6 +228,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", @@ -237,7 +238,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "datadog_lambda": "X.X.X", "dd_trace": "X.X.X", "span.name": "aws.lambda", - "span.kind": "server", "language": "python" }, "metrics": { @@ -437,6 +437,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", @@ -446,7 +447,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "datadog_lambda": "X.X.X", "dd_trace": "X.X.X", "span.name": "aws.lambda", - "span.kind": "server", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "XXXX" }, @@ -598,6 +598,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", @@ -607,7 +608,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "datadog_lambda": "X.X.X", "dd_trace": "X.X.X", "span.name": "aws.lambda", - "span.kind": "server", "function_trigger.event_source": "eventbridge" }, "metrics": { @@ -768,6 +768,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", @@ -779,7 +780,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.name": "aws.lambda", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "XXXX$default", - "span.kind": "server", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", "http.method": "GET", "http.route": "/httpapi/get", @@ -940,6 +940,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", @@ -949,7 +950,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "datadog_lambda": "X.X.X", "dd_trace": "X.X.X", "span.name": "aws.lambda", - "span.kind": "server", "function_trigger.event_source": "kinesis", "function_trigger.event_source_arn": "XXXX" }, @@ -1117,6 +1117,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", @@ -1126,7 +1127,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "datadog_lambda": "X.X.X", "dd_trace": "X.X.X", "span.name": "aws.lambda", - "span.kind": "server", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "XXXX" }, @@ -1283,6 +1283,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", @@ -1292,7 +1293,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "datadog_lambda": "X.X.X", "dd_trace": "X.X.X", "span.name": "aws.lambda", - "span.kind": "server", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "XXXX" }, @@ -1448,6 +1448,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", @@ -1457,7 +1458,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "datadog_lambda": "X.X.X", "dd_trace": "X.X.X", "span.name": "aws.lambda", - "span.kind": "server", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "XXXX" }, @@ -1619,6 +1619,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python38", "function_version": "$LATEST", @@ -1630,7 +1631,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.name": "aws.lambda", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "XXXX", - "span.kind": "server", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com", "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 c12ed57f..442d23a7 100644 --- a/tests/integration/snapshots/logs/async-metrics_python39.log +++ b/tests/integration/snapshots/logs/async-metrics_python39.log @@ -95,6 +95,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "true", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", @@ -106,7 +107,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.name": "aws.lambda", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "XXXX", - "span.kind": "server", "http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/Prod/", "http.method": "GET", "http.route": "/", @@ -228,6 +228,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "meta": { "runtime-id": "XXXX", "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", @@ -237,7 +238,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "datadog_lambda": "X.X.X", "dd_trace": "X.X.X", "span.name": "aws.lambda", - "span.kind": "server", "language": "python" }, "metrics": { @@ -437,6 +437,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", @@ -446,7 +447,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "datadog_lambda": "X.X.X", "dd_trace": "X.X.X", "span.name": "aws.lambda", - "span.kind": "server", "function_trigger.event_source": "dynamodb", "function_trigger.event_source_arn": "XXXX" }, @@ -598,6 +598,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", @@ -607,7 +608,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "datadog_lambda": "X.X.X", "dd_trace": "X.X.X", "span.name": "aws.lambda", - "span.kind": "server", "function_trigger.event_source": "eventbridge" }, "metrics": { @@ -768,6 +768,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", @@ -779,7 +780,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.name": "aws.lambda", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "XXXX$default", - "span.kind": "server", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get", "http.method": "GET", "http.route": "/httpapi/get", @@ -940,6 +940,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", @@ -949,7 +950,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "datadog_lambda": "X.X.X", "dd_trace": "X.X.X", "span.name": "aws.lambda", - "span.kind": "server", "function_trigger.event_source": "kinesis", "function_trigger.event_source_arn": "XXXX" }, @@ -1117,6 +1117,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", @@ -1126,7 +1127,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "datadog_lambda": "X.X.X", "dd_trace": "X.X.X", "span.name": "aws.lambda", - "span.kind": "server", "function_trigger.event_source": "s3", "function_trigger.event_source_arn": "XXXX" }, @@ -1283,6 +1283,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", @@ -1292,7 +1293,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "datadog_lambda": "X.X.X", "dd_trace": "X.X.X", "span.name": "aws.lambda", - "span.kind": "server", "function_trigger.event_source": "sns", "function_trigger.event_source_arn": "XXXX" }, @@ -1448,6 +1448,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", @@ -1457,7 +1458,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "datadog_lambda": "X.X.X", "dd_trace": "X.X.X", "span.name": "aws.lambda", - "span.kind": "server", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "XXXX" }, @@ -1619,6 +1619,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "duration": "XXXX", "meta": { "_dd.origin": "lambda", + "span.kind": "server", "cold_start": "false", "function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-async-metrics_python39", "function_version": "$LATEST", @@ -1630,7 +1631,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span.name": "aws.lambda", "function_trigger.event_source": "api-gateway", "function_trigger.event_source_arn": "XXXX", - "span.kind": "server", "http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com", "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 ba6882e3..bbdd7577 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python310.log +++ b/tests/integration/snapshots/logs/sync-metrics_python310.log @@ -439,18 +439,18 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span_id": "XXXX", "attributes": { "ptr.kind": "aws.dynamodb.item", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "link.kind": "span-pointer", - "ptr.dir": "u" + "ptr.dir": "u", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", "ptr.dir": "u", "link.kind": "span-pointer", + "ptr.kind": "aws.dynamodb.item", "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } }, @@ -459,9 +459,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span_id": "XXXX", "attributes": { "link.kind": "span-pointer", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e" + "ptr.dir": "u" } } ] @@ -1258,10 +1258,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "link.kind": "span-pointer", + "ptr.kind": "aws.s3.object", "ptr.dir": "u", "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", - "ptr.kind": "aws.s3.object" + "link.kind": "span-pointer" } } ] diff --git a/tests/integration/snapshots/logs/sync-metrics_python311.log b/tests/integration/snapshots/logs/sync-metrics_python311.log index 72affdf9..3134b2f1 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python311.log +++ b/tests/integration/snapshots/logs/sync-metrics_python311.log @@ -439,28 +439,28 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span_id": "XXXX", "attributes": { "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "ptr.kind": "aws.dynamodb.item", + "link.kind": "span-pointer", "ptr.dir": "u", - "link.kind": "span-pointer" + "ptr.kind": "aws.dynamodb.item" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { + "ptr.dir": "u", "link.kind": "span-pointer", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u" + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "link.kind": "span-pointer", - "ptr.dir": "u", "ptr.kind": "aws.dynamodb.item", + "ptr.dir": "u", + "link.kind": "span-pointer", "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } } @@ -1258,10 +1258,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.dir": "u", - "link.kind": "span-pointer", + "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", "ptr.kind": "aws.s3.object", - "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788" + "link.kind": "span-pointer", + "ptr.dir": "u" } } ] diff --git a/tests/integration/snapshots/logs/sync-metrics_python312.log b/tests/integration/snapshots/logs/sync-metrics_python312.log index ec690994..3be54999 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python312.log +++ b/tests/integration/snapshots/logs/sync-metrics_python312.log @@ -438,30 +438,30 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { + "ptr.dir": "u", "link.kind": "span-pointer", "ptr.kind": "aws.dynamodb.item", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "ptr.dir": "u" + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.dynamodb.item", + "link.kind": "span-pointer", "ptr.dir": "u", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "link.kind": "span-pointer" + "ptr.kind": "aws.dynamodb.item", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.dir": "u", "ptr.kind": "aws.dynamodb.item", - "link.kind": "span-pointer", - "ptr.hash": "e2af34d333891f765c7f02d2da80895e" + "ptr.hash": "e2af34d333891f765c7f02d2da80895e", + "ptr.dir": "u", + "link.kind": "span-pointer" } } ] @@ -1259,9 +1259,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span_id": "XXXX", "attributes": { "link.kind": "span-pointer", - "ptr.dir": "u", + "ptr.kind": "aws.s3.object", "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", - "ptr.kind": "aws.s3.object" + "ptr.dir": "u" } } ] diff --git a/tests/integration/snapshots/logs/sync-metrics_python313.log b/tests/integration/snapshots/logs/sync-metrics_python313.log index 1075f8e2..5db92a1a 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python313.log +++ b/tests/integration/snapshots/logs/sync-metrics_python313.log @@ -449,19 +449,19 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "span_id": "XXXX", "attributes": { "link.kind": "span-pointer", + "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u" + "ptr.kind": "aws.dynamodb.item" } }, { "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "link.kind": "span-pointer", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", - "ptr.kind": "aws.dynamodb.item", - "ptr.dir": "u" + "ptr.dir": "u", + "link.kind": "span-pointer", + "ptr.kind": "aws.dynamodb.item" } } ] @@ -1258,10 +1258,10 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.kind": "aws.s3.object", - "ptr.dir": "u", "link.kind": "span-pointer", - "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788" + "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", + "ptr.kind": "aws.s3.object", + "ptr.dir": "u" } } ] diff --git a/tests/integration/snapshots/logs/sync-metrics_python314.log b/tests/integration/snapshots/logs/sync-metrics_python314.log index e52a19e0..212394a3 100644 --- a/tests/integration/snapshots/logs/sync-metrics_python314.log +++ b/tests/integration/snapshots/logs/sync-metrics_python314.log @@ -438,9 +438,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "link.kind": "span-pointer", "ptr.dir": "u", + "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "ptr.kind": "aws.dynamodb.item" } }, @@ -458,9 +458,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "ptr.dir": "u", "ptr.hash": "e2af34d333891f765c7f02d2da80895e", "link.kind": "span-pointer", + "ptr.dir": "u", "ptr.kind": "aws.dynamodb.item" } } @@ -1258,9 +1258,9 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate, zs "trace_id": "XXXX", "span_id": "XXXX", "attributes": { - "link.kind": "span-pointer", "ptr.kind": "aws.s3.object", "ptr.hash": "1dc3e5d00dae48c1f07d95371a747788", + "link.kind": "span-pointer", "ptr.dir": "u" } } From 09f63f18b3e1e95a2a6e89573c1b8d1e1b262221 Mon Sep 17 00:00:00 2001 From: Rithika Narayan Date: Fri, 1 May 2026 16:41:56 -0400 Subject: [PATCH 17/17] remove file --- pyproject.toml.bak | 70 ---------------------------------------------- 1 file changed, 70 deletions(-) delete mode 100644 pyproject.toml.bak diff --git a/pyproject.toml.bak b/pyproject.toml.bak deleted file mode 100644 index 105fa4d5..00000000 --- a/pyproject.toml.bak +++ /dev/null @@ -1,70 +0,0 @@ -[tool.poetry] -name = "datadog_lambda" -version = "8.125.0.dev0" -description = "The Datadog AWS Lambda Library" -authors = ["Datadog, Inc. "] -license = "Apache-2.0" -readme = "README.md" -repository = "https://github.com/DataDog/datadog-lambda-python" -keywords = [ - "datadog", - "aws", - "lambda", - "layer", -] -packages = [ - { include = "datadog_lambda" } -] -classifiers = [ - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", - "Programming Language :: Python :: 3.13", - "Programming Language :: Python :: 3.14", -] - -[tool.poetry.dependencies] -python = ">=3.8.0,<3.15" -datadog = ">=0.51.0,<1.0.0" -wrapt = "^1.11.2" -ddtrace = [ - {version = ">=3.19.1,<4", python = ">=3.8,<3.10"}, - {version = ">=4.1.1,<5,!=4.6.*", python = ">=3.10"} -] -ujson = [ - {version = ">=5.10.0,<5.12.0", python = ">=3.8,<3.10"}, - {version = "^5.12.0", python = ">=3.10"}, -] -urllib3 = [ - {version = ">=1.25.4,<1.27", python = ">=3.8,<3.10"}, - {version = "^2.6.3", python = ">=3.10"}, -] -botocore = { version = "^1.34.0", optional = true } -requests = [ - { version = "^2.22.0", optional = true, python = ">=3.8,<3.10" }, - { version = "^2.33.0", optional = true, python = ">=3.10" }, -] -pytest = [ - { version = "^8.3.4", optional = true, python = ">=3.8,<3.10" }, - { version = "^9.0.3", optional = true, python = ">=3.10" }, -] -pytest-benchmark = { version = "^4.0", optional = true } -flake8 = { version = "^5.0.4", optional = true } - -[tool.poetry.extras] -dev = [ - "botocore", - "flake8", - "pytest", - "pytest-benchmark", - "requests", -] - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" - -[tool.pytest.ini_options] -addopts = "--benchmark-disable --benchmark-autosave"