Skip to content

[Tracing] Adds SQS and LambdaContext Trace extraction #105

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

Merged
merged 13 commits into from
Jan 6, 2021
Merged

[Tracing] Adds SQS and LambdaContext Trace extraction #105

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1a04964
adds sqs and lambda trace extraction
Czechh Dec 17, 2020
72b051f
format
Czechh Dec 17, 2020
943168f
fix parsing error
Czechh Dec 17, 2020
a3d0830
remove extra whitespace
Czechh Dec 17, 2020
e3bb3c7
format again
Czechh Dec 17, 2020
a71be7a
Merge branch 'main' into sergio.prada/extract-context-from-sqs-lambda…
Czechh Dec 17, 2020
725768e
add integration tests update
Czechh Dec 17, 2020
0e755c4
add lambda context fallback + int tests
Czechh Dec 18, 2020
039cfaf
add fallbacks
Czechh Dec 18, 2020
f0c4684
make client context extraction more resilient
Czechh Dec 18, 2020
365cd54
fix lint
Czechh Dec 18, 2020
8e9133c
nit comment
Czechh Dec 18, 2020
8c3253c
Merge branch 'main' into sergio.prada/extract-context-from-sqs-lambda…
Czechh Jan 5, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
format again
  • Loading branch information
@Czechh
Czechh committed Dec 17, 2020
commit e3bb3c7656a24e6782974ba8753ed92e8c21d0bd
41 changes: 21 additions & 20 deletions tests/test_tracing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def test_with_incomplete_datadog_trace_headers(self):
lambda_ctx = get_mock_context()
ctx = extract_dd_trace_context(
{"headers": {TraceHeader.TRACE_ID: "123", TraceHeader.PARENT_ID: "321"}},
lambda_ctx
lambda_ctx,
)
self.assertDictEqual(
ctx,
Expand Down Expand Up @@ -118,7 +118,7 @@ def test_with_complete_datadog_trace_headers(self):
TraceHeader.SAMPLING_PRIORITY: "1",
}
},
lambda_ctx
lambda_ctx,
)
self.assertDictEqual(
ctx,
Expand Down Expand Up @@ -157,21 +157,23 @@ def test_with_sqs_distributed_datadog_trace_data(self):
"ApproximateReceiveCount": "1",
"SentTimestamp": "1545082649183",
"SenderId": "AIDAIENQZJOLO23YVJ4VO",
"ApproximateFirstReceiveTimestamp": "1545082649185"
"ApproximateFirstReceiveTimestamp": "1545082649185",
},
"messageAttributes": {
"_datadog": {
"StringValue": json.dumps({
TraceHeader.TRACE_ID: "123",
TraceHeader.PARENT_ID: "321",
TraceHeader.SAMPLING_PRIORITY: "1",
})
"StringValue": json.dumps(
{
TraceHeader.TRACE_ID: "123",
TraceHeader.PARENT_ID: "321",
TraceHeader.SAMPLING_PRIORITY: "1",
}
)
}
},
"md5OfBody": "e4e68fb7bd0e697a0ae8f1bb342846b3",
"eventSource": "aws:sqs",
"eventSourceARN": "arn:aws:sqs:us-east-2:123456789012:my-queue",
"awsRegion": "us-east-2"
"awsRegion": "us-east-2",
}
]
}
Expand Down Expand Up @@ -202,19 +204,18 @@ def test_with_sqs_distributed_datadog_trace_data(self):
)

def test_with_client_context_datadog_trace_data(self):
lambda_ctx = get_mock_context(client_context={
"custom": {
"_datadog": {
TraceHeader.TRACE_ID: "666",
TraceHeader.PARENT_ID: "777",
TraceHeader.SAMPLING_PRIORITY: "1",
lambda_ctx = get_mock_context(
client_context={
"custom": {
"_datadog": {
TraceHeader.TRACE_ID: "666",
TraceHeader.PARENT_ID: "777",
TraceHeader.SAMPLING_PRIORITY: "1",
}
}
}
})
ctx = extract_dd_trace_context(
{ "test": "foo" },
lambda_ctx
)
ctx = extract_dd_trace_context({}, lambda_ctx)
self.assertDictEqual(
ctx,
{
Expand Down Expand Up @@ -250,7 +251,7 @@ def test_with_complete_datadog_trace_headers_with_mixed_casing(self):
"X-Datadog-Sampling-Priority": "1",
}
},
lambda_ctx
lambda_ctx,
)
self.assertDictEqual(
get_dd_trace_context(),
Expand Down
6 changes: 4 additions & 2 deletions tests/test_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def get_mock_context(
memory_limit_in_mb="256",
invoked_function_arn="arn:aws:lambda:us-west-1:123457598159:function:python-layer-test:1",
function_version="1",
client_context={}
client_context={},
):
lambda_context = MagicMock()
lambda_context.aws_request_id = aws_request_id
Expand Down Expand Up @@ -98,7 +98,9 @@ def lambda_handler(event, context):
[call("test.metric", 100, timestamp=None, tags=ANY)]
)
self.mock_wrapper_lambda_stats.flush.assert_called()
self.mock_extract_dd_trace_context.assert_called_with(lambda_event, lambda_context)
self.mock_extract_dd_trace_context.assert_called_with(
lambda_event, lambda_context
)
self.mock_set_correlation_ids.assert_called()
self.mock_inject_correlation_ids.assert_called()
self.mock_patch_all.assert_called()
Expand Down