Skip to content

Replace use of _SpanPointer and AgentWriter #812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rithikanarayan wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Replace use of _SpanPointer and AgentWriter #812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
044a23e
Replace use of _SpanPointer
rithikanarayan May 1, 2026
60e03d4
Use SpanLink
rithikanarayan May 1, 2026
6ac63cc
fix
rithikanarayan May 1, 2026
dc29414
add trace id and span id
rithikanarayan May 1, 2026
2774a51
change how ids are added
rithikanarayan May 1, 2026
2fbcba9
new spanlink
rithikanarayan May 1, 2026
9c062a4
fix new spanlink
rithikanarayan May 1, 2026
6f45e7a
cleanup
rithikanarayan May 1, 2026
c1cb26c
try not patching agentwriter
rithikanarayan May 1, 2026
3f7eec1
try except for Span._get_links
rithikanarayan May 1, 2026
2f07766
Remove AgentWriter patch
rithikanarayan May 1, 2026
2a96589
update amd snapshots
rithikanarayan May 1, 2026
12b287b
remove extra file
rithikanarayan May 1, 2026
a24e6d4
arm snapshots
rithikanarayan May 1, 2026
235bf4f
remove extra
rithikanarayan May 1, 2026
c98e8ca
trying to fix snapshots
rithikanarayan May 1, 2026
09f63f1
remove file
rithikanarayan May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
124 changes: 96 additions & 28 deletions tests/integration/snapshots/logs/async-metrics_python310.log
View file
Open in desktop

Large diffs are not rendered by default.

124 changes: 96 additions & 28 deletions tests/integration/snapshots/logs/async-metrics_python311.log
View file
Open in desktop

Large diffs are not rendered by default.

122 changes: 95 additions & 27 deletions tests/integration/snapshots/logs/async-metrics_python312.log
View file
Open in desktop

Large diffs are not rendered by default.

128 changes: 98 additions & 30 deletions tests/integration/snapshots/logs/async-metrics_python313.log
View file
Open in desktop

Large diffs are not rendered by default.

130 changes: 99 additions & 31 deletions tests/integration/snapshots/logs/async-metrics_python314.log
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions tests/integration/snapshots/logs/async-metrics_python38.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": "/",
Expand Down Expand Up @@ -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",
Expand All @@ -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": {
Expand Down Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down Expand Up @@ -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",
Expand All @@ -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": {
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down
20 changes: 10 additions & 10 deletions tests/integration/snapshots/logs/async-metrics_python39.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": "/",
Expand Down Expand Up @@ -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",
Expand All @@ -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": {
Expand Down Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down Expand Up @@ -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",
Expand All @@ -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": {
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down Expand Up @@ -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",
Expand All @@ -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"
},
Expand Down
Loading
Loading