Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/trace/trigger.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ describe("parseEventSource", () => {
result: {
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "arn:aws:apigateway:us-east-1::/restapis/id/stages/$default",
"http.url": "https://id.execute-api.us-east-1.amazonaws.com",
"http.url": "https://id.execute-api.us-east-1.amazonaws.com/my/path",
"http.url_details.path": "/my/path",
"http.method": "GET",
"http.route": "/my/path",
Expand All @@ -25,7 +25,7 @@ describe("parseEventSource", () => {
result: {
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "arn:aws:apigateway:us-east-1::/restapis/r3pmxmplak/stages/default",
"http.url": "https://r3pmxmplak.execute-api.us-east-2.amazonaws.com",
"http.url": "https://r3pmxmplak.execute-api.us-east-2.amazonaws.com/default/nodejs-apig-function-1G3XMPLZXVXYI",
"http.url_details.path": "/default/nodejs-apig-function-1G3XMPLZXVXYI",
"http.method": "GET",
"http.route": "/nodejs-apig-function-1G3XMPLZXVXYI",
Expand All @@ -35,7 +35,7 @@ describe("parseEventSource", () => {
{
result: {
"function_trigger.event_source": "lambda-function-url",
"http.url": "https://a8hyhsshac.lambda-url.eu-south-1.amazonaws.com",
"http.url": "https://a8hyhsshac.lambda-url.eu-south-1.amazonaws.com/",
"http.url_details.path": "/",
"http.method": "GET",
},
Expand Down
15 changes: 9 additions & 6 deletions src/trace/trigger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,11 @@ function extractHTTPTags(event: APIGatewayEvent | APIGatewayProxyEventV2 | ALBEv

if (eventType.isAPIGatewayEvent(event)) {
const requestContext = event.requestContext;
const path = requestContext.path;
if (requestContext.domainName) {
httpTags["http.url"] = `https://${requestContext.domainName}`;
httpTags["http.url"] = `https://${requestContext.domainName}${path ?? ""}`;
}
httpTags["http.url_details.path"] = requestContext.path;
httpTags["http.url_details.path"] = path;
httpTags["http.method"] = requestContext.httpMethod;
if (event.headers?.Referer) {
httpTags["http.referer"] = event.headers.Referer;
Expand All @@ -304,8 +305,9 @@ function extractHTTPTags(event: APIGatewayEvent | APIGatewayProxyEventV2 | ALBEv

if (eventType.isAPIGatewayEventV2(event)) {
const requestContext = event.requestContext;
httpTags["http.url"] = `https://${requestContext.domainName}`;
httpTags["http.url_details.path"] = requestContext.http.path;
const path = requestContext.http.path;
httpTags["http.url"] = `https://${requestContext.domainName}${path ?? ""}`;
httpTags["http.url_details.path"] = path;
httpTags["http.method"] = requestContext.http.method;
if (event.headers?.Referer) {
httpTags["http.referer"] = event.headers.Referer;
Expand All @@ -329,10 +331,11 @@ function extractHTTPTags(event: APIGatewayEvent | APIGatewayProxyEventV2 | ALBEv

if (eventType.isLambdaUrlEvent(event)) {
const requestContext = event.requestContext;
const path = requestContext.http.path;
if (requestContext.domainName) {
httpTags["http.url"] = `https://${requestContext.domainName}`;
httpTags["http.url"] = `https://${requestContext.domainName}${path ?? ""}`;
}
httpTags["http.url_details.path"] = requestContext.http.path;
httpTags["http.url_details.path"] = path;
httpTags["http.method"] = requestContext.http.method;
if (event.headers?.Referer) {
httpTags["http.referer"] = event.headers.Referer;
Expand Down
Loading