@interopio/otel 0.0.13 → 0.0.14

package/dist/traces/manager.js

@@ -15,12 +15,12 @@ const utils_1 = require("./utils");
 const manager_1 = require("../validation/traces/manager");
 const tracingState_1 = require("./tracingState");
 const withSpan_1 = require("../validation/traces/withSpan");
+const nullTracingState_1 = require("./nullTracingState");
 class TracesManager {
-    constructor(settings, logger, tracingContextGetter, tracerProvider) {
+    constructor(settings, logger, tracingContextGetter, tracerProvider, sampler, spanProcessors, spanExporters, providerRegistrationSettings) {
         this.settings = settings;
         this.logger = logger;
         this.tracingContextGetter = tracingContextGetter;
-        this.tracerProvider = tracerProvider;
         this.started = false;
         this.VERSION = "00";
         this.DEFAULT_URL = "http://localhost:4318/v1/traces";
@@ -30,24 +30,26 @@ class TracesManager {
         const defaultTracingEnv = tracingContextGetter === null || tracingContextGetter === void 0 ? void 0 : tracingContextGetter.call(this);
         const replacedSettings = (0, utils_1.replacePlaceHolders)(settings, defaultTracingEnv);
         this.settings = replacedSettings;
-        (0, utils_1.setTracerProvider)(this.tracerProvider, Object.assign(Object.assign({}, settings), { 
-            // vnikolov todo
-            serviceName: (defaultTracingEnv === null || defaultTracingEnv === void 0 ? void 0 : defaultTracingEnv.serviceName) || this.settings.serviceName || this.DEFAULT_SERVICE_NAME, url: this.settings.url || this.DEFAULT_URL }));
-        // vnikolov TODO
+        (0, utils_1.setTracerProvider)(tracerProvider, sampler, spanProcessors, spanExporters, providerRegistrationSettings, this.tracingContextGetter, this.logger, Object.assign(Object.assign({}, this.settings), { serviceName: (defaultTracingEnv === null || defaultTracingEnv === void 0 ? void 0 : defaultTracingEnv.serviceName) || this.settings.serviceName || this.DEFAULT_SERVICE_NAME, userId: (defaultTracingEnv === null || defaultTracingEnv === void 0 ? void 0 : defaultTracingEnv.user) || this.settings.userId, url: this.settings.url || this.DEFAULT_URL }));
         const validator = new manager_1.TracesManagerValidator();
         validator.validate(this);
     }
-    extractTracingPropagationInfo(propagationInfo) {
+    extractTracingPropagationInfo(propagationInfo, deleteProperty) {
         if (propagationInfo.traceparent) {
             return propagationInfo;
         }
         const nestedPropagationInfo = propagationInfo
             .__interopIOTracePropagationInfo;
         if (nestedPropagationInfo) {
+            if (deleteProperty === false) {
+                delete propagationInfo.__interopIOTracePropagationInfo;
+            }
             return nestedPropagationInfo;
         }
+        else {
+            return null;
+        }
     }
-    // Method implementation
     withSpan(source, tracingContextOrCallback, propagationInfoOrCallback, callback) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
@@ -59,15 +61,37 @@ class TracesManager {
             }
             const fullTracingContext = Object.assign(Object.assign({}, (_a = this.tracingContextGetter) === null || _a === void 0 ? void 0 : _a.call(this)), tracingContext);
             if (!(fullTracingContext === null || fullTracingContext === void 0 ? void 0 : fullTracingContext.user)) {
-                fullTracingContext.user = this.settings.user || this.DEFAULT_USER;
+                fullTracingContext.user = this.settings.userId || this.DEFAULT_USER;
+            }
+            if (!(fullTracingContext === null || fullTracingContext === void 0 ? void 0 : fullTracingContext.userId)) {
+                fullTracingContext.userId = this.settings.userId || this.DEFAULT_USER;
+            }
+            if (!(fullTracingContext === null || fullTracingContext === void 0 ? void 0 : fullTracingContext.serviceName)) {
+                fullTracingContext.serviceName = this.settings.serviceName || this.DEFAULT_SERVICE_NAME;
+            }
+            if (!(fullTracingContext === null || fullTracingContext === void 0 ? void 0 : fullTracingContext.serviceId)) {
+                fullTracingContext.serviceId = this.settings.serviceId;
+            }
+            if (!(fullTracingContext === null || fullTracingContext === void 0 ? void 0 : fullTracingContext.serviceVersion)) {
+                fullTracingContext.serviceVersion = this.settings.serviceVersion;
+            }
+            if (!(fullTracingContext === null || fullTracingContext === void 0 ? void 0 : fullTracingContext.platformVersion)) {
+                fullTracingContext.platformVersion = this.settings.platformVersion;
+            }
+            if (this.settings.filteringContext) {
+                for (const key in this.settings.filteringContext) {
+                    if (!fullTracingContext[key]) {
+                        fullTracingContext[key] = this.settings.filteringContext[key];
+                    }
+                }
             }
             const match = (_b = this.settings.filters) === null || _b === void 0 ? void 0 : _b.find((filter) => (0, utils_1.isFilterMatch)(filter, fullTracingContext, source));
             (_c = this.logger) === null || _c === void 0 ? void 0 : _c.debug(`beginSpan() source:${source} context:${fullTracingContext} ` +
                 (match
                     ? "match: " + JSON.stringify(match)
                     : "default: " + JSON.stringify(this.settings.default)));
-            const enabled = (0, utils_1.isSpanEnabled)(match, this.settings.default);
-            const level = (match === null || match === void 0 ? void 0 : match.level) || ((_d = this.settings.default) === null || _d === void 0 ? void 0 : _d.level) || "OFF";
+            const enabled = this.started && (0, utils_1.isSpanEnabled)(match, this.settings.default);
+            const level = (match === null || match === void 0 ? void 0 : match.level) || ((_d = this.settings.default) === null || _d === void 0 ? void 0 : _d.level) || "INFO";
             let activeContext = api_1.context.active();
             if (propagationInfoOrCallback) {
                 let propagationInfoCarrier = {};
@@ -79,71 +103,79 @@ class TracesManager {
                     activeContext = api_1.propagation.extract(api_1.context.active(), propagationInfo);
                 }
             }
+            let actualCallback;
             if (typeof tracingContextOrCallback === "function") {
-                callback = tracingContextOrCallback;
+                actualCallback = callback = tracingContextOrCallback;
             }
             else if (typeof propagationInfoOrCallback === "function") {
-                callback = propagationInfoOrCallback;
+                actualCallback = callback = propagationInfoOrCallback;
+            }
+            else {
+                if (!callback) {
+                    throw new Error("callback agument must be provided");
+                }
+                actualCallback = callback;
             }
             if (enabled) {
                 const tracer = api_1.trace.getTracer(source);
-                //const otelSpan = tracer.startSpan(source, undefined, activeContext);
                 // todo: replace this dummy options
                 const options = {};
-                return yield tracer.startActiveSpan(source, options, activeContext, (otelSpan) => __awaiter(this, void 0, void 0, function* () {
-                    const tracingState = new tracingState_1.TracingState(source, level, otelSpan, this.logger, this.VERSION, this.settings.spanTimeoutMs);
-                    if (this.settings.addContextToTrace !== false) {
+                return tracer.startActiveSpan(source, options, activeContext, (otelSpan) => __awaiter(this, void 0, void 0, function* () {
+                    var _e, _f, _g;
+                    const tracingState = new tracingState_1.TracingState(source, level, otelSpan, this.logger, this.VERSION);
+                    if (this.settings.platformVersion) {
+                        (0, utils_1.saveDataInAttribute)({ platformVersion: this.settings.platformVersion }, otelSpan);
+                    }
+                    if ((match && match.addContextToTrace !== false) ||
+                        (!match && ((_e = this.settings.default) === null || _e === void 0 ? void 0 : _e.addContextToTrace) !== false)) {
                         (0, utils_1.saveDataInAttribute)(fullTracingContext, otelSpan);
                     }
-                    if (callback) {
-                        const result = yield callback(tracingState);
+                    try {
+                        const result = yield actualCallback(tracingState);
+                        if (tracingState.currentSpanStatus.code === api_1.SpanStatusCode.UNSET) {
+                            if ((match && match.autoSetSuccessStatus) ||
+                                (!match && ((_g = (_f = this.settings) === null || _f === void 0 ? void 0 : _f.default) === null || _g === void 0 ? void 0 : _g.autoSetSuccessStatus))) {
+                                otelSpan.setStatus({ code: api_1.SpanStatusCode.OK });
+                            }
+                        }
+                        return result;
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    }
+                    catch (err) {
+                        otelSpan.setStatus({
+                            message: typeof err === "string" ? err : err === null || err === void 0 ? void 0 : err.message,
+                            code: api_1.SpanStatusCode.ERROR,
+                        });
+                        otelSpan.recordException(err);
+                        throw err;
+                    }
+                    finally {
                         // we implicitly call otelSpan.end()
                         otelSpan.end();
-                        return result;
                     }
                 }));
             }
             else {
-                const tracingState = {
-                    enabled: false,
-                    level,
-                    source,
-                    span: null,
-                    addData: function () {
-                        // do nothing
-                        return Promise.resolve();
-                    },
-                    endSpan: function () {
-                        // do nothing
-                        return Promise.resolve();
-                    },
-                    getPropagationInfo: () => null,
-                    // todo vnikolov: use parent propagation info
-                    injectPropagationInfo: (carrier) => {
-                        if (propagationInfoOrCallback) {
-                            let propagationInfoCarrier = {};
-                            if (!(0, utils_1.isFunctionType)(propagationInfoOrCallback)) {
-                                propagationInfoCarrier = Object.assign({}, propagationInfoOrCallback);
-                            }
-                            const extractedPI = this.extractTracingPropagationInfo(propagationInfoCarrier);
-                            if (extractedPI) {
-                                carrier.__interopIOTracePropagationInfo = extractedPI;
-                            }
-                        }
-                    },
-                };
-                return yield (callback === null || callback === void 0 ? void 0 : callback(tracingState));
+                let extractedPI = null;
+                if (propagationInfoOrCallback) {
+                    let propagationInfoCarrier = {};
+                    if (!(0, utils_1.isFunctionType)(propagationInfoOrCallback)) {
+                        propagationInfoCarrier = Object.assign({}, propagationInfoOrCallback);
+                    }
+                    extractedPI = this.extractTracingPropagationInfo(propagationInfoCarrier);
+                }
+                return actualCallback(new nullTracingState_1.NullTracingState(source, extractedPI));
             }
         });
     }
     start() {
         return __awaiter(this, void 0, void 0, function* () {
-            // vnikolov TODO
+            this.started = true;
         });
     }
     stop() {
         return __awaiter(this, void 0, void 0, function* () {
-            // vnikolov TODO
+            this.started = false;
         });
     }
 }

package/dist/traces/manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/traces/manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/traces/manager.ts"],"names":[],"mappings":"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"}

package/dist/traces/nullTracesManager.d.ts

@@ -1,6 +1,6 @@
 import { NullManager } from "../utils/nullManager";
-import { TracesManager, TracesSettings } from "./types";
+import { PropagationInfo, PropagationInfoCarrier, TracesManager, TracesSettings, TracingContext, WithSpanCallback } from "./types";
 export declare class NullTracesManager extends NullManager<TracesSettings> implements TracesManager {
-    extractTracingPropagationInfo(): undefined;
-    withSpan(): Promise<void>;
+    withSpan<T>(source: string, tracingContextOrCallback: TracingContext | WithSpanCallback<T>, propagationInfoOrCallback?: PropagationInfo | PropagationInfoCarrier | WithSpanCallback<T>, callback?: WithSpanCallback<T>): Promise<T>;
+    extractTracingPropagationInfo(propagationInfo: PropagationInfo | PropagationInfoCarrier, deleteProperty?: boolean): PropagationInfo | null;
 }

package/dist/traces/nullTracesManager.js

@@ -1,22 +1,44 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NullTracesManager = void 0;
 const nullManager_1 = require("../utils/nullManager");
+const nullTracingState_1 = require("./nullTracingState");
+const utils_1 = require("./utils");
 class NullTracesManager extends nullManager_1.NullManager {
-    extractTracingPropagationInfo() {
-        return undefined;
+    withSpan(source, tracingContextOrCallback, propagationInfoOrCallback, callback) {
+        let actualCallback = (typeof tracingContextOrCallback === "function") ? tracingContextOrCallback :
+            (typeof propagationInfoOrCallback === "function") ? propagationInfoOrCallback :
+                callback;
+        if (!actualCallback) {
+            throw new Error("callback must be provided");
+        }
+        // todo vnikolov: duplication, extract to abstract class
+        let extractedPI = null;
+        if (propagationInfoOrCallback) {
+            let propagationInfoCarrier = {};
+            if (!(0, utils_1.isFunctionType)(propagationInfoOrCallback)) {
+                propagationInfoCarrier = Object.assign({}, propagationInfoOrCallback);
+            }
+            extractedPI = this.extractTracingPropagationInfo(propagationInfoCarrier);
+        }
+        return Promise.resolve(actualCallback(new nullTracingState_1.NullTracingState(source, extractedPI)));
     }
-    withSpan() {
-        return __awaiter(this, void 0, void 0, function* () { });
+    // todo vnikolov: duplication, extract to abstract class
+    extractTracingPropagationInfo(propagationInfo, deleteProperty) {
+        if (propagationInfo.traceparent) {
+            return propagationInfo;
+        }
+        const nestedPropagationInfo = propagationInfo
+            .__interopIOTracePropagationInfo;
+        if (nestedPropagationInfo) {
+            if (deleteProperty === true) {
+                delete propagationInfo.__interopIOTracePropagationInfo;
+            }
+            return nestedPropagationInfo;
+        }
+        else {
+            return null;
+        }
     }
 }
 exports.NullTracesManager = NullTracesManager;

package/dist/traces/nullTracesManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"nullTracesManager.js","sourceRoot":"","sources":["../../src/traces/nullTracesManager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sDAAmD;AAGnD,MAAa,iBAAkB,SAAQ,yBAA2B;IAChE,6BAA6B;QAC3B,OAAO,SAAS,CAAC;IACnB,CAAC;IACK,QAAQ;8DAAmB,CAAC;KAAA;CACnC;AALD,8CAKC"}
+{"version":3,"file":"nullTracesManager.js","sourceRoot":"","sources":["../../src/traces/nullTracesManager.ts"],"names":[],"mappings":";;;AAAA,sDAAmD;AACnD,yDAAsD;AAEtD,mCAAyC;AAEzC,MAAa,iBAAkB,SAAQ,yBAA2B;IAEhE,QAAQ,CACN,MAAc,EACd,wBAA8D,EAC9D,yBAA0F,EAC1F,QAA8B;QAE9B,IAAI,cAAc,GAAG,CAAC,OAAO,wBAAwB,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC;YAChG,CAAC,OAAO,yBAAyB,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC;gBAC7E,QAAQ,CAAC;QAEb,IAAI,CAAC,cAAc,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;SAC7C;QAED,wDAAwD;QACxD,IAAI,WAAW,GAA2B,IAAI,CAAC;QAC/C,IAAI,yBAAyB,EAAE;YAC7B,IAAI,sBAAsB,GAAG,EAAE,CAAC;YAChC,IAAI,CAAC,IAAA,sBAAc,EAAC,yBAAyB,CAAC,EAAE;gBAC9C,sBAAsB,qBAAQ,yBAAyB,CAAE,CAAC;aAC3D;YACD,WAAW,GAAG,IAAI,CAAC,6BAA6B,CAAC,sBAAsB,CAAC,CAAC;SAC1E;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,mCAAgB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACpF,CAAC;IAED,wDAAwD;IACxD,6BAA6B,CAC3B,eAAyD,EACzD,cAAwB;QAExB,IAAK,eAAmC,CAAC,WAAW,EAAE;YACpD,OAAO,eAAkC,CAAC;SAC3C;QAED,MAAM,qBAAqB,GAAI,eAA0C;aACtE,+BAA+B,CAAC;QACnC,IAAI,qBAAqB,EAAE;YACzB,IAAI,cAAc,KAAK,IAAI,EAAE;gBAC3B,OAAQ,eAA0C,CAAC,+BAA+B,CAAC;aACpF;YACD,OAAO,qBAAqB,CAAC;SAC9B;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC;CACF;AAjDD,8CAiDC"}

package/dist/traces/nullTracingState.d.ts

@@ -0,0 +1,23 @@
+import { AttributeData, PropagationInfo, PropagationInfoCarrier, TracingState as ITracingState, Verbosity } from "./types";
+import { Exception, TimeInput, Attributes, SpanStatus } from "@opentelemetry/api";
+export declare class NullTracingState implements ITracingState {
+    source: string;
+    private propagationInfo;
+    constructor(source: string, propagationInfo: PropagationInfo | null);
+    level: "OFF";
+    endSpan(): Promise<void>;
+    get enabled(): boolean;
+    get id(): undefined;
+    setStatus(status: SpanStatus): this;
+    addEvent(name: string, attributesOrStartTime?: Attributes | TimeInput, startTime?: TimeInput): this;
+    recordException(exception: Exception, time?: TimeInput): void;
+    isRecording(): boolean;
+    updateName(name: string): this;
+    spanContext(): undefined;
+    addData(level: Verbosity | keyof typeof Verbosity, data: AttributeData): Promise<void>;
+    getPropagationInfo(): {
+        traceparent?: string | undefined;
+        tracestate?: string | undefined;
+    };
+    injectPropagationInfo(carrier: PropagationInfoCarrier): void;
+}

package/dist/traces/nullTracingState.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NullTracingState = void 0;
+const api_1 = require("@opentelemetry/api");
+class NullTracingState {
+    constructor(source, propagationInfo) {
+        this.source = source;
+        this.propagationInfo = propagationInfo;
+        this.level = "OFF";
+    }
+    endSpan() {
+        return Promise.resolve();
+    }
+    get enabled() {
+        return false;
+    }
+    get id() {
+        return undefined;
+    }
+    setStatus(status) {
+        return this;
+    }
+    addEvent(name, attributesOrStartTime, startTime) {
+        return this;
+    }
+    recordException(exception, time) {
+    }
+    isRecording() {
+        return false;
+    }
+    updateName(name) {
+        return this;
+    }
+    spanContext() {
+        return undefined;
+    }
+    addData(level, data) {
+        return Promise.resolve();
+    }
+    getPropagationInfo() {
+        const propagationInfo = Object.assign({}, this.propagationInfo);
+        api_1.propagation.inject(api_1.context.active(), propagationInfo);
+        return propagationInfo;
+    }
+    injectPropagationInfo(carrier) {
+        if (this.propagationInfo) {
+            carrier.__interopIOTracePropagationInfo = this.propagationInfo;
+        }
+    }
+}
+exports.NullTracingState = NullTracingState;
+//# sourceMappingURL=nullTracingState.js.map

package/dist/traces/nullTracingState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nullTracingState.js","sourceRoot":"","sources":["../../src/traces/nullTracingState.ts"],"names":[],"mappings":";;;AAUA,4CAO4B;AAE5B,MAAa,gBAAgB;IAC3B,YACS,MAAc,EACb,eAAuC;QADxC,WAAM,GAAN,MAAM,CAAQ;QACb,oBAAe,GAAf,eAAe,CAAwB;QAGjD,UAAK,GAAU,KAAK,CAAC;IAFrB,CAAC;IAIM,OAAO;QACZ,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAW,EAAE;QACX,OAAO,SAAS,CAAC;IACnB,CAAC;IACM,SAAS,CAAC,MAAkB;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IACM,QAAQ,CACb,IAAY,EACZ,qBAA8C,EAC9C,SAAqB;QAErB,OAAO,IAAI,CAAC;IACd,CAAC;IACM,eAAe,CAAC,SAAoB,EAAE,IAAgB;IAC7D,CAAC;IACM,WAAW;QAChB,OAAO,KAAK,CAAC;IACf,CAAC;IACM,UAAU,CAAC,IAAY;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IACM,WAAW;QAChB,OAAO,SAAS,CAAC;IACnB,CAAC;IAEM,OAAO,CAAC,KAAyC,EAAE,IAAmB;QAC3E,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAEM,kBAAkB;QACvB,MAAM,eAAe,qBAAQ,IAAI,CAAC,eAAe,CAAE,CAAC;QACpD,iBAAW,CAAC,MAAM,CAAC,aAAO,CAAC,MAAM,EAAE,EAAE,eAAe,CAAC,CAAC;QACtD,OAAO,eAAe,CAAC;IACzB,CAAC;IAEM,qBAAqB,CAAC,OAA+B;QAC1D,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,OAAO,CAAC,+BAA+B,GAAG,IAAI,CAAC,eAAe,CAAC;SAChE;IACH,CAAC;CACF;AAxDD,4CAwDC"}

package/dist/traces/tracingState.d.ts

@@ -1,26 +1,25 @@
-/// <reference types="node" />
 import { Logger } from "../logger/types";
 import { AttributeData, PropagationInfo, PropagationInfoCarrier, TracingState as ITracingState, Verbosity } from "./types";
-import { Span, SpanContext, Exception, TimeInput, Attributes, SpanStatus } from "@opentelemetry/api";
+import { Span, SpanContext, Exception, TimeInput, Attributes, SpanStatus, SpanStatusCode } from "@opentelemetry/api";
 export declare class TracingState implements ITracingState {
     source: string;
     level: keyof typeof Verbosity;
     span: Span;
     private logger;
     private version;
-    constructor(source: string, level: keyof typeof Verbosity, span: Span, logger: Logger, version: string, spanTimeoutMs: number | undefined);
+    SpanStatusCode: typeof SpanStatusCode;
+    currentSpanStatus: SpanStatus;
+    constructor(source: string, level: keyof typeof Verbosity, span: Span, logger: Logger, version: string);
     endSpan(timedOut?: boolean): Promise<void>;
     get enabled(): boolean;
     private hasEnded;
-    private _timeoutId;
-    get timeoutId(): NodeJS.Timeout | undefined;
     private spanContextField;
     get id(): string;
-    setStatus(status: SpanStatus): Span;
-    addEvent(name: string, attributesOrStartTime?: Attributes | TimeInput, startTime?: TimeInput): Span;
+    setStatus(status: SpanStatus): this;
+    addEvent(name: string, attributesOrStartTime?: Attributes | TimeInput, startTime?: TimeInput): this;
     recordException(exception: Exception, time?: TimeInput): void;
     isRecording(): boolean;
-    updateName(name: string): Span;
+    updateName(name: string): this;
     spanContext(): SpanContext;
     addData(level: Verbosity | keyof typeof Verbosity, data: AttributeData): Promise<void>;
     getPropagationInfo(): PropagationInfo;

package/dist/traces/tracingState.js

@@ -5,59 +5,42 @@ const types_1 = require("./types");
 const api_1 = require("@opentelemetry/api");
 const utils_1 = require("./utils");
 class TracingState {
-    constructor(source, level, span, logger, version, spanTimeoutMs) {
+    constructor(source, level, span, logger, version) {
         this.source = source;
         this.level = level;
         this.span = span;
         this.logger = logger;
         this.version = version;
+        this.SpanStatusCode = api_1.SpanStatusCode;
+        this.currentSpanStatus = { code: api_1.SpanStatusCode.UNSET };
         this.hasEnded = false;
         this.spanContextField = span.spanContext();
-        if (spanTimeoutMs && spanTimeoutMs >= 0) {
-            this._timeoutId = setTimeout(() => {
-                this.endSpan(true);
-            }, spanTimeoutMs);
-        }
     }
     endSpan(timedOut) {
-        var _a, _b;
+        var _a;
         if (this.hasEnded) {
             (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(`Span ended more than once: ${this.source}`);
         }
         else {
-            try {
-                this.hasEnded = true;
-                if (timedOut) {
-                    (_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(`Span timed out and was automatically ended: ${this.source}`);
-                    this.span.setStatus({
-                        code: api_1.SpanStatusCode.ERROR,
-                        message: "Span timed out",
-                    });
-                }
-                else {
-                    clearTimeout(this.timeoutId);
-                }
-            }
-            finally {
-                this.span.end();
-            }
+            this.hasEnded = true;
+            this.span.end();
         }
         return Promise.resolve();
     }
     get enabled() {
         return true;
     }
-    get timeoutId() {
-        return this._timeoutId;
-    }
     get id() {
         return this.spanContextField.spanId;
     }
     setStatus(status) {
-        return this.span.setStatus.call(this.span, status);
+        this.currentSpanStatus = Object.assign({}, status);
+        this.span.setStatus.call(this.span, status);
+        return this;
     }
     addEvent(name, attributesOrStartTime, startTime) {
-        return this.span.addEvent.call(this.span, name, attributesOrStartTime, startTime);
+        this.span.addEvent.call(this.span, name, attributesOrStartTime, startTime);
+        return this;
     }
     recordException(exception, time) {
         this.span.recordException.call(this.span, exception, time);
@@ -66,7 +49,8 @@ class TracingState {
         return this.span.isRecording.call(this.span);
     }
     updateName(name) {
-        return this.span.updateName.call(this.span, name);
+        this.span.updateName.call(this.span, name);
+        return this;
     }
     spanContext() {
         return this.span.spanContext.call(this.span);

package/dist/traces/tracingState.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracingState.js","sourceRoot":"","sources":["../../src/traces/tracingState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tracingState.js","sourceRoot":"","sources":["../../src/traces/tracingState.ts"],"names":[],"mappings":"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"}