feat(tracing): Add span origin to trace context

Author: mydea

packages/core/src/tracing/span.ts

@@ -332,6 +332,7 @@ export class Span implements SpanInterface {
       status: this.status,
       tags: Object.keys(this.tags).length > 0 ? this.tags : undefined,
       trace_id: this.traceId,
+      origin: this.origin,
     });
   }
 

packages/opentelemetry/test/custom/transaction.test.ts

@@ -28,6 +28,7 @@ describe('NodeExperimentalTransaction', () => {
           trace: {
             span_id: expect.any(String),
             trace_id: expect.any(String),
+            origin: 'manual',
           },
         },
         spans: [],
@@ -106,6 +107,7 @@ describe('NodeExperimentalTransaction', () => {
           trace: {
             span_id: expect.any(String),
             trace_id: expect.any(String),
+            origin: 'manual',
           },
         },
         spans: [],

packages/opentelemetry/test/integration/scope.test.ts

@@ -98,6 +98,7 @@ describe('Integration | Scope', () => {
                 span_id: spanId,
                 status: 'ok',
                 trace_id: traceId,
+                origin: 'manual',
               },
             }),
 

packages/opentelemetry/test/integration/transactions.test.ts

@@ -37,26 +37,18 @@ describe('Integration | Transactions', () => {
         metadata: { requestPath: 'test-path' },
       },
       span => {
-        if (!span) {
-          return;
-        }
-
         addBreadcrumb({ message: 'test breadcrumb 2', timestamp: 123456 });
 
         span.setAttributes({
           'test.outer': 'test value',
         });
 
         const subSpan = startInactiveSpan({ name: 'inner span 1' });
-        subSpan?.end();
+        subSpan.end();
 
         setTag('test.tag', 'test value');
 
         startSpan({ name: 'inner span 2' }, innerSpan => {
-          if (!innerSpan) {
-            return;
-          }
-
           addBreadcrumb({ message: 'test breadcrumb 3', timestamp: 123456 });
 
           innerSpan.setAttributes({
@@ -96,6 +88,7 @@ describe('Integration | Transactions', () => {
             span_id: expect.any(String),
             status: 'ok',
             trace_id: expect.any(String),
+            origin: 'auto.test',
           },
         },
         environment: 'production',
@@ -186,26 +179,18 @@ describe('Integration | Transactions', () => {
     addBreadcrumb({ message: 'test breadcrumb 1', timestamp: 123456 });
 
     startSpan({ op: 'test op', name: 'test name', source: 'task', origin: 'auto.test' }, span => {
-      if (!span) {
-        return;
-      }
-
       addBreadcrumb({ message: 'test breadcrumb 2', timestamp: 123456 });
 
       span.setAttributes({
         'test.outer': 'test value',
       });
 
       const subSpan = startInactiveSpan({ name: 'inner span 1' });
-      subSpan?.end();
+      subSpan.end();
 
       setTag('test.tag', 'test value');
 
       startSpan({ name: 'inner span 2' }, innerSpan => {
-        if (!innerSpan) {
-          return;
-        }
-
         addBreadcrumb({ message: 'test breadcrumb 3', timestamp: 123456 });
 
         innerSpan.setAttributes({
@@ -215,26 +200,18 @@ describe('Integration | Transactions', () => {
     });
 
     startSpan({ op: 'test op b', name: 'test name b' }, span => {
-      if (!span) {
-        return;
-      }
-
       addBreadcrumb({ message: 'test breadcrumb 2b', timestamp: 123456 });
 
       span.setAttributes({
         'test.outer': 'test value b',
       });
 
       const subSpan = startInactiveSpan({ name: 'inner span 1b' });
-      subSpan?.end();
+      subSpan.end();
 
       setTag('test.tag', 'test value b');
 
       startSpan({ name: 'inner span 2b' }, innerSpan => {
-        if (!innerSpan) {
-          return;
-        }
-
         addBreadcrumb({ message: 'test breadcrumb 3b', timestamp: 123456 });
 
         innerSpan.setAttributes({
@@ -265,6 +242,7 @@ describe('Integration | Transactions', () => {
             span_id: expect.any(String),
             status: 'ok',
             trace_id: expect.any(String),
+            origin: 'auto.test',
           },
         }),
         spans: [
@@ -306,6 +284,7 @@ describe('Integration | Transactions', () => {
             span_id: expect.any(String),
             status: 'ok',
             trace_id: expect.any(String),
+            origin: 'manual',
           },
         }),
         spans: [
@@ -359,19 +338,11 @@ describe('Integration | Transactions', () => {
     context.with(
       trace.setSpanContext(setPropagationContextOnContext(context.active(), propagationContext), spanContext),
       () => {
-        startSpan({ op: 'test op', name: 'test name', source: 'task', origin: 'auto.test' }, span => {
-          if (!span) {
-            return;
-          }
-
+        startSpan({ op: 'test op', name: 'test name', source: 'task', origin: 'auto.test' }, () => {
           const subSpan = startInactiveSpan({ name: 'inner span 1' });
-          subSpan?.end();
+          subSpan.end();
 
-          startSpan({ name: 'inner span 2' }, innerSpan => {
-            if (!innerSpan) {
-              return;
-            }
-          });
+          startSpan({ name: 'inner span 2' }, () => {});
         });
       },
     );
@@ -392,6 +363,7 @@ describe('Integration | Transactions', () => {
             parent_span_id: parentSpanId,
             status: 'ok',
             trace_id: traceId,
+            origin: 'auto.test',
           },
         }),
         // spans are circular (they have a reference to the transaction), which leads to jest choking on this

packages/types/src/context.ts

@@ -1,4 +1,5 @@
 import type { Primitive } from './misc';
+import { SpanOrigin } from './span';
 
 export type Context = Record<string, unknown>;
 
@@ -101,6 +102,7 @@ export interface TraceContext extends Record<string, unknown> {
   status?: string;
   tags?: { [key: string]: Primitive };
   trace_id: string;
+  origin?: SpanOrigin;
 }
 
 export interface CloudResourceContext extends Record<string, unknown> {