From 96d2611cc6aa01be37d0e6435ec471282a607114 Mon Sep 17 00:00:00 2001 From: Carles Capell Date: Tue, 10 Mar 2026 15:36:26 +0100 Subject: [PATCH 1/2] set full url in http.url tag --- src/trace/trigger.spec.ts | 6 +++--- src/trace/trigger.ts | 15 +++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/trace/trigger.spec.ts b/src/trace/trigger.spec.ts index edf5ad84f..01a35288b 100644 --- a/src/trace/trigger.spec.ts +++ b/src/trace/trigger.spec.ts @@ -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", @@ -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", @@ -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", }, diff --git a/src/trace/trigger.ts b/src/trace/trigger.ts index af9524e63..dc95d3a31 100644 --- a/src/trace/trigger.ts +++ b/src/trace/trigger.ts @@ -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; @@ -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; @@ -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; From 4ff696b9635566c2d232e7c9edec0a88a7ac9432 Mon Sep 17 00:00:00 2001 From: Carles Capell Date: Tue, 10 Mar 2026 17:00:38 +0100 Subject: [PATCH 2/2] trigger CI