Skip to content

Finish up ELB changes from final merged spec #1623

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
Aug 30, 2022
Merged

Finish up ELB changes from final merged spec #1623

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
3 changes: 1 addition & 2 deletions elasticapm/contrib/serverless/aws.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,7 @@ def set_metadata_and_context(self, coldstart: bool) -> None:
elif self.source == "elb":
elb_target_group_arn = self.event["requestContext"]["elb"]["targetGroupArn"]
faas["trigger"]["type"] = "http"
faas["trigger"]["request_id"] = self.event["headers"]["x-amzn-trace-id"]
service_context["origin"] = {"name": elb_target_group_arn.split(":")[5]}
service_context["origin"] = {"name": elb_target_group_arn.split(":")[5].split("/")[1]}
service_context["origin"]["id"] = elb_target_group_arn
cloud_context["origin"] = {}
cloud_context["origin"]["service"] = {"name": "elb"}
Expand Down
1 change: 1 addition & 0 deletions tests/contrib/serverless/aws_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ def test_func(event, context):
assert transaction["context"]["request"]["method"] == "POST"
assert transaction["context"]["request"]["headers"]
assert transaction["context"]["response"]["status_code"] == 200
assert transaction["context"]["service"]["origin"]["name"] == "lambda-279XGJDqGZ5rsrHC2Fjr"


def test_capture_serverless_s3(event_s3, context, elasticapm_client):
Expand Down