Skip to content

Commit 7e8fea2

Browse files
CarlesDDCarlesDD
committed
Remove operation_name for API GW inferred spans
1 parent 651a2db commit 7e8fea2

2 files changed

Lines changed: 1 addition & 19 deletions

File tree

‎src/trace/span-inferrer.spec.ts‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,6 @@ describe("SpanInferrer", () => {
891891
event_type: "CONNECT",
892892
"http.url": "https://08se3mvh28.execute-api.eu-west-1.amazonaws.com$connect",
893893
message_direction: "IN",
894-
operation_name: "aws.apigateway",
895894
"peer.service": "mock-lambda-service",
896895
request_id: undefined,
897896
"resource.name": "08se3mvh28.execute-api.eu-west-1.amazonaws.com $connect",
@@ -917,7 +916,6 @@ describe("SpanInferrer", () => {
917916
endpoint: "/my/path",
918917
"http.url": "https://id.execute-api.us-east-1.amazonaws.com/my/path",
919918
domain_name: "id.execute-api.us-east-1.amazonaws.com",
920-
operation_name: "aws.apigateway",
921919
"peer.service": "mock-lambda-service",
922920
request_id: undefined,
923921
"http.method": "GET",
@@ -945,7 +943,6 @@ describe("SpanInferrer", () => {
945943
endpoint: "/default/nodejs-apig-function-1G3XMPLZXVXYI",
946944
"http.url": "https://r3pmxmplak.execute-api.us-east-2.amazonaws.com/default/nodejs-apig-function-1G3XMPLZXVXYI",
947945
domain_name: "r3pmxmplak.execute-api.us-east-2.amazonaws.com",
948-
operation_name: "aws.apigateway",
949946
"peer.service": "mock-lambda-service",
950947
request_id: undefined,
951948
"http.method": "GET",
@@ -973,7 +970,6 @@ describe("SpanInferrer", () => {
973970
endpoint: "/dev/user/42",
974971
"http.url": "https://mcwkra0ya4.execute-api.sa-east-1.amazonaws.com/dev/user/42",
975972
domain_name: "mcwkra0ya4.execute-api.sa-east-1.amazonaws.com",
976-
operation_name: "aws.apigateway",
977973
"peer.service": "mock-lambda-service",
978974
request_id: undefined,
979975
"http.method": "GET",
@@ -1001,7 +997,6 @@ describe("SpanInferrer", () => {
1001997
endpoint: "/user/42",
1002998
"http.url": "https://9vj54we5ih.execute-api.sa-east-1.amazonaws.com/user/42",
1003999
domain_name: "9vj54we5ih.execute-api.sa-east-1.amazonaws.com",
1004-
operation_name: "aws.apigateway",
10051000
"peer.service": "mock-lambda-service",
10061001
request_id: undefined,
10071002
"http.method": "GET",
@@ -1118,7 +1113,6 @@ describe("Authorizer Spans", () => {
11181113
endpoint: "/dev/hello",
11191114
"http.method": "POST",
11201115
"http.url": "https://3gsxz7lha4.execute-api.eu-west-1.amazonaws.com/dev/hello",
1121-
operation_name: "aws.apigateway",
11221116
"peer.service": "mock-lambda-service",
11231117
request_id: undefined,
11241118
"resource.name": "POST /hello",
@@ -1143,7 +1137,6 @@ describe("Authorizer Spans", () => {
11431137
endpoint: "/dev/hello",
11441138
"http.method": "POST",
11451139
"http.url": "https://3gsxz7lha4.execute-api.eu-west-1.amazonaws.com/dev/hello",
1146-
operation_name: "aws.apigateway",
11471140
"peer.service": "mock-lambda-service",
11481141
request_id: undefined,
11491142
"resource.name": "POST /hello",
@@ -1173,7 +1166,6 @@ describe("Authorizer Spans", () => {
11731166
endpoint: "/dev/hello",
11741167
"http.method": "POST",
11751168
"http.url": "https://3gsxz7lha4.execute-api.eu-west-1.amazonaws.com/dev/hello",
1176-
operation_name: "aws.apigateway",
11771169
"peer.service": "mock-lambda-service",
11781170
request_id: undefined,
11791171
"resource.name": "POST /hello",
@@ -1203,7 +1195,6 @@ describe("Authorizer Spans", () => {
12031195
endpoint: "/dev/hi",
12041196
"http.method": "GET",
12051197
"http.url": "https://4dyr9xqip7.execute-api.eu-west-1.amazonaws.com/dev/hi",
1206-
operation_name: "aws.apigateway",
12071198
"peer.service": "mock-lambda-service",
12081199
request_id: undefined,
12091200
"resource.name": "GET /hi",
@@ -1228,7 +1219,6 @@ describe("Authorizer Spans", () => {
12281219
endpoint: "/dev/hi",
12291220
"http.method": "GET",
12301221
"http.url": "https://4dyr9xqip7.execute-api.eu-west-1.amazonaws.com/dev/hi",
1231-
operation_name: "aws.apigateway",
12321222
"peer.service": "mock-lambda-service",
12331223
request_id: undefined,
12341224
"resource.name": "GET /hi",
@@ -1258,7 +1248,6 @@ describe("Authorizer Spans", () => {
12581248
endpoint: "/dev/hi",
12591249
"http.method": "GET",
12601250
"http.url": "https://4dyr9xqip7.execute-api.eu-west-1.amazonaws.com/dev/hi",
1261-
operation_name: "aws.apigateway",
12621251
"peer.service": "mock-lambda-service",
12631252
request_id: undefined,
12641253
"resource.name": "GET /hi",
@@ -1288,7 +1277,6 @@ describe("Authorizer Spans", () => {
12881277
endpoint: "/hello",
12891278
"http.method": "GET",
12901279
"http.url": "https://l9flvsey83.execute-api.eu-west-1.amazonaws.com/hello",
1291-
operation_name: "aws.httpapi",
12921280
"peer.service": "mock-lambda-service",
12931281
request_id: undefined,
12941282
"resource.name": "GET /hello",
@@ -1318,7 +1306,6 @@ describe("Authorizer Spans", () => {
13181306
endpoint: "/hello",
13191307
"http.method": "GET",
13201308
"http.url": "https://l9flvsey83.execute-api.eu-west-1.amazonaws.com/hello",
1321-
operation_name: "aws.apigateway",
13221309
"peer.service": "mock-lambda-service",
13231310
request_id: undefined,
13241311
"resource.name": "GET /hello",
@@ -1349,7 +1336,6 @@ describe("Authorizer Spans", () => {
13491336
event_type: "CONNECT",
13501337
"http.url": "https://85fj5nw29d.execute-api.eu-west-1.amazonaws.com$connect",
13511338
message_direction: "IN",
1352-
operation_name: "aws.apigateway",
13531339
"peer.service": "mock-lambda-service",
13541340
request_id: undefined,
13551341
"resource.name": "85fj5nw29d.execute-api.eu-west-1.amazonaws.com $connect",
@@ -1374,7 +1360,6 @@ describe("Authorizer Spans", () => {
13741360
event_type: "CONNECT",
13751361
"http.url": "https://85fj5nw29d.execute-api.eu-west-1.amazonaws.com$connect",
13761362
message_direction: "IN",
1377-
operation_name: "aws.apigateway",
13781363
"peer.service": "mock-lambda-service",
13791364
request_id: undefined,
13801365
"resource.name": "85fj5nw29d.execute-api.eu-west-1.amazonaws.com $connect",
@@ -1404,7 +1389,6 @@ describe("Authorizer Spans", () => {
14041389
event_type: "MESSAGE",
14051390
"http.url": "https://85fj5nw29d.execute-api.eu-west-1.amazonaws.comhello",
14061391
message_direction: "IN",
1407-
operation_name: "aws.apigateway",
14081392
"peer.service": "mock-lambda-service",
14091393
request_id: undefined,
14101394
"resource.name": "85fj5nw29d.execute-api.eu-west-1.amazonaws.com hello",

‎src/trace/span-inferrer.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ export class SpanInferrer {
120120
const serviceName = SpanInferrer.determineServiceName(apiId, "lambda_api_gateway", domain, domain);
121121

122122
options.tags = {
123-
operation_name: "aws.apigateway",
124123
"http.url": httpUrl,
125124
endpoint: path,
126125
resource_names: resourceName,
@@ -160,12 +159,11 @@ export class SpanInferrer {
160159
// getting an approximated endTime
161160
if (eventSourceSubType === HTTPEventSubType.ApiGatewayV2) {
162161
options.startTime = startTime; // not inserting authorizer span
163-
options.tags.operation_name = "aws.httpapi";
164162
} else {
165163
upstreamSpanOptions = {
166164
startTime,
167165
childOf: parentSpanContext,
168-
tags: { operation_name: "aws.apigateway.authorizer", ...options.tags },
166+
tags: { ...options.tags },
169167
};
170168
upstreamAuthorizerSpan = new SpanWrapper(
171169
this.traceWrapper.startSpan("aws.apigateway.authorizer", upstreamSpanOptions),

0 commit comments

Comments
 (0)