Merge pull request #157 from ahom/tr

fix: better trace names
Toaztr · Mar 6, 2022 · 01f7f50 · 01f7f50
2 parents d0fe47e + 0f28582
commit 01f7f50
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/http.ts b/src/http.ts
@@ -21,7 +21,8 @@ export interface HttpEvent {
     pathParameters?: Parameters,
     queryStringParameters?: Parameters,
     rawPath?: string,
-    rawQueryString?: string
+    rawQueryString?: string,
+    routeKey?: string
 }
 
 interface ErrorMessage {
@@ -140,11 +141,14 @@ export class HttpRequest {
         if (!segment) {
             await exec();
         } else {
-            const subSegment = segment?.addNewSubsegment(`Toaztr-${segment.name}`);
+            const subSegment = segment?.addNewSubsegment(`Toaztr-${this.event.routeKey?.replace(' ', '-')}`);
             subSegment.addAttribute('namespace', 'remote');
+            subSegment.addAttribute('origin', 'Toaztr::HTTP');
             await getNamespace().runPromise(async function() {
                 setSegment(subSegment);
                 await exec();
+            }).finally(() => {
+                setSegment(segment);
             });
             subSegment.addAttribute('http', { 
                 request: {