@xylabs/telemetry 4.9.10 → 4.9.12

package/dist/neutral/index.mjs

@@ -1,6 +1,7 @@
 // src/span.ts
 import {
   context,
+  ROOT_CONTEXT,
   trace
 } from "@opentelemetry/api";
 function span(name, fn, tracer) {
@@ -18,7 +19,18 @@ function span(name, fn, tracer) {
   }
 }
 function spanRoot(name, fn, tracer) {
-  return tracer ? tracer.startActiveSpan(name, fn) : fn();
+  if (tracer) {
+    const span2 = tracer.startSpan(name);
+    return context.with(trace.setSpan(ROOT_CONTEXT, span2), () => {
+      try {
+        return fn();
+      } finally {
+        span2.end();
+      }
+    });
+  } else {
+    return fn();
+  }
 }
 async function spanAsync(name, fn, tracer) {
   if (tracer) {
@@ -35,7 +47,18 @@ async function spanAsync(name, fn, tracer) {
   }
 }
 async function spanRootAsync(name, fn, tracer) {
-  return tracer ? await tracer.startActiveSpan(name, fn) : await fn();
+  if (tracer) {
+    const span2 = tracer.startSpan(name);
+    return await context.with(trace.setSpan(ROOT_CONTEXT, span2), async () => {
+      try {
+        return await fn();
+      } finally {
+        span2.end();
+      }
+    });
+  } else {
+    return await fn();
+  }
 }
 export {
   span,

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/span.ts"],"sourcesContent":["import {\n  context, trace, type Tracer,\n} from '@opentelemetry/api'\n\nexport function span<T>(name: string, fn: () => T, tracer?: Tracer): T {\n  if (tracer) {\n    const span = tracer.startSpan(name)\n    return context.with(trace.setSpan(context.active(), span), () => {\n      try {\n        return fn()\n      } finally {\n        span.end()\n      }\n    })\n  } else {\n    return fn()\n  }\n}\n\nexport function spanRoot<T>(name: string, fn: () => T, tracer?: Tracer): T {\n  return tracer ? tracer.startActiveSpan(name, fn) : fn()\n}\n\nexport async function spanAsync<T>(\n  name: string,\n  fn: () => Promise<T>,\n  tracer?: Tracer,\n): Promise<T> {\n  if (tracer) {\n    const span = tracer.startSpan(name)\n    return await context.with(trace.setSpan(context.active(), span), async () => {\n      try {\n        return await fn()\n      } finally {\n        span.end()\n      }\n    })\n  } else {\n    return await fn()\n  }\n}\n\nexport async function spanRootAsync<T>(name: string, fn: () => Promise<T>, tracer?: Tracer): Promise<T> {\n  return tracer ? await tracer.startActiveSpan(name, fn) : await fn()\n}\n"],"mappings":";AAAA;AAAA,EACE;AAAA,EAAS;AAAA,OACJ;AAEA,SAAS,KAAQ,MAAc,IAAa,QAAoB;AACrE,MAAI,QAAQ;AACV,UAAMA,QAAO,OAAO,UAAU,IAAI;AAClC,WAAO,QAAQ,KAAK,MAAM,QAAQ,QAAQ,OAAO,GAAGA,KAAI,GAAG,MAAM;AAC/D,UAAI;AACF,eAAO,GAAG;AAAA,MACZ,UAAE;AACA,QAAAA,MAAK,IAAI;AAAA,MACX;AAAA,IACF,CAAC;AAAA,EACH,OAAO;AACL,WAAO,GAAG;AAAA,EACZ;AACF;AAEO,SAAS,SAAY,MAAc,IAAa,QAAoB;AACzE,SAAO,SAAS,OAAO,gBAAgB,MAAM,EAAE,IAAI,GAAG;AACxD;AAEA,eAAsB,UACpB,MACA,IACA,QACY;AACZ,MAAI,QAAQ;AACV,UAAMA,QAAO,OAAO,UAAU,IAAI;AAClC,WAAO,MAAM,QAAQ,KAAK,MAAM,QAAQ,QAAQ,OAAO,GAAGA,KAAI,GAAG,YAAY;AAC3E,UAAI;AACF,eAAO,MAAM,GAAG;AAAA,MAClB,UAAE;AACA,QAAAA,MAAK,IAAI;AAAA,MACX;AAAA,IACF,CAAC;AAAA,EACH,OAAO;AACL,WAAO,MAAM,GAAG;AAAA,EAClB;AACF;AAEA,eAAsB,cAAiB,MAAc,IAAsB,QAA6B;AACtG,SAAO,SAAS,MAAM,OAAO,gBAAgB,MAAM,EAAE,IAAI,MAAM,GAAG;AACpE;","names":["span"]}
+{"version":3,"sources":["../../src/span.ts"],"sourcesContent":["import {\n  context, ROOT_CONTEXT,\n  trace, type Tracer,\n} from '@opentelemetry/api'\n\nexport function span<T>(name: string, fn: () => T, tracer?: Tracer): T {\n  if (tracer) {\n    const span = tracer.startSpan(name)\n    return context.with(trace.setSpan(context.active(), span), () => {\n      try {\n        return fn()\n      } finally {\n        span.end()\n      }\n    })\n  } else {\n    return fn()\n  }\n}\n\nexport function spanRoot<T>(name: string, fn: () => T, tracer?: Tracer): T {\n  if (tracer) {\n    const span = tracer.startSpan(name)\n    return context.with(trace.setSpan(ROOT_CONTEXT, span), () => {\n      try {\n        return fn()\n      } finally {\n        span.end()\n      }\n    })\n  } else {\n    return fn()\n  }\n}\n\nexport async function spanAsync<T>(\n  name: string,\n  fn: () => Promise<T>,\n  tracer?: Tracer,\n): Promise<T> {\n  if (tracer) {\n    const span = tracer.startSpan(name)\n    return await context.with(trace.setSpan(context.active(), span), async () => {\n      try {\n        return await fn()\n      } finally {\n        span.end()\n      }\n    })\n  } else {\n    return await fn()\n  }\n}\n\nexport async function spanRootAsync<T>(name: string, fn: () => Promise<T>, tracer?: Tracer): Promise<T> {\n  if (tracer) {\n    const span = tracer.startSpan(name)\n    return await context.with(trace.setSpan(ROOT_CONTEXT, span), async () => {\n      try {\n        return await fn()\n      } finally {\n        span.end()\n      }\n    })\n  } else {\n    return await fn()\n  }\n}\n"],"mappings":";AAAA;AAAA,EACE;AAAA,EAAS;AAAA,EACT;AAAA,OACK;AAEA,SAAS,KAAQ,MAAc,IAAa,QAAoB;AACrE,MAAI,QAAQ;AACV,UAAMA,QAAO,OAAO,UAAU,IAAI;AAClC,WAAO,QAAQ,KAAK,MAAM,QAAQ,QAAQ,OAAO,GAAGA,KAAI,GAAG,MAAM;AAC/D,UAAI;AACF,eAAO,GAAG;AAAA,MACZ,UAAE;AACA,QAAAA,MAAK,IAAI;AAAA,MACX;AAAA,IACF,CAAC;AAAA,EACH,OAAO;AACL,WAAO,GAAG;AAAA,EACZ;AACF;AAEO,SAAS,SAAY,MAAc,IAAa,QAAoB;AACzE,MAAI,QAAQ;AACV,UAAMA,QAAO,OAAO,UAAU,IAAI;AAClC,WAAO,QAAQ,KAAK,MAAM,QAAQ,cAAcA,KAAI,GAAG,MAAM;AAC3D,UAAI;AACF,eAAO,GAAG;AAAA,MACZ,UAAE;AACA,QAAAA,MAAK,IAAI;AAAA,MACX;AAAA,IACF,CAAC;AAAA,EACH,OAAO;AACL,WAAO,GAAG;AAAA,EACZ;AACF;AAEA,eAAsB,UACpB,MACA,IACA,QACY;AACZ,MAAI,QAAQ;AACV,UAAMA,QAAO,OAAO,UAAU,IAAI;AAClC,WAAO,MAAM,QAAQ,KAAK,MAAM,QAAQ,QAAQ,OAAO,GAAGA,KAAI,GAAG,YAAY;AAC3E,UAAI;AACF,eAAO,MAAM,GAAG;AAAA,MAClB,UAAE;AACA,QAAAA,MAAK,IAAI;AAAA,MACX;AAAA,IACF,CAAC;AAAA,EACH,OAAO;AACL,WAAO,MAAM,GAAG;AAAA,EAClB;AACF;AAEA,eAAsB,cAAiB,MAAc,IAAsB,QAA6B;AACtG,MAAI,QAAQ;AACV,UAAMA,QAAO,OAAO,UAAU,IAAI;AAClC,WAAO,MAAM,QAAQ,KAAK,MAAM,QAAQ,cAAcA,KAAI,GAAG,YAAY;AACvE,UAAI;AACF,eAAO,MAAM,GAAG;AAAA,MAClB,UAAE;AACA,QAAAA,MAAK,IAAI;AAAA,MACX;AAAA,IACF,CAAC;AAAA,EACH,OAAO;AACL,WAAO,MAAM,GAAG;AAAA,EAClB;AACF;","names":["span"]}

package/dist/types/span.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"span.d.ts","sourceRoot":"","sources":["../../src/span.ts"],"names":[],"mappings":"AAAA,OAAO,EACW,KAAK,MAAM,EAC5B,MAAM,oBAAoB,CAAA;AAE3B,wBAAgB,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC,CAarE;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC,CAEzE;AAED,wBAAsB,SAAS,CAAC,CAAC,EAC/B,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,CAAC,CAAC,CAaZ;AAED,wBAAsB,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAEtG"}
+{"version":3,"file":"span.d.ts","sourceRoot":"","sources":["../../src/span.ts"],"names":[],"mappings":"AAAA,OAAO,EAEE,KAAK,MAAM,EACnB,MAAM,oBAAoB,CAAA;AAE3B,wBAAgB,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC,CAarE;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC,CAazE;AAED,wBAAsB,SAAS,CAAC,CAAC,EAC/B,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,CAAC,CAAC,CAaZ;AAED,wBAAsB,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAatG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xylabs/telemetry",
-  "version": "4.9.10",
+  "version": "4.9.12",
   "description": "Base functionality used throughout XY Labs TypeScript/JavaScript libraries",
   "keywords": [
     "hex",

package/src/span.ts

@@ -1,5 +1,6 @@
 import {
-  context, trace, type Tracer,
+  context, ROOT_CONTEXT,
+  trace, type Tracer,
 } from '@opentelemetry/api'
 
 export function span<T>(name: string, fn: () => T, tracer?: Tracer): T {
@@ -18,7 +19,18 @@ export function span<T>(name: string, fn: () => T, tracer?: Tracer): T {
 }
 
 export function spanRoot<T>(name: string, fn: () => T, tracer?: Tracer): T {
-  return tracer ? tracer.startActiveSpan(name, fn) : fn()
+  if (tracer) {
+    const span = tracer.startSpan(name)
+    return context.with(trace.setSpan(ROOT_CONTEXT, span), () => {
+      try {
+        return fn()
+      } finally {
+        span.end()
+      }
+    })
+  } else {
+    return fn()
+  }
 }
 
 export async function spanAsync<T>(
@@ -41,5 +53,16 @@ export async function spanAsync<T>(
 }
 
 export async function spanRootAsync<T>(name: string, fn: () => Promise<T>, tracer?: Tracer): Promise<T> {
-  return tracer ? await tracer.startActiveSpan(name, fn) : await fn()
+  if (tracer) {
+    const span = tracer.startSpan(name)
+    return await context.with(trace.setSpan(ROOT_CONTEXT, span), async () => {
+      try {
+        return await fn()
+      } finally {
+        span.end()
+      }
+    })
+  } else {
+    return await fn()
+  }
 }