diff --git a/integration_tests/snapshots/logs/esm_node18.log b/integration_tests/snapshots/logs/esm_node18.log index 7e97d980..6fb522b6 100644 --- a/integration_tests/snapshots/logs/esm_node18.log +++ b/integration_tests/snapshots/logs/esm_node18.log @@ -31,7 +31,6 @@ START "_dd.origin": "lambda", "service": "remappedApiGatewayServiceName", "runtime-id":"XXXX", - "operation_name": "aws.apigateway", "http.url": "https://undefined", "resource_names": "GET /{proxy+}", "request_id":"XXXX", @@ -58,7 +57,7 @@ START "duration":XXXX, "links": [], "service": "remappedApiGatewayServiceName", - "type": "http" + "type": "web" }, { "trace_id":"XXXX", diff --git a/integration_tests/snapshots/logs/esm_node20.log b/integration_tests/snapshots/logs/esm_node20.log index 5ba9f569..7e9b3816 100644 --- a/integration_tests/snapshots/logs/esm_node20.log +++ b/integration_tests/snapshots/logs/esm_node20.log @@ -31,7 +31,6 @@ START "_dd.origin": "lambda", "service": "remappedApiGatewayServiceName", "runtime-id":"XXXX", - "operation_name": "aws.apigateway", "http.url": "https://undefined", "resource_names": "GET /{proxy+}", "request_id":"XXXX", @@ -58,7 +57,7 @@ START "duration":XXXX, "links": [], "service": "remappedApiGatewayServiceName", - "type": "http" + "type": "web" }, { "trace_id":"XXXX", diff --git a/integration_tests/snapshots/logs/esm_node22.log b/integration_tests/snapshots/logs/esm_node22.log index 24cc90b7..dc8461e8 100644 --- a/integration_tests/snapshots/logs/esm_node22.log +++ b/integration_tests/snapshots/logs/esm_node22.log @@ -31,7 +31,6 @@ START "_dd.origin": "lambda", "service": "remappedApiGatewayServiceName", "runtime-id":"XXXX", - "operation_name": "aws.apigateway", "http.url": "https://undefined", "resource_names": "GET /{proxy+}", "request_id":"XXXX", @@ -58,7 +57,7 @@ START "duration":XXXX, "links": [], "service": "remappedApiGatewayServiceName", - "type": "http" + "type": "web" }, { "trace_id":"XXXX", diff --git a/integration_tests/snapshots/logs/esm_node24.log b/integration_tests/snapshots/logs/esm_node24.log index 795981b9..ce75219f 100644 --- a/integration_tests/snapshots/logs/esm_node24.log +++ b/integration_tests/snapshots/logs/esm_node24.log @@ -31,7 +31,6 @@ START "_dd.origin": "lambda", "service": "remappedApiGatewayServiceName", "runtime-id":"XXXX", - "operation_name": "aws.apigateway", "http.url": "https://undefined", "resource_names": "GET /{proxy+}", "request_id":"XXXX", @@ -58,7 +57,7 @@ START "duration":XXXX, "links": [], "service": "remappedApiGatewayServiceName", - "type": "http" + "type": "web" }, { "trace_id":"XXXX", diff --git a/integration_tests/snapshots/logs/process-input-traced_node18.log b/integration_tests/snapshots/logs/process-input-traced_node18.log index e09dca39..23dd6c32 100644 --- a/integration_tests/snapshots/logs/process-input-traced_node18.log +++ b/integration_tests/snapshots/logs/process-input-traced_node18.log @@ -39,7 +39,6 @@ START "_dd.p.dm": "-0", "service": "remappedApiGatewayServiceName", "runtime-id":"XXXX", - "operation_name": "aws.apigateway", "http.url": "https://undefined", "resource_names": "GET /{proxy+}", "request_id":"XXXX", @@ -66,7 +65,7 @@ START "duration":XXXX, "links": [], "service": "remappedApiGatewayServiceName", - "type": "http" + "type": "web" }, { "trace_id":"XXXX", diff --git a/integration_tests/snapshots/logs/process-input-traced_node20.log b/integration_tests/snapshots/logs/process-input-traced_node20.log index 5bb896f7..da814a0b 100644 --- a/integration_tests/snapshots/logs/process-input-traced_node20.log +++ b/integration_tests/snapshots/logs/process-input-traced_node20.log @@ -39,7 +39,6 @@ START "_dd.p.dm": "-0", "service": "remappedApiGatewayServiceName", "runtime-id":"XXXX", - "operation_name": "aws.apigateway", "http.url": "https://undefined", "resource_names": "GET /{proxy+}", "request_id":"XXXX", @@ -66,7 +65,7 @@ START "duration":XXXX, "links": [], "service": "remappedApiGatewayServiceName", - "type": "http" + "type": "web" }, { "trace_id":"XXXX", diff --git a/integration_tests/snapshots/logs/process-input-traced_node22.log b/integration_tests/snapshots/logs/process-input-traced_node22.log index c2ff6932..c9c1dc0c 100644 --- a/integration_tests/snapshots/logs/process-input-traced_node22.log +++ b/integration_tests/snapshots/logs/process-input-traced_node22.log @@ -39,7 +39,6 @@ START "_dd.p.dm": "-0", "service": "remappedApiGatewayServiceName", "runtime-id":"XXXX", - "operation_name": "aws.apigateway", "http.url": "https://undefined", "resource_names": "GET /{proxy+}", "request_id":"XXXX", @@ -66,7 +65,7 @@ START "duration":XXXX, "links": [], "service": "remappedApiGatewayServiceName", - "type": "http" + "type": "web" }, { "trace_id":"XXXX", diff --git a/integration_tests/snapshots/logs/process-input-traced_node24.log b/integration_tests/snapshots/logs/process-input-traced_node24.log index 5c953471..e48c351b 100644 --- a/integration_tests/snapshots/logs/process-input-traced_node24.log +++ b/integration_tests/snapshots/logs/process-input-traced_node24.log @@ -39,7 +39,6 @@ START "_dd.p.dm": "-0", "service": "remappedApiGatewayServiceName", "runtime-id":"XXXX", - "operation_name": "aws.apigateway", "http.url": "https://undefined", "resource_names": "GET /{proxy+}", "request_id":"XXXX", @@ -66,7 +65,7 @@ START "duration":XXXX, "links": [], "service": "remappedApiGatewayServiceName", - "type": "http" + "type": "web" }, { "trace_id":"XXXX", diff --git a/integration_tests/snapshots/logs/status-code-500s_node18.log b/integration_tests/snapshots/logs/status-code-500s_node18.log index 7476d1b1..63d2eecb 100644 --- a/integration_tests/snapshots/logs/status-code-500s_node18.log +++ b/integration_tests/snapshots/logs/status-code-500s_node18.log @@ -45,7 +45,6 @@ START "_dd.p.dm": "-0", "service": "remappedApiGatewayServiceName", "runtime-id":"XXXX", - "operation_name": "aws.apigateway", "http.url": "https://undefined", "resource_names": "GET /{proxy+}", "request_id":"XXXX", @@ -72,7 +71,7 @@ START "duration":XXXX, "links": [], "service": "remappedApiGatewayServiceName", - "type": "http" + "type": "web" }, { "trace_id":"XXXX", diff --git a/integration_tests/snapshots/logs/status-code-500s_node20.log b/integration_tests/snapshots/logs/status-code-500s_node20.log index 913972aa..1c807dbf 100644 --- a/integration_tests/snapshots/logs/status-code-500s_node20.log +++ b/integration_tests/snapshots/logs/status-code-500s_node20.log @@ -45,7 +45,6 @@ START "_dd.p.dm": "-0", "service": "remappedApiGatewayServiceName", "runtime-id":"XXXX", - "operation_name": "aws.apigateway", "http.url": "https://undefined", "resource_names": "GET /{proxy+}", "request_id":"XXXX", @@ -72,7 +71,7 @@ START "duration":XXXX, "links": [], "service": "remappedApiGatewayServiceName", - "type": "http" + "type": "web" }, { "trace_id":"XXXX", diff --git a/integration_tests/snapshots/logs/status-code-500s_node22.log b/integration_tests/snapshots/logs/status-code-500s_node22.log index 5a2badea..0800402b 100644 --- a/integration_tests/snapshots/logs/status-code-500s_node22.log +++ b/integration_tests/snapshots/logs/status-code-500s_node22.log @@ -45,7 +45,6 @@ START "_dd.p.dm": "-0", "service": "remappedApiGatewayServiceName", "runtime-id":"XXXX", - "operation_name": "aws.apigateway", "http.url": "https://undefined", "resource_names": "GET /{proxy+}", "request_id":"XXXX", @@ -72,7 +71,7 @@ START "duration":XXXX, "links": [], "service": "remappedApiGatewayServiceName", - "type": "http" + "type": "web" }, { "trace_id":"XXXX", diff --git a/integration_tests/snapshots/logs/status-code-500s_node24.log b/integration_tests/snapshots/logs/status-code-500s_node24.log index 0c450fb2..d04918a8 100644 --- a/integration_tests/snapshots/logs/status-code-500s_node24.log +++ b/integration_tests/snapshots/logs/status-code-500s_node24.log @@ -45,7 +45,6 @@ START "_dd.p.dm": "-0", "service": "remappedApiGatewayServiceName", "runtime-id":"XXXX", - "operation_name": "aws.apigateway", "http.url": "https://undefined", "resource_names": "GET /{proxy+}", "request_id":"XXXX", @@ -72,7 +71,7 @@ START "duration":XXXX, "links": [], "service": "remappedApiGatewayServiceName", - "type": "http" + "type": "web" }, { "trace_id":"XXXX", diff --git a/src/trace/span-inferrer.spec.ts b/src/trace/span-inferrer.spec.ts index 19eb5709..d5b22ca7 100644 --- a/src/trace/span-inferrer.spec.ts +++ b/src/trace/span-inferrer.spec.ts @@ -891,7 +891,6 @@ describe("SpanInferrer", () => { event_type: "CONNECT", "http.url": "https://08se3mvh28.execute-api.eu-west-1.amazonaws.com$connect", message_direction: "IN", - operation_name: "aws.apigateway", "peer.service": "mock-lambda-service", request_id: undefined, "resource.name": "08se3mvh28.execute-api.eu-west-1.amazonaws.com $connect", @@ -899,7 +898,7 @@ describe("SpanInferrer", () => { service: "08se3mvh28.execute-api.eu-west-1.amazonaws.com", "service.name": "08se3mvh28.execute-api.eu-west-1.amazonaws.com", "span.kind": "server", - "span.type": "http", + "span.type": "web", }, }); }); @@ -917,7 +916,6 @@ describe("SpanInferrer", () => { endpoint: "/my/path", "http.url": "https://id.execute-api.us-east-1.amazonaws.com/my/path", domain_name: "id.execute-api.us-east-1.amazonaws.com", - operation_name: "aws.apigateway", "peer.service": "mock-lambda-service", request_id: undefined, "http.method": "GET", @@ -926,7 +924,7 @@ describe("SpanInferrer", () => { service: "id.execute-api.us-east-1.amazonaws.com", "service.name": "id.execute-api.us-east-1.amazonaws.com", "span.kind": "server", - "span.type": "http", + "span.type": "web", stage: "$default", }, }); @@ -945,7 +943,6 @@ describe("SpanInferrer", () => { endpoint: "/default/nodejs-apig-function-1G3XMPLZXVXYI", "http.url": "https://r3pmxmplak.execute-api.us-east-2.amazonaws.com/default/nodejs-apig-function-1G3XMPLZXVXYI", domain_name: "r3pmxmplak.execute-api.us-east-2.amazonaws.com", - operation_name: "aws.apigateway", "peer.service": "mock-lambda-service", request_id: undefined, "http.method": "GET", @@ -954,7 +951,7 @@ describe("SpanInferrer", () => { service: "r3pmxmplak.execute-api.us-east-2.amazonaws.com", "service.name": "r3pmxmplak.execute-api.us-east-2.amazonaws.com", "span.kind": "server", - "span.type": "http", + "span.type": "web", stage: "default", }, }); @@ -973,7 +970,6 @@ describe("SpanInferrer", () => { endpoint: "/dev/user/42", "http.url": "https://mcwkra0ya4.execute-api.sa-east-1.amazonaws.com/dev/user/42", domain_name: "mcwkra0ya4.execute-api.sa-east-1.amazonaws.com", - operation_name: "aws.apigateway", "peer.service": "mock-lambda-service", request_id: undefined, "http.method": "GET", @@ -982,7 +978,7 @@ describe("SpanInferrer", () => { service: "mcwkra0ya4.execute-api.sa-east-1.amazonaws.com", "service.name": "mcwkra0ya4.execute-api.sa-east-1.amazonaws.com", "span.kind": "server", - "span.type": "http", + "span.type": "web", stage: "dev", }, }); @@ -1001,7 +997,6 @@ describe("SpanInferrer", () => { endpoint: "/user/42", "http.url": "https://9vj54we5ih.execute-api.sa-east-1.amazonaws.com/user/42", domain_name: "9vj54we5ih.execute-api.sa-east-1.amazonaws.com", - operation_name: "aws.apigateway", "peer.service": "mock-lambda-service", request_id: undefined, "http.method": "GET", @@ -1010,7 +1005,7 @@ describe("SpanInferrer", () => { service: "9vj54we5ih.execute-api.sa-east-1.amazonaws.com", "service.name": "9vj54we5ih.execute-api.sa-east-1.amazonaws.com", "span.kind": "server", - "span.type": "http", + "span.type": "web", stage: "$default", }, }); @@ -1118,7 +1113,6 @@ describe("Authorizer Spans", () => { endpoint: "/dev/hello", "http.method": "POST", "http.url": "https://3gsxz7lha4.execute-api.eu-west-1.amazonaws.com/dev/hello", - operation_name: "aws.apigateway", "peer.service": "mock-lambda-service", request_id: undefined, "resource.name": "POST /hello", @@ -1126,7 +1120,7 @@ describe("Authorizer Spans", () => { service: "3gsxz7lha4.execute-api.eu-west-1.amazonaws.com", "service.name": "3gsxz7lha4.execute-api.eu-west-1.amazonaws.com", "span.kind": "server", - "span.type": "http", + "span.type": "web", stage: "dev", }, }, @@ -1143,7 +1137,6 @@ describe("Authorizer Spans", () => { endpoint: "/dev/hello", "http.method": "POST", "http.url": "https://3gsxz7lha4.execute-api.eu-west-1.amazonaws.com/dev/hello", - operation_name: "aws.apigateway", "peer.service": "mock-lambda-service", request_id: undefined, "resource.name": "POST /hello", @@ -1151,7 +1144,7 @@ describe("Authorizer Spans", () => { service: "3gsxz7lha4.execute-api.eu-west-1.amazonaws.com", "service.name": "3gsxz7lha4.execute-api.eu-west-1.amazonaws.com", "span.kind": "server", - "span.type": "http", + "span.type": "web", stage: "dev", }, }, @@ -1173,7 +1166,6 @@ describe("Authorizer Spans", () => { endpoint: "/dev/hello", "http.method": "POST", "http.url": "https://3gsxz7lha4.execute-api.eu-west-1.amazonaws.com/dev/hello", - operation_name: "aws.apigateway", "peer.service": "mock-lambda-service", request_id: undefined, "resource.name": "POST /hello", @@ -1181,7 +1173,7 @@ describe("Authorizer Spans", () => { service: "3gsxz7lha4.execute-api.eu-west-1.amazonaws.com", "service.name": "3gsxz7lha4.execute-api.eu-west-1.amazonaws.com", "span.kind": "server", - "span.type": "http", + "span.type": "web", stage: "dev", }, }, @@ -1203,7 +1195,6 @@ describe("Authorizer Spans", () => { endpoint: "/dev/hi", "http.method": "GET", "http.url": "https://4dyr9xqip7.execute-api.eu-west-1.amazonaws.com/dev/hi", - operation_name: "aws.apigateway", "peer.service": "mock-lambda-service", request_id: undefined, "resource.name": "GET /hi", @@ -1211,7 +1202,7 @@ describe("Authorizer Spans", () => { service: "4dyr9xqip7.execute-api.eu-west-1.amazonaws.com", "service.name": "4dyr9xqip7.execute-api.eu-west-1.amazonaws.com", "span.kind": "server", - "span.type": "http", + "span.type": "web", stage: "dev", }, }, @@ -1228,7 +1219,6 @@ describe("Authorizer Spans", () => { endpoint: "/dev/hi", "http.method": "GET", "http.url": "https://4dyr9xqip7.execute-api.eu-west-1.amazonaws.com/dev/hi", - operation_name: "aws.apigateway", "peer.service": "mock-lambda-service", request_id: undefined, "resource.name": "GET /hi", @@ -1236,7 +1226,7 @@ describe("Authorizer Spans", () => { service: "4dyr9xqip7.execute-api.eu-west-1.amazonaws.com", "service.name": "4dyr9xqip7.execute-api.eu-west-1.amazonaws.com", "span.kind": "server", - "span.type": "http", + "span.type": "web", stage: "dev", }, }, @@ -1258,7 +1248,6 @@ describe("Authorizer Spans", () => { endpoint: "/dev/hi", "http.method": "GET", "http.url": "https://4dyr9xqip7.execute-api.eu-west-1.amazonaws.com/dev/hi", - operation_name: "aws.apigateway", "peer.service": "mock-lambda-service", request_id: undefined, "resource.name": "GET /hi", @@ -1266,7 +1255,7 @@ describe("Authorizer Spans", () => { service: "4dyr9xqip7.execute-api.eu-west-1.amazonaws.com", "service.name": "4dyr9xqip7.execute-api.eu-west-1.amazonaws.com", "span.kind": "server", - "span.type": "http", + "span.type": "web", stage: "dev", }, }, @@ -1288,7 +1277,6 @@ describe("Authorizer Spans", () => { endpoint: "/hello", "http.method": "GET", "http.url": "https://l9flvsey83.execute-api.eu-west-1.amazonaws.com/hello", - operation_name: "aws.httpapi", "peer.service": "mock-lambda-service", request_id: undefined, "resource.name": "GET /hello", @@ -1296,7 +1284,7 @@ describe("Authorizer Spans", () => { service: "l9flvsey83.execute-api.eu-west-1.amazonaws.com", "service.name": "l9flvsey83.execute-api.eu-west-1.amazonaws.com", "span.kind": "server", - "span.type": "http", + "span.type": "web", stage: "$default", }, }, @@ -1318,7 +1306,6 @@ describe("Authorizer Spans", () => { endpoint: "/hello", "http.method": "GET", "http.url": "https://l9flvsey83.execute-api.eu-west-1.amazonaws.com/hello", - operation_name: "aws.apigateway", "peer.service": "mock-lambda-service", request_id: undefined, "resource.name": "GET /hello", @@ -1326,7 +1313,7 @@ describe("Authorizer Spans", () => { service: "l9flvsey83.execute-api.eu-west-1.amazonaws.com", "service.name": "l9flvsey83.execute-api.eu-west-1.amazonaws.com", "span.kind": "server", - "span.type": "http", + "span.type": "web", stage: "$default", }, }, @@ -1349,7 +1336,6 @@ describe("Authorizer Spans", () => { event_type: "CONNECT", "http.url": "https://85fj5nw29d.execute-api.eu-west-1.amazonaws.com$connect", message_direction: "IN", - operation_name: "aws.apigateway", "peer.service": "mock-lambda-service", request_id: undefined, "resource.name": "85fj5nw29d.execute-api.eu-west-1.amazonaws.com $connect", @@ -1357,7 +1343,7 @@ describe("Authorizer Spans", () => { service: "85fj5nw29d.execute-api.eu-west-1.amazonaws.com", "service.name": "85fj5nw29d.execute-api.eu-west-1.amazonaws.com", "span.kind": "server", - "span.type": "http", + "span.type": "web", }, }, ]); @@ -1374,7 +1360,6 @@ describe("Authorizer Spans", () => { event_type: "CONNECT", "http.url": "https://85fj5nw29d.execute-api.eu-west-1.amazonaws.com$connect", message_direction: "IN", - operation_name: "aws.apigateway", "peer.service": "mock-lambda-service", request_id: undefined, "resource.name": "85fj5nw29d.execute-api.eu-west-1.amazonaws.com $connect", @@ -1382,7 +1367,7 @@ describe("Authorizer Spans", () => { service: "85fj5nw29d.execute-api.eu-west-1.amazonaws.com", "service.name": "85fj5nw29d.execute-api.eu-west-1.amazonaws.com", "span.kind": "server", - "span.type": "http", + "span.type": "web", }, }, ]); @@ -1404,7 +1389,6 @@ describe("Authorizer Spans", () => { event_type: "MESSAGE", "http.url": "https://85fj5nw29d.execute-api.eu-west-1.amazonaws.comhello", message_direction: "IN", - operation_name: "aws.apigateway", "peer.service": "mock-lambda-service", request_id: undefined, "resource.name": "85fj5nw29d.execute-api.eu-west-1.amazonaws.com hello", @@ -1412,7 +1396,7 @@ describe("Authorizer Spans", () => { service: "85fj5nw29d.execute-api.eu-west-1.amazonaws.com", "service.name": "85fj5nw29d.execute-api.eu-west-1.amazonaws.com", "span.kind": "server", - "span.type": "http", + "span.type": "web", }, }, ]); diff --git a/src/trace/span-inferrer.ts b/src/trace/span-inferrer.ts index 34466006..649f5804 100644 --- a/src/trace/span-inferrer.ts +++ b/src/trace/span-inferrer.ts @@ -120,14 +120,13 @@ export class SpanInferrer { const serviceName = SpanInferrer.determineServiceName(apiId, "lambda_api_gateway", domain, domain); options.tags = { - operation_name: "aws.apigateway", "http.url": httpUrl, endpoint: path, resource_names: resourceName, request_id: context?.awsRequestId, service: serviceName, "service.name": serviceName, - "span.type": "http", + "span.type": "web", "resource.name": resourceName, "peer.service": this.service, "span.kind": "server", @@ -160,12 +159,11 @@ export class SpanInferrer { // getting an approximated endTime if (eventSourceSubType === HTTPEventSubType.ApiGatewayV2) { options.startTime = startTime; // not inserting authorizer span - options.tags.operation_name = "aws.httpapi"; } else { upstreamSpanOptions = { startTime, childOf: parentSpanContext, - tags: { operation_name: "aws.apigateway.authorizer", ...options.tags }, + tags: { ...options.tags }, }; upstreamAuthorizerSpan = new SpanWrapper( this.traceWrapper.startSpan("aws.apigateway.authorizer", upstreamSpanOptions),