Merge pull request #27 from quintoandar/filter-attributes

Filter root span attributes
quintoandar · Mar 2, 2023 · 9d6c7d0 · 9d6c7d0
2 parents aa20420 + 2124dc0
commit 9d6c7d0
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/src/main.js b/src/main.js
@@ -59,19 +59,6 @@ function formatParams(params, module, funcCallerParam) {
     const result = [];
     const metadata = {};
 
-    if (tracer && tracer.currentRootSpan && tracer.currentRootSpan.traceId) {
-        metadata.traceId = tracer.currentRootSpan.traceId;
-        if (span_info) {
-            const allDescendants = tracer.currentRootSpan.allDescendants().map((span) => span.id)
-            metadata.rootSpan = {
-                parentSpanId: tracer.currentRootSpan.parentSpanId ? tracer.currentRootSpan.parentSpanId : null,
-                spanId: tracer.currentRootSpan.id,
-                descendants: allDescendants,
-                attributes: tracer.currentRootSpan.attributes 
-            }
-        }
-    }
-
     if (typeof params[0] === 'string') {
         result[0] = params[0];
     } else if (params[0] instanceof Error) {
@@ -107,6 +94,23 @@ function formatParams(params, module, funcCallerParam) {
         }
     }
 
+    if (tracer && tracer.currentRootSpan && tracer.currentRootSpan.traceId) {
+        metadata.traceId = tracer.currentRootSpan.traceId;
+        if (span_info) {
+            const notificationContextId = tracer.currentRootSpan.attributes['notificationContextId'];
+            const droneBuild = tracer.currentRootSpan.attributes['data.drone.build']
+            const attributes = {
+                ...(notificationContextId) && { notificationContextId },
+                ...(droneBuild) && { droneBuild }
+            }
+            metadata.rootSpan = {
+                parentSpanId: tracer.currentRootSpan.parentSpanId ? tracer.currentRootSpan.parentSpanId : null,
+                spanId: tracer.currentRootSpan.id,
+                attributes
+            }
+        }
+    }
+
     if (metadata.error && metadata.error.team) {
         metadata.team = metadata.error.team
     }