Skip to content

Commit 64129c7

Browse files
committed
Move resourcePath construction to separate method.
1 parent 62b3da1 commit 64129c7

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

src/trace/span-inferrer.ts

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,7 @@ export class SpanInferrer {
9494
const options: SpanOptions = {};
9595
const domain = event.requestContext.domainName || "";
9696
const path = event.rawPath || event.requestContext.path || event.requestContext.routeKey;
97-
var resourcePath = event.rawPath || event.requestContext.resourcePath || event.requestContext.routeKey;
98-
if (event.requestContext.routeKey && event.requestContext.routeKey.includes("{")) {
99-
// this is a parameterized route
100-
try {
101-
resourcePath = event.requestContext.routeKey.split(" ")[1];
102-
} catch (e) {
103-
logDebug("Error parsing routeKey", e as Error);
104-
}
105-
}
97+
const resourcePath = this.getResourcePath(event);
10698

10799
let method;
108100
if (event.requestContext.httpMethod) {
@@ -531,4 +523,17 @@ export class SpanInferrer {
531523
};
532524
return new SpanWrapper(this.traceWrapper.startSpan("aws.eventbridge", options), spanWrapperOptions);
533525
}
526+
527+
getResourcePath(event: any): string {
528+
const routeKey = event.requestContext.routeKey;
529+
if (routeKey && routeKey.includes("{")) {
530+
// this is a parameterized route
531+
try {
532+
return event.requestContext.routeKey.split(" ")[1];
533+
} catch (e) {
534+
logDebug("Error parsing routeKey", e as Error);
535+
}
536+
}
537+
return event.rawPath || event.requestContext.resourcePath || routeKey;
538+
}
534539
}

0 commit comments

Comments
 (0)