Make sure correlation dummy span use integers for trace id and span id #135

DylanLovesCoffee · 2021-04-22T20:44:30Z

What does this PR do?

Converts trace ID and span ID from the DD trace context headers into integers.

Motivation

Fixes a TypeError raised by dd-trace-py: #134 when DD_TRACE_ENABLED=false.

With dd-trace-py v0.48.0, a type check was implemented to make sure trace and span IDs are integers. Our trace ID and span IDs were not typed as integers and would raise an exception crashing the function.

Testing Guidelines

Fixed unit test + built the layer locally to test.

Additional Notes

Types of Changes

Bug fix
New feature
Breaking change
Misc (docs, refactoring, dependency upgrade, etc.)

Check all that apply

This PR's description is comprehensive
This PR contains breaking changes that are documented in the description
This PR introduces new APIs or parameters that are documented and unlikely to change in the foreseeable future
This PR impacts documentation, and it has been updated (or a ticket has been logged)
This PR's changes are covered by the automated tests
This PR collects user input/sensitive content into Datadog
This PR passes the integration tests (ask a Datadog member to run the tests)

tianchu · 2021-04-22T21:20:21Z

tests/integration/snapshots/return_values/sync-metrics_python38_sqs.json

@@ -1,3 +1,4 @@
+Serverless: Running "serverless" installed locally (in service node_modules)


What is this? Can we remove it? or mute it in serverless framework somehow?

Yeah this one is weird. Looking into it 🤔

Had to downgrade my version of serverless to fix this. Seems like the latest versions of the serverless framework will print that log out without some sort of --quiet flag.

datadog-lambda-python/scripts/run_integration_tests.sh

Line 144 in b0158b6

sed '/RequestsDependencyWarning/d' |

you can actually remove them this way, but it's ok we can deal with it next time.

tianchu · 2021-04-22T21:24:23Z

tests/integration/snapshots/logs/sync-metrics_python36.log

-HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "User-Agent:datadogpy/0.39.0 (python 3.6.13; os linux; arch x86_64)", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python36_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python36_X.X.X"], "interval": 10}]}
-{"traces": [[{"trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", "service": "aws.lambda", "resource": "integration-tests-python-XXXX-sync-metrics_python36", "name": "aws.lambda", "error": 0, "start": XXXX, "duration": XXXX, "meta": {"_dd.origin": "lambda", "runtime-id": "XXXX", "cold_start": "false", "function_arn": "arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-python-XXXX-sync-metrics_python36", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python36", "datadog_lambda": "X.X.X", "dd_trace": "X.X.X", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue"}, "metrics": {"system.pid": XXXX, "_sampling_priority_v1": 1}, "type": "serverless"}, {"trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", "service": "aws.lambda", "resource": "requests.request", "name": "requests.request", "error": 0, "start": XXXX, "duration": XXXX, "meta": {"_dd.origin": "lambda", "http.method": "GET", "http.url": "https://httpstat.us/200/", "http.status_code": "200"}, "metrics": {"_dd.measured": 1}, "type": "http"}, {"trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", "service": "aws.lambda", "resource": "requests.request", "name": "requests.request", "error": 0, "start": XXXX, "duration": XXXX, "meta": {"_dd.origin": "lambda", "http.method": "GET", "http.url": "https://httpstat.us/400/", "http.status_code": "400"}, "metrics": {"_dd.measured": 1}, "type": "http"}, {"trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", "service": "aws.lambda", "resource": "requests.request", "name": "requests.request", "error": 0, "start": XXXX, "duration": XXXX, "meta": {"_dd.origin": "lambda", "http.method": "POST", "http.url": "https://api.datadoghq.com/api/v1/distribution_points", "http.status_code": "202"}, "metrics": {"_dd.measured": 1}, "type": "http"}]]}
+HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX Headers: ["Accept-Encoding:gzip, deflate", "Accept:*/*", "Connection:keep-alive", "Content-Encoding:deflate", "Content-Length:XXXX", "Content-Type:application/json", "User-Agent:datadogpy/0.41.0 (python 3.6.13; os linux; arch x86_64)", "x-datadog-parent-id:XXXX", "x-datadog-sampling-priority:1", "x-datadog-trace-id:XXXX"] Data: {"series": [{"metric": "hello.dog", "points": [[XXXX, [1.0]]], "type": "distribution", "host": null, "device": null, "tags": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python36_X.X.X"], "interval": 10}, {"metric": "tests.integration.count", "points": [[XXXX, [21.0]]], "type": "distribution", "host": null, "device": null, "tags": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python36_X.X.X"], "interval": 10}]}
+{"traces": [[{"trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", "service": "aws.lambda", "resource": "integration-tests-python-XXXX-sync-metrics_python36", "name": "aws.lambda", "error": 0, "start": XXXX, "duration": XXXX, "meta": {"_dd.origin": "lambda", "cold_start": "false", "function_arn": "arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-python-XXXX-sync-metrics_python36", "function_version": "$LATEST", "request_id": "XXXX", "resource_names": "integration-tests-python-XXXX-sync-metrics_python36", "datadog_lambda": "X.X.X", "dd_trace": "X.X.X", "function_trigger.event_source": "sqs", "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue"}, "metrics": {"_sampling_priority_v1": 1}, "type": "serverless"}, {"trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", "service": "aws.lambda", "resource": "requests.request", "name": "requests.request", "error": 0, "start": XXXX, "duration": XXXX, "meta": {"_dd.origin": "lambda", "http.method": "GET", "http.url": "https://httpstat.us/200/", "http.status_code": "200"}, "metrics": {"_dd.measured": 1}, "type": "http"}, {"trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", "service": "aws.lambda", "resource": "requests.request", "name": "requests.request", "error": 0, "start": XXXX, "duration": XXXX, "meta": {"_dd.origin": "lambda", "http.method": "GET", "http.url": "https://httpstat.us/400/", "http.status_code": "400"}, "metrics": {"_dd.measured": 1}, "type": "http"}, {"trace_id": "XXXX", "parent_id": "XXXX", "span_id": "XXXX", "service": "aws.lambda", "resource": "requests.request", "name": "requests.request", "error": 0, "start": XXXX, "duration": XXXX, "meta": {"_dd.origin": "lambda", "http.method": "POST", "http.url": "https://api.datadoghq.com/api/v1/distribution_points", "http.status_code": "202"}, "metrics": {"_dd.measured": 1}, "type": "http"}]]}


Not sure it's a big deal, but do you know why the runtime-id is gone from this snapshot? e.g., it's still in the snapshot for the previous invocation.

I ran the integration tests for the previous release and I get a mismatch error where the runtime-id is missing in some places too. Looks to be an issue within dd-trace-py we might want to dig deeper into.

make span ids integers

d468c95

DylanLovesCoffee requested a review from a team as a code owner April 22, 2021 20:44

hghotra approved these changes Apr 22, 2021

View reviewed changes

update integration tests

d20522d

tianchu reviewed Apr 22, 2021

View reviewed changes

remove sls CLI log from integration tests

aeee8ce

DylanLovesCoffee merged commit 78d22f0 into main Apr 23, 2021

DylanLovesCoffee deleted the dylan/fix-span-id-types branch April 23, 2021 04:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make sure correlation dummy span use integers for trace id and span id #135

Make sure correlation dummy span use integers for trace id and span id #135

DylanLovesCoffee commented Apr 22, 2021 •

edited

tianchu Apr 22, 2021

DylanLovesCoffee Apr 22, 2021

DylanLovesCoffee Apr 23, 2021

tianchu Apr 23, 2021

tianchu Apr 22, 2021 •

edited

DylanLovesCoffee Apr 23, 2021

		@@ -1,3 +1,4 @@
		Serverless: Running "serverless" installed locally (in service node_modules)

Make sure correlation dummy span use integers for trace id and span id #135

Make sure correlation dummy span use integers for trace id and span id #135

Conversation

DylanLovesCoffee commented Apr 22, 2021 • edited

What does this PR do?

Motivation

Testing Guidelines

Additional Notes

Types of Changes

Check all that apply

tianchu Apr 22, 2021

Choose a reason for hiding this comment

DylanLovesCoffee Apr 22, 2021

Choose a reason for hiding this comment

DylanLovesCoffee Apr 23, 2021

Choose a reason for hiding this comment

tianchu Apr 23, 2021

Choose a reason for hiding this comment

tianchu Apr 22, 2021 • edited

Choose a reason for hiding this comment

DylanLovesCoffee Apr 23, 2021

Choose a reason for hiding this comment

DylanLovesCoffee commented Apr 22, 2021 •

edited

tianchu Apr 22, 2021 •

edited