@inference-net/otel-cf-workers 2.4.0 → 2.5.1

package/dist/index.d.ts

@@ -11,7 +11,7 @@ import { OTLPExporterError } from '@opentelemetry/otlp-exporter-base';
 import { ReadableSpan } from '@opentelemetry/sdk-trace-base';
 import { Resource } from '@opentelemetry/resources';
 import { Sampler } from '@opentelemetry/sdk-trace-base';
-import { Span } from '@opentelemetry/api';
+import { Span as Span_2 } from '@opentelemetry/api';
 import { SpanContext } from '@opentelemetry/api';
 import { SpanExporter } from '@opentelemetry/sdk-trace-base';
 import { SpanKind } from '@opentelemetry/api';
@@ -56,7 +56,7 @@ export declare class BatchTraceSpanProcessor implements TraceFlushableSpanProces
     private traces;
     constructor(exporter: SpanExporter);
     getTraceState(traceId: string): TraceState;
-    onStart(span: Span, _parentContext: Context): void;
+    onStart(span: Span_2, _parentContext: Context): void;
     onEnd(span: ReadableSpan): void;
     forceFlush(traceId?: traceId): Promise<void>;
     shutdown(): Promise<void>;
@@ -142,8 +142,8 @@ export declare interface HandlerInstrumentation<T extends Trigger, R extends any
     getInitialSpanInfo: (trigger: T) => InitialSpanInfo;
     getAttributesFromResult?: (result: Awaited<R>) => Attributes;
     instrumentTrigger?: (trigger: T) => T;
-    executionSucces?: (span: Span, trigger: T, result: Awaited<R>) => void;
-    executionFailed?: (span: Span, trigger: T, error?: any) => void;
+    executionSucces?: (span: Span_2, trigger: T, result: Awaited<R>) => void;
+    executionFailed?: (span: Span_2, trigger: T, error?: any) => void;
 }
 
 declare type HeadSamplerConf = Sampler | ParentRatioSamplingConfig;
@@ -327,7 +327,7 @@ export declare class MultiTransportLogRecordProcessor implements LogRecordProces
     shutdown(): Promise<void>;
 }
 
-declare type OnSpanEnd = (span: Span) => void;
+declare type OnSpanEnd = (span: Span_2) => void;
 
 export declare type OrPromise<T extends any> = T | Promise<T>;
 
@@ -453,7 +453,7 @@ export declare const SEVERITY_NUMBERS: {
 
 export declare type SeverityNumber = (typeof SEVERITY_NUMBERS)[keyof typeof SEVERITY_NUMBERS];
 
-export declare class SpanImpl implements Span, ReadableSpan {
+export declare class SpanImpl implements Span_2, ReadableSpan {
     name: string;
     private readonly _spanContext;
     private readonly onEnd;
@@ -546,10 +546,10 @@ declare class TraceState {
     private localRootSpan?;
     private traceDecision?;
     constructor(exporter: SpanExporter);
-    addSpan(span: Span): void;
+    addSpan(span: Span_2): void;
     endSpan(span: ReadableSpan): void;
     sample(): void;
-    flush(): Promise<void>;
+    flush(): Promise<boolean>;
     private isSpanInProgress;
     private exportSpans;
 }

package/dist/index.js

@@ -96,7 +96,7 @@ function passthroughGet(target, prop, thisArg) {
   }
 }
 
-const PACKAGE_VERSION = "2.4.0";
+const PACKAGE_VERSION = "2.5.1";
 const PACKAGE_NAME = "@inference-net/otel-cf-workers";
 const ATTR_CLOUDFLARE_COLO = "cloudflare.colo";
 const ATTR_CLOUDFLARE_RAY_ID = "cloudflare.ray_id";
@@ -298,7 +298,7 @@ class OTLPExporter {
       } else {
         onError(new OTLPExporterError(`Exporter received a statusCode: ${response.status}`));
       }
-      await response.body?.cancel();
+      response.body?.cancel();
     }).catch((error) => {
       onError(new OTLPExporterError(`Exception during export: ${error.toString()}`, error.code, error.stack));
     });
@@ -358,9 +358,11 @@ class TraceState {
       this.exportPromises.push(this.exportSpans(this.unexportedSpans));
       this.unexportedSpans = [];
     }
-    if (this.exportPromises.length > 0) {
+    const exportCount = this.exportPromises.length;
+    if (exportCount > 0) {
       await Promise.allSettled(this.exportPromises);
     }
+    return this.inprogressSpans.size === 0 && this.unexportedSpans.length === 0 && this.exportPromises.length === exportCount;
   }
   isSpanInProgress(span) {
     return this.inprogressSpans.has(span.spanContext().spanId);
@@ -399,11 +401,13 @@ class BatchTraceSpanProcessor {
     this.getTraceState(traceId).endSpan(span);
   }
   async forceFlush(traceId) {
-    if (traceId) {
-      await this.getTraceState(traceId).flush();
-    } else {
-      const promises = Object.values(this.traces).map((traceState) => traceState.flush);
-      await Promise.allSettled(promises);
+    if (!traceId) {
+      await Promise.allSettled(Object.keys(this.traces).map((id) => this.forceFlush(id)));
+      return;
+    }
+    const state = this.traces[traceId];
+    if (state && await state.flush() && this.traces[traceId] === state) {
+      delete this.traces[traceId];
     }
   }
   async shutdown() {
@@ -3525,7 +3529,6 @@ function findVersionMeta() {
   });
 }
 const createResource = (serviceConfig, versionMeta) => {
-  console.log({ versionMeta });
   const workerResourceAttrs = {
     "cloud.provider": "cloudflare",
     "cloud.platform": "cloudflare.workers",