[Tracing] Adds SQS and LambdaContext Trace extraction by Czechh · Pull Request #105 · DataDog/datadog-lambda-python

Czechh · 2020-12-17T14:19:44Z

What does this PR do?

Following the dd-trace-py 0.45.0 release this PR adds support for extracting the trace data from SQS and the Lambda Context object

Motivation

Testing Guidelines

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)

…-client-context * main: master-main (#103)

tianchu · 2020-12-17T16:30:00Z

-    parent_id = lowercase_headers.get(TraceHeader.PARENT_ID)
-    sampling_priority = lowercase_headers.get(TraceHeader.SAMPLING_PRIORITY)
+    if "headers" in event:
+        trace_id, parent_id, sampling_priority = extract_context_from_http_event(event)


cc: @DylanLovesCoffee I recall you are touching this function as well, and I actually suggested code changes like what @Czechh does here.

Yup, I am! This comment? I had changed extract_dd_trace_context here to return the source as well and create the subsegment in a separate function.

tianchu · 2020-12-17T16:44:06Z

+    return trace_id, parent_id, sampling_priority
+
+
+def extract_context_from_sqs_event(event):


If not hard, does it make sense to add an integration test?

Modified the SQS object to inject trace data ✅

DarcyRaynerDD · 2020-12-17T16:42:39Z

+    if "headers" in event:
+        trace_id, parent_id, sampling_priority = extract_context_from_http_event(event)
+    elif "Records" in event:
+        trace_id, parent_id, sampling_priority = extract_context_from_sqs_event(event)


If "Records" is in the event, but we fail to parse, we should probably try extracting from the lambda context next.

Use the lambda context as a fallback for both headers and SQS events

DarcyRaynerDD · 2020-12-17T16:45:09Z

+
+
+def extract_context_from_lambda_context(lambda_context):
+    dd_data = lambda_context.client_context.get("custom", {}).get("_datadog", {})


Interesting, didn't realize it was possible for some services to add metadata to the context.

Czechh · 2020-12-18T20:06:38Z

 {"e": XXXX, "m": "hello.dog", "t": ["team:serverless", "role:hello", "dd_lambda_layer:datadog-python27_2.XX.0"], "v": 1}
 {"e": XXXX, "m": "tests.integration.count", "t": ["test:integration", "role:hello", "dd_lambda_layer:datadog-python27_2.XX.0"], "v": 21}
-{"traces": [[{"resource": "integration-plugin-dev-async-metrics_python27_with_plugin", "name": "aws.lambda", "service": "aws.lambda", "start": XXXX, "trace_id": "XXXX", "metrics": {"_sampling_priority_v1": 2, "system.pid": XXXX}, "parent_id": "XXXX", "meta": {"runtime-id": "XXXX", "request_id": "XXXX", "cold_start": "false", "datadog_lambda": "2.24.0", "function_arn": "arn:aws:lambda:us-east-1:601427279990:function:integration-plugin-dev-async-metrics_python27_with_plugin", "dd_trace": "0.44.0", "_dd.origin": "lambda", "_dd.parent_source": "xray", "resource_names": "integration-plugin-dev-async-metrics_python27_with_plugin", "function_version": "$LATEST"}, "error": 0, "duration": XXXX, "type": "serverless", "span_id": "XXXX"}]]}
+{"traces": [[{"resource": "integration-plugin-dev-async-metrics_python27_with_plugin", "name": "aws.lambda", "service": "aws.lambda", "start": XXXX, "trace_id": "XXXX", "metrics": {"_sampling_priority_v1": 1, "system.pid": XXXX}, "parent_id": "XXXX", "meta": {"runtime-id": "XXXX", "request_id": "XXXX", "cold_start": "false", "datadog_lambda": "X.X.X", "function_arn": "arn:aws:lambda:us-east-1:601427279990:function:integration-plugin-dev-async-metrics_python27_with_plugin", "dd_trace": "X.X.X", "_dd.origin": "lambda", "resource_names": "integration-plugin-dev-async-metrics_python27_with_plugin", "function_version": "$LATEST"}, "error": 0, "duration": XXXX, "type": "serverless", "span_id": "XXXX"}]]}


"_dd.parent_source": "xray" is gone because I added to the SQS input event some trace data :)

…-client-context * main: Update contributing doc (#106)

adds sqs and lambda trace extraction

1a04964

Czechh requested a review from a team as a code owner December 17, 2020 14:19

Czechh added 5 commits December 17, 2020 09:21

format

72b051f

fix parsing error

943168f

remove extra whitespace

a3d0830

format again

e3bb3c7

Merge branch 'main' into sergio.prada/extract-context-from-sqs-lambda…

a71be7a

…-client-context * main: master-main (#103)

tianchu reviewed Dec 17, 2020

View reviewed changes

Comment thread datadog_lambda/tracing.py Outdated

tianchu reviewed Dec 17, 2020

View reviewed changes

Comment thread datadog_lambda/tracing.py Outdated

tianchu reviewed Dec 17, 2020

View reviewed changes

DarcyRaynerDD requested changes Dec 17, 2020

View reviewed changes

Czechh added 6 commits December 17, 2020 14:15

add integration tests update

725768e

add lambda context fallback + int tests

0e755c4

add fallbacks

039cfaf

make client context extraction more resilient

f0c4684

fix lint

365cd54

nit comment

8e9133c

Czechh commented Dec 18, 2020

View reviewed changes

Merge branch 'main' into sergio.prada/extract-context-from-sqs-lambda…

8c3253c

…-client-context * main: Update contributing doc (#106)

DarcyRaynerDD approved these changes Jan 5, 2021

View reviewed changes

tianchu approved these changes Jan 5, 2021

View reviewed changes

Czechh merged commit 9646080 into main Jan 6, 2021

Czechh deleted the sergio.prada/extract-context-from-sqs-lambda-client-context branch January 6, 2021 14:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Tracing] Adds SQS and LambdaContext Trace extraction#105

[Tracing] Adds SQS and LambdaContext Trace extraction#105
Czechh merged 13 commits into
mainfrom
sergio.prada/extract-context-from-sqs-lambda-client-context

Czechh commented Dec 17, 2020

Uh oh!

tianchu Dec 17, 2020

Uh oh!

DylanLovesCoffee Dec 17, 2020 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

tianchu Dec 17, 2020

Uh oh!

Czechh Dec 18, 2020

Uh oh!

Uh oh!

DarcyRaynerDD Dec 17, 2020

Uh oh!

Czechh Dec 18, 2020

Uh oh!

DarcyRaynerDD Dec 17, 2020

Uh oh!

Czechh Dec 18, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		return trace_id, parent_id, sampling_priority


		def extract_context_from_sqs_event(event):



		def extract_context_from_lambda_context(lambda_context):
		dd_data = lambda_context.client_context.get("custom", {}).get("_datadog", {})

Conversation

Czechh commented Dec 17, 2020

What does this PR do?

Motivation

Testing Guidelines

Additional Notes

Types of Changes

Check all that apply

Uh oh!

tianchu Dec 17, 2020

Choose a reason for hiding this comment

Uh oh!

DylanLovesCoffee Dec 17, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

tianchu Dec 17, 2020

Choose a reason for hiding this comment

Uh oh!

Czechh Dec 18, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

DarcyRaynerDD Dec 17, 2020

Choose a reason for hiding this comment

Uh oh!

Czechh Dec 18, 2020

Choose a reason for hiding this comment

Uh oh!

DarcyRaynerDD Dec 17, 2020

Choose a reason for hiding this comment

Uh oh!

Czechh Dec 18, 2020

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

DylanLovesCoffee Dec 17, 2020 •

edited

Loading