@xylabs/telemetry 4.9.6 → 4.9.8

package/dist/neutral/index.mjs

@@ -1,63 +1,64 @@
-// src/XyConsoleSpanExporter.ts
-import { ConsoleSpanExporter } from "@opentelemetry/sdk-trace-base";
-import chalk from "chalk";
-function spanDurationInMillis(span) {
-  return span.duration[0] * 1e3 + span.duration[1] / 1e6;
-}
-var XyConsoleSpanExporter = class _XyConsoleSpanExporter extends ConsoleSpanExporter {
-  static durationToLogLevel = [
-    0,
-    1,
-    10,
-    100,
-    1e3
-  ];
-  static logLevelToChalkColor = [
-    chalk.grey,
-    chalk.white,
-    chalk.green,
-    chalk.yellow,
-    chalk.red
-  ];
-  _logLevel;
-  constructor(logLevel = 0) {
-    super();
-    this._logLevel = logLevel;
-  }
-  get logLevel() {
-    return this._logLevel;
-  }
-  export(spans) {
-    for (const span of spans) {
-      const spanLevel = this.spanLevel(span);
-      if (spanLevel < this.logLevel) {
-        continue;
+// src/span.ts
+import {
+  context,
+  trace
+} from "@opentelemetry/api";
+function span(name, fn, tracer) {
+  if (tracer) {
+    const span2 = tracer.startSpan(name);
+    return context.with(trace.setSpan(context.active(), span2), () => {
+      try {
+        return fn();
+      } finally {
+        span2.end();
       }
-      const duration = spanDurationInMillis(span);
-      console.log(chalk.grey([
-        `Span [${span.name}]`,
-        this.logColor(spanLevel)(`${duration}ms`),
-        `TraceId: ${span.spanContext().traceId}`
-      ].join(", ")));
-    }
+    });
+  } else {
+    return fn();
   }
-  logColor(level) {
-    return _XyConsoleSpanExporter.logLevelToChalkColor[level] ?? chalk.magenta;
+}
+function spanRoot(name, fn, tracer) {
+  if (tracer) {
+    const span2 = tracer.startSpan(name);
+    try {
+      return fn();
+    } finally {
+      span2.end();
+    }
+  } else {
+    return fn();
   }
-  spanLevel(span) {
-    let logLevel = 0;
-    const duration = spanDurationInMillis(span);
-    for (let x = _XyConsoleSpanExporter.durationToLogLevel.length - 1; x >= 0; x--) {
-      if (duration > _XyConsoleSpanExporter.durationToLogLevel[x]) {
-        logLevel = x;
-        break;
+}
+async function spanAsync(name, fn, tracer) {
+  if (tracer) {
+    const span2 = tracer.startSpan(name);
+    return await context.with(trace.setSpan(context.active(), span2), async () => {
+      try {
+        return await fn();
+      } finally {
+        span2.end();
       }
+    });
+  } else {
+    return await fn();
+  }
+}
+async function spanRootAsync(name, fn, tracer) {
+  if (tracer) {
+    const span2 = tracer.startSpan(name);
+    try {
+      return await fn();
+    } finally {
+      span2.end();
     }
-    return logLevel;
+  } else {
+    return await fn();
   }
-};
+}
 export {
-  XyConsoleSpanExporter,
-  spanDurationInMillis
+  span,
+  spanAsync,
+  spanRoot,
+  spanRootAsync
 };
 //# sourceMappingURL=index.mjs.map

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/XyConsoleSpanExporter.ts"],"sourcesContent":["import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'\nimport { ConsoleSpanExporter } from '@opentelemetry/sdk-trace-base'\nimport chalk from 'chalk'\n\nexport function spanDurationInMillis(span: ReadableSpan) {\n  return span.duration[0] * 1000 + span.duration[1] / 1e6\n}\n\nexport class XyConsoleSpanExporter extends ConsoleSpanExporter {\n  static readonly durationToLogLevel = [\n    0,\n    1,\n    10,\n    100,\n    1000,\n  ]\n\n  static readonly logLevelToChalkColor = [\n    chalk.grey,\n    chalk.white,\n    chalk.green,\n    chalk.yellow,\n    chalk.red,\n  ]\n\n  private _logLevel: number\n\n  constructor(logLevel = 0) {\n    super()\n    this._logLevel = logLevel\n  }\n\n  get logLevel() {\n    return this._logLevel\n  }\n\n  override export(spans: ReadableSpan[]): void {\n    for (const span of spans) {\n      const spanLevel = this.spanLevel(span)\n      if (spanLevel < this.logLevel) {\n        continue\n      }\n      const duration = spanDurationInMillis(span)\n      console.log(chalk.grey([\n        `Span [${span.name}]`,\n        this.logColor(spanLevel)(`${duration}ms`),\n        `TraceId: ${span.spanContext().traceId}`,\n      ].join(', ')))\n    }\n  }\n\n  logColor(level: number) {\n    return XyConsoleSpanExporter.logLevelToChalkColor[level] ?? chalk.magenta\n  }\n\n  spanLevel(span: ReadableSpan) {\n    let logLevel = 0\n    const duration = spanDurationInMillis(span)\n    for (let x = XyConsoleSpanExporter.durationToLogLevel.length - 1; x >= 0; x--) {\n      if (duration > XyConsoleSpanExporter.durationToLogLevel[x]) {\n        logLevel = x\n        break\n      }\n    }\n    return logLevel\n  }\n}\n"],"mappings":";AACA,SAAS,2BAA2B;AACpC,OAAO,WAAW;AAEX,SAAS,qBAAqB,MAAoB;AACvD,SAAO,KAAK,SAAS,CAAC,IAAI,MAAO,KAAK,SAAS,CAAC,IAAI;AACtD;AAEO,IAAM,wBAAN,MAAM,+BAA8B,oBAAoB;AAAA,EAC7D,OAAgB,qBAAqB;AAAA,IACnC;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF;AAAA,EAEA,OAAgB,uBAAuB;AAAA,IACrC,MAAM;AAAA,IACN,MAAM;AAAA,IACN,MAAM;AAAA,IACN,MAAM;AAAA,IACN,MAAM;AAAA,EACR;AAAA,EAEQ;AAAA,EAER,YAAY,WAAW,GAAG;AACxB,UAAM;AACN,SAAK,YAAY;AAAA,EACnB;AAAA,EAEA,IAAI,WAAW;AACb,WAAO,KAAK;AAAA,EACd;AAAA,EAES,OAAO,OAA6B;AAC3C,eAAW,QAAQ,OAAO;AACxB,YAAM,YAAY,KAAK,UAAU,IAAI;AACrC,UAAI,YAAY,KAAK,UAAU;AAC7B;AAAA,MACF;AACA,YAAM,WAAW,qBAAqB,IAAI;AAC1C,cAAQ,IAAI,MAAM,KAAK;AAAA,QACrB,SAAS,KAAK,IAAI;AAAA,QAClB,KAAK,SAAS,SAAS,EAAE,GAAG,QAAQ,IAAI;AAAA,QACxC,YAAY,KAAK,YAAY,EAAE,OAAO;AAAA,MACxC,EAAE,KAAK,IAAI,CAAC,CAAC;AAAA,IACf;AAAA,EACF;AAAA,EAEA,SAAS,OAAe;AACtB,WAAO,uBAAsB,qBAAqB,KAAK,KAAK,MAAM;AAAA,EACpE;AAAA,EAEA,UAAU,MAAoB;AAC5B,QAAI,WAAW;AACf,UAAM,WAAW,qBAAqB,IAAI;AAC1C,aAAS,IAAI,uBAAsB,mBAAmB,SAAS,GAAG,KAAK,GAAG,KAAK;AAC7E,UAAI,WAAW,uBAAsB,mBAAmB,CAAC,GAAG;AAC1D,mBAAW;AACX;AAAA,MACF;AAAA,IACF;AACA,WAAO;AAAA,EACT;AACF;","names":[]}
+{"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  if (tracer) {\n    const span = tracer.startSpan(name)\n    try {\n      return fn()\n    } finally {\n      span.end()\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>(\n  name: string,\n  fn: () => Promise<T>,\n  tracer?: Tracer,\n): Promise<T> {\n  if (tracer) {\n    const span = tracer.startSpan(name)\n    try {\n      return await fn()\n    } finally {\n      span.end()\n    }\n  } else {\n    return await fn()\n  }\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,MAAI,QAAQ;AACV,UAAMA,QAAO,OAAO,UAAU,IAAI;AAClC,QAAI;AACF,aAAO,GAAG;AAAA,IACZ,UAAE;AACA,MAAAA,MAAK,IAAI;AAAA,IACX;AAAA,EACF,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,cACpB,MACA,IACA,QACY;AACZ,MAAI,QAAQ;AACV,UAAMA,QAAO,OAAO,UAAU,IAAI;AAClC,QAAI;AACF,aAAO,MAAM,GAAG;AAAA,IAClB,UAAE;AACA,MAAAA,MAAK,IAAI;AAAA,IACX;AAAA,EACF,OAAO;AACL,WAAO,MAAM,GAAG;AAAA,EAClB;AACF;","names":["span"]}

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
-export * from './XyConsoleSpanExporter.ts';
+export * from './span.ts';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA"}

package/dist/types/span.d.ts

@@ -0,0 +1,6 @@
+import { type Tracer } from '@opentelemetry/api';
+export declare function span<T>(name: string, fn: () => T, tracer?: Tracer): T;
+export declare function spanRoot<T>(name: string, fn: () => T, tracer?: Tracer): T;
+export declare function spanAsync<T>(name: string, fn: () => Promise<T>, tracer?: Tracer): Promise<T>;
+export declare function spanRootAsync<T>(name: string, fn: () => Promise<T>, tracer?: Tracer): Promise<T>;
+//# sourceMappingURL=span.d.ts.map

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

@@ -0,0 +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,CAWzE;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,EACnC,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,CAAC,CAAC,CAWZ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xylabs/telemetry",
-  "version": "4.9.6",
+  "version": "4.9.8",
   "description": "Base functionality used throughout XY Labs TypeScript/JavaScript libraries",
   "keywords": [
     "hex",
@@ -39,9 +39,7 @@
     "packages/**/*"
   ],
   "dependencies": {
-    "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/sdk-trace-base": "^2.0.0",
-    "chalk": "^5.4.1"
+    "@opentelemetry/api": "^1.9.0"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^6.5.5",

package/src/index.ts

@@ -1 +1 @@
-export * from './XyConsoleSpanExporter.ts'
+export * from './span.ts'

package/src/span.ts

@@ -0,0 +1,67 @@
+import {
+  context, trace, type Tracer,
+} from '@opentelemetry/api'
+
+export function span<T>(name: string, fn: () => T, tracer?: Tracer): T {
+  if (tracer) {
+    const span = tracer.startSpan(name)
+    return context.with(trace.setSpan(context.active(), span), () => {
+      try {
+        return fn()
+      } finally {
+        span.end()
+      }
+    })
+  } else {
+    return fn()
+  }
+}
+
+export function spanRoot<T>(name: string, fn: () => T, tracer?: Tracer): T {
+  if (tracer) {
+    const span = tracer.startSpan(name)
+    try {
+      return fn()
+    } finally {
+      span.end()
+    }
+  } else {
+    return fn()
+  }
+}
+
+export async function spanAsync<T>(
+  name: string,
+  fn: () => Promise<T>,
+  tracer?: Tracer,
+): Promise<T> {
+  if (tracer) {
+    const span = tracer.startSpan(name)
+    return await context.with(trace.setSpan(context.active(), span), async () => {
+      try {
+        return await fn()
+      } finally {
+        span.end()
+      }
+    })
+  } else {
+    return await fn()
+  }
+}
+
+export async function spanRootAsync<T>(
+  name: string,
+  fn: () => Promise<T>,
+  tracer?: Tracer,
+): Promise<T> {
+  if (tracer) {
+    const span = tracer.startSpan(name)
+    try {
+      return await fn()
+    } finally {
+      span.end()
+    }
+  } else {
+    return await fn()
+  }
+}

package/dist/types/XyConsoleSpanExporter.d.ts

@@ -1,14 +0,0 @@
-import type { ReadableSpan } from '@opentelemetry/sdk-trace-base';
-import { ConsoleSpanExporter } from '@opentelemetry/sdk-trace-base';
-export declare function spanDurationInMillis(span: ReadableSpan): number;
-export declare class XyConsoleSpanExporter extends ConsoleSpanExporter {
-    static readonly durationToLogLevel: number[];
-    static readonly logLevelToChalkColor: import("chalk").ChalkInstance[];
-    private _logLevel;
-    constructor(logLevel?: number);
-    get logLevel(): number;
-    export(spans: ReadableSpan[]): void;
-    logColor(level: number): import("chalk").ChalkInstance;
-    spanLevel(span: ReadableSpan): number;
-}
-//# sourceMappingURL=XyConsoleSpanExporter.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"XyConsoleSpanExporter.d.ts","sourceRoot":"","sources":["../../src/XyConsoleSpanExporter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAA;AAGnE,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,YAAY,UAEtD;AAED,qBAAa,qBAAsB,SAAQ,mBAAmB;IAC5D,MAAM,CAAC,QAAQ,CAAC,kBAAkB,WAMjC;IAED,MAAM,CAAC,QAAQ,CAAC,oBAAoB,kCAMnC;IAED,OAAO,CAAC,SAAS,CAAQ;gBAEb,QAAQ,SAAI;IAKxB,IAAI,QAAQ,WAEX;IAEQ,MAAM,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,IAAI;IAe5C,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,SAAS,CAAC,IAAI,EAAE,YAAY;CAW7B"}

package/src/XyConsoleSpanExporter.ts

@@ -1,67 +0,0 @@
-import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'
-import { ConsoleSpanExporter } from '@opentelemetry/sdk-trace-base'
-import chalk from 'chalk'
-
-export function spanDurationInMillis(span: ReadableSpan) {
-  return span.duration[0] * 1000 + span.duration[1] / 1e6
-}
-
-export class XyConsoleSpanExporter extends ConsoleSpanExporter {
-  static readonly durationToLogLevel = [
-    0,
-    1,
-    10,
-    100,
-    1000,
-  ]
-
-  static readonly logLevelToChalkColor = [
-    chalk.grey,
-    chalk.white,
-    chalk.green,
-    chalk.yellow,
-    chalk.red,
-  ]
-
-  private _logLevel: number
-
-  constructor(logLevel = 0) {
-    super()
-    this._logLevel = logLevel
-  }
-
-  get logLevel() {
-    return this._logLevel
-  }
-
-  override export(spans: ReadableSpan[]): void {
-    for (const span of spans) {
-      const spanLevel = this.spanLevel(span)
-      if (spanLevel < this.logLevel) {
-        continue
-      }
-      const duration = spanDurationInMillis(span)
-      console.log(chalk.grey([
-        `Span [${span.name}]`,
-        this.logColor(spanLevel)(`${duration}ms`),
-        `TraceId: ${span.spanContext().traceId}`,
-      ].join(', ')))
-    }
-  }
-
-  logColor(level: number) {
-    return XyConsoleSpanExporter.logLevelToChalkColor[level] ?? chalk.magenta
-  }
-
-  spanLevel(span: ReadableSpan) {
-    let logLevel = 0
-    const duration = spanDurationInMillis(span)
-    for (let x = XyConsoleSpanExporter.durationToLogLevel.length - 1; x >= 0; x--) {
-      if (duration > XyConsoleSpanExporter.durationToLogLevel[x]) {
-        logLevel = x
-        break
-      }
-    }
-    return logLevel
-  }
-}