Skip to content

Fix trace context extraction in AWS Lambda #248

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 1 commit into from
Jul 16, 2020
Merged

Fix trace context extraction in AWS Lambda #248

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
1 change: 0 additions & 1 deletion instana/instrumentation/aws/lambda_inst.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

def lambda_handler_with_instana(wrapped, instance, args, kwargs):
event = args[0]
context = args[1]
agent = get_agent()
tracer = get_tracer()

Expand Down
3 changes: 3 additions & 0 deletions instana/instrumentation/aws/triggers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@

def get_context(tracer, event):
# TODO: Search for more types of trigger context
if is_api_gateway_proxy_trigger(event) or is_application_load_balancer_trigger(event):
return tracer.extract('http_headers', event['headers'])

return tracer.extract('http_headers', event)


Expand Down
12 changes: 6 additions & 6 deletions tests/platforms/test_lambda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,9 @@ def test_custom_service_name(self):

span = payload['spans'][0]
self.assertEqual('aws.lambda.entry', span.n)
self.assertIsNotNone(span.t)
self.assertEqual('d5cb361b256413a9', span.t)
self.assertIsNotNone(span.s)
self.assertIsNone(span.p)
self.assertEqual('0901d8ae4fbf1529', span.p)
self.assertIsNotNone(span.ts)
self.assertIsNotNone(span.d)

Expand Down Expand Up @@ -210,9 +210,9 @@ def test_api_gateway_trigger_tracing(self):

span = payload['spans'][0]
self.assertEqual('aws.lambda.entry', span.n)
self.assertIsNotNone(span.t)
self.assertEqual('d5cb361b256413a9', span.t)
self.assertIsNotNone(span.s)
self.assertIsNone(span.p)
self.assertEqual('0901d8ae4fbf1529', span.p)
self.assertIsNotNone(span.ts)
self.assertIsNotNone(span.d)

Expand Down Expand Up @@ -267,9 +267,9 @@ def test_application_lb_trigger_tracing(self):

span = payload['spans'][0]
self.assertEqual('aws.lambda.entry', span.n)
self.assertIsNotNone(span.t)
self.assertEqual('d5cb361b256413a9', span.t)
self.assertIsNotNone(span.s)
self.assertIsNone(span.p)
self.assertEqual('0901d8ae4fbf1529', span.p)
self.assertIsNotNone(span.ts)
self.assertIsNotNone(span.d)

Expand Down