Skip to content

fix: Ensure authorized span headers are injected as str #325

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
joeyzhao2018 merged 1 commit into from
Apr 25, 2023
Merged

fix: Ensure authorized span headers are injected as str #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 datadog_lambda/wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ def _inject_authorizer_span_headers(self, request_id):
injected_headers[Headers.Parent_Span_Finish_Time] = finish_time_ns
if request_id is not None:
injected_headers[Headers.Authorizing_Request_Id] = request_id
datadog_data = base64.b64encode(json.dumps(injected_headers).encode())
datadog_data = base64.b64encode(json.dumps(injected_headers).encode()).decode()
self.response.setdefault("context", {})
self.response["context"]["_datadog"] = datadog_data

Expand Down
4 changes: 3 additions & 1 deletion tests/test_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,9 @@ def lambda_handler(event, context):
lambda_handler.inferred_span = mock_span

result = lambda_handler(lambda_event, lambda_context)
inject_data = json.loads(base64.b64decode(result["context"]["_datadog"]))
raw_inject_data = result["context"]["_datadog"]
self.assertIsInstance(raw_inject_data, str)
inject_data = json.loads(base64.b64decode(raw_inject_data))
self.assertEquals(inject_data[TraceHeader.PARENT_ID], "123")
self.assertEquals(inject_data[TraceHeader.TRACE_ID], "456")
self.assertEquals(inject_data[TraceHeader.SAMPLING_PRIORITY], "1")
Expand Down