autotel 2.25.2 → 2.25.4

package/dist/{chunk-IKRHEUS7.js → chunk-OPTGXEVN.js}

@@ -1,9 +1,9 @@
-import { createTraceContext, getContextStorage, getActiveContextWithBaggage } from './chunk-SR35DG5A.js';
 import { setSpanName } from './chunk-B3ZHLLMP.js';
 import { validateEvent, runInOperationContext } from './chunk-WD4RP6IV.js';
-import { getOrCreateCorrelationId } from './chunk-USSL3D6L.js';
-import { getValidationConfig, isInitialized, warnIfNotInitialized, getConfig as getConfig$1, getEventsConfig, getLogger, getSdk } from './chunk-VXLEJWLY.js';
-import { AlwaysSampler } from './chunk-XND7WBVX.js';
+import { getOrCreateCorrelationId } from './chunk-S4OFEXLA.js';
+import { createTraceContext, getActiveContextWithBaggage, getContextStorage, enterOrRun } from './chunk-BBBWDIYQ.js';
+import { getValidationConfig, isInitialized, warnIfNotInitialized, getConfig as getConfig$1, getEventsConfig, getLogger, getSdk } from './chunk-MNBAXRVG.js';
+import { AlwaysSampler, AUTOTEL_SAMPLING_TAIL_KEEP, AUTOTEL_SAMPLING_TAIL_EVALUATED } from './chunk-VYA6QDNA.js';
 import { getConfig } from './chunk-J5QENANM.js';
 import { trace, SpanStatusCode, context, propagation } from '@opentelemetry/api';
 import { readFileSync } from 'fs';
@@ -1076,113 +1076,119 @@ function wrapWithTracing(fnFactory, options, variableName) {
     if (options.spanKind !== void 0) {
       spanOptions.kind = options.spanKind;
     }
-    return tracer.startActiveSpan(spanName, spanOptions, async (span2) => {
-      return runInOperationContext(spanName, async () => {
-        let shouldKeepSpan = true;
-        setSpanName(span2, spanName);
-        const initialContext = context.active();
-        const contextStorage = getContextStorage();
-        if (!contextStorage.getStore()) {
-          contextStorage.enterWith(initialContext);
-        }
-        const ctxValue = createTraceContext(span2);
-        const fn = fnFactory(ctxValue);
-        const argsAttributes = options.attributesFromArgs ? options.attributesFromArgs(args) : {};
-        const handleTailSampling = (success, duration, error) => {
-          if (needsTailSampling && "shouldKeepTrace" in sampler && typeof sampler.shouldKeepTrace === "function") {
-            shouldKeepSpan = sampler.shouldKeepTrace(samplingContext, {
-              success,
-              duration,
-              error
-            });
-            span2.setAttribute("sampling.tail.keep", shouldKeepSpan);
-            span2.setAttribute("sampling.tail.evaluated", true);
-          }
-        };
-        const onSuccess = async (result) => {
-          const duration = performance.now() - startTime;
-          callCounter?.add(1, {
-            operation: spanName,
-            status: "success"
-          });
-          durationHistogram?.record(duration, {
-            operation: spanName,
-            status: "success"
-          });
-          const resultAttributes = options.attributesFromResult ? options.attributesFromResult(result) : {};
-          span2.setStatus({ code: SpanStatusCode.OK });
-          span2.setAttributes({
-            ...argsAttributes,
-            ...resultAttributes,
-            "operation.name": spanName,
-            "code.function": spanName,
-            "operation.duration": duration,
-            "operation.success": true
-          });
-          handleTailSampling(true, duration);
-          span2.end();
-          await flushIfNeeded();
-          return result;
-        };
-        const onError = async (error) => {
-          const duration = performance.now() - startTime;
-          callCounter?.add(1, {
-            operation: spanName,
-            status: "error"
-          });
-          durationHistogram?.record(duration, {
-            operation: spanName,
-            status: "error"
-          });
-          const errorMessage = error instanceof Error ? error.message : "Unknown error";
-          const truncatedMessage = truncateErrorMessage(errorMessage);
-          span2.setStatus({
-            code: SpanStatusCode.ERROR,
-            message: truncatedMessage
-          });
-          span2.setAttributes({
-            ...argsAttributes,
-            "operation.name": spanName,
-            "code.function": spanName,
-            "operation.duration": duration,
-            "operation.success": false,
-            error: true,
-            "exception.type": error instanceof Error ? error.constructor.name : "Error",
-            "exception.message": truncatedMessage
-          });
-          if (error instanceof Error && error.stack) {
-            span2.setAttribute(
-              "exception.stack",
-              error.stack.slice(0, MAX_ERROR_MESSAGE_LENGTH)
-            );
+    const parentContext = getActiveContextWithBaggage();
+    return tracer.startActiveSpan(
+      spanName,
+      spanOptions,
+      parentContext,
+      async (span2) => {
+        return runInOperationContext(spanName, async () => {
+          let shouldKeepSpan = true;
+          setSpanName(span2, spanName);
+          const initialContext = context.active();
+          const contextStorage = getContextStorage();
+          if (!contextStorage.getStore()) {
+            enterOrRun(contextStorage, initialContext);
           }
-          span2.recordException(
-            error instanceof Error ? error : new Error(String(error))
-          );
-          handleTailSampling(false, duration, error);
-          span2.end();
-          await flushIfNeeded();
-          throw error;
-        };
-        try {
-          callCounter?.add(1, {
-            operation: spanName,
-            status: "started"
-          });
-          const executeWithContext = async () => {
-            const currentContext = getActiveContextWithBaggage();
-            return context.with(currentContext, async () => {
-              return fn.call(this, ...args);
+          const ctxValue = createTraceContext(span2);
+          const fn = fnFactory(ctxValue);
+          const argsAttributes = options.attributesFromArgs ? options.attributesFromArgs(args) : {};
+          const handleTailSampling = (success, duration, error) => {
+            if (needsTailSampling && "shouldKeepTrace" in sampler && typeof sampler.shouldKeepTrace === "function") {
+              shouldKeepSpan = sampler.shouldKeepTrace(samplingContext, {
+                success,
+                duration,
+                error
+              });
+              span2.setAttribute(AUTOTEL_SAMPLING_TAIL_KEEP, shouldKeepSpan);
+              span2.setAttribute(AUTOTEL_SAMPLING_TAIL_EVALUATED, true);
+            }
+          };
+          const onSuccess = async (result) => {
+            const duration = performance.now() - startTime;
+            callCounter?.add(1, {
+              operation: spanName,
+              status: "success"
+            });
+            durationHistogram?.record(duration, {
+              operation: spanName,
+              status: "success"
+            });
+            const resultAttributes = options.attributesFromResult ? options.attributesFromResult(result) : {};
+            span2.setStatus({ code: SpanStatusCode.OK });
+            span2.setAttributes({
+              ...argsAttributes,
+              ...resultAttributes,
+              "operation.name": spanName,
+              "code.function": spanName,
+              "operation.duration": duration,
+              "operation.success": true
             });
+            handleTailSampling(true, duration);
+            span2.end();
+            await flushIfNeeded();
+            return result;
           };
-          const result = await executeWithContext();
-          return await onSuccess(result);
-        } catch (error) {
-          await onError(error);
-          throw error;
-        }
-      });
-    });
+          const onError = async (error) => {
+            const duration = performance.now() - startTime;
+            callCounter?.add(1, {
+              operation: spanName,
+              status: "error"
+            });
+            durationHistogram?.record(duration, {
+              operation: spanName,
+              status: "error"
+            });
+            const errorMessage = error instanceof Error ? error.message : "Unknown error";
+            const truncatedMessage = truncateErrorMessage(errorMessage);
+            span2.setStatus({
+              code: SpanStatusCode.ERROR,
+              message: truncatedMessage
+            });
+            span2.setAttributes({
+              ...argsAttributes,
+              "operation.name": spanName,
+              "code.function": spanName,
+              "operation.duration": duration,
+              "operation.success": false,
+              error: true,
+              "exception.type": error instanceof Error ? error.constructor.name : "Error",
+              "exception.message": truncatedMessage
+            });
+            if (error instanceof Error && error.stack) {
+              span2.setAttribute(
+                "exception.stack",
+                error.stack.slice(0, MAX_ERROR_MESSAGE_LENGTH)
+              );
+            }
+            span2.recordException(
+              error instanceof Error ? error : new Error(String(error))
+            );
+            handleTailSampling(false, duration, error);
+            span2.end();
+            await flushIfNeeded();
+            throw error;
+          };
+          try {
+            callCounter?.add(1, {
+              operation: spanName,
+              status: "started"
+            });
+            const executeWithContext = async () => {
+              const currentContext = getActiveContextWithBaggage();
+              return context.with(currentContext, async () => {
+                return fn.call(this, ...args);
+              });
+            };
+            const result = await executeWithContext();
+            return await onSuccess(result);
+          } catch (error) {
+            await onError(error);
+            throw error;
+          }
+        });
+      }
+    );
   };
   wrappedFunction[INSTRUMENTED_SYMBOL] = true;
   Object.defineProperty(wrappedFunction, "name", {
@@ -1274,98 +1280,104 @@ function wrapWithTracingSync(fnFactory, options, variableName) {
     if (options.spanKind !== void 0) {
       spanOptions.kind = options.spanKind;
     }
-    return tracer.startActiveSpan(spanName, spanOptions, (span2) => {
-      return runInOperationContext(spanName, () => {
-        let shouldKeepSpan = true;
-        setSpanName(span2, spanName);
-        const ctxValue = createTraceContext(span2);
-        const fn = fnFactory(ctxValue);
-        const argsAttributes = options.attributesFromArgs ? options.attributesFromArgs(args) : {};
-        const handleTailSampling = (success, duration, error) => {
-          if (needsTailSampling && "shouldKeepTrace" in sampler && typeof sampler.shouldKeepTrace === "function") {
-            shouldKeepSpan = sampler.shouldKeepTrace(samplingContext, {
-              success,
-              duration,
-              error
+    const parentContext = getActiveContextWithBaggage();
+    return tracer.startActiveSpan(
+      spanName,
+      spanOptions,
+      parentContext,
+      (span2) => {
+        return runInOperationContext(spanName, () => {
+          let shouldKeepSpan = true;
+          setSpanName(span2, spanName);
+          const ctxValue = createTraceContext(span2);
+          const fn = fnFactory(ctxValue);
+          const argsAttributes = options.attributesFromArgs ? options.attributesFromArgs(args) : {};
+          const handleTailSampling = (success, duration, error) => {
+            if (needsTailSampling && "shouldKeepTrace" in sampler && typeof sampler.shouldKeepTrace === "function") {
+              shouldKeepSpan = sampler.shouldKeepTrace(samplingContext, {
+                success,
+                duration,
+                error
+              });
+              span2.setAttribute(AUTOTEL_SAMPLING_TAIL_KEEP, shouldKeepSpan);
+              span2.setAttribute(AUTOTEL_SAMPLING_TAIL_EVALUATED, true);
+            }
+          };
+          const onSuccess = (result) => {
+            const duration = performance.now() - startTime;
+            callCounter?.add(1, {
+              operation: spanName,
+              status: "success"
             });
-            span2.setAttribute("sampling.tail.keep", shouldKeepSpan);
-            span2.setAttribute("sampling.tail.evaluated", true);
-          }
-        };
-        const onSuccess = (result) => {
-          const duration = performance.now() - startTime;
-          callCounter?.add(1, {
-            operation: spanName,
-            status: "success"
-          });
-          durationHistogram?.record(duration, {
-            operation: spanName,
-            status: "success"
-          });
-          const resultAttributes = options.attributesFromResult ? options.attributesFromResult(result) : {};
-          span2.setStatus({ code: SpanStatusCode.OK });
-          span2.setAttributes({
-            ...argsAttributes,
-            ...resultAttributes,
-            "operation.name": spanName,
-            "code.function": spanName,
-            "operation.duration": duration,
-            "operation.success": true
-          });
-          handleTailSampling(true, duration);
-          span2.end();
-          void flushIfNeeded();
-          return result;
-        };
-        const onError = (error) => {
-          const duration = performance.now() - startTime;
-          callCounter?.add(1, {
-            operation: spanName,
-            status: "error"
-          });
-          durationHistogram?.record(duration, {
-            operation: spanName,
-            status: "error"
-          });
-          const errorMessage = error instanceof Error ? error.message : "Unknown error";
-          const truncatedMessage = truncateErrorMessage(errorMessage);
-          span2.setStatus({
-            code: SpanStatusCode.ERROR,
-            message: truncatedMessage
-          });
-          span2.setAttributes({
-            ...argsAttributes,
-            "operation.name": spanName,
-            "code.function": spanName,
-            "operation.duration": duration,
-            "operation.success": false,
-            error: true,
-            "exception.type": error instanceof Error ? error.constructor.name : "Error",
-            "exception.message": truncatedMessage
-          });
-          span2.recordException(
-            error instanceof Error ? error : new Error(String(error))
-          );
-          handleTailSampling(false, duration, error);
-          span2.end();
-          void flushIfNeeded();
-          throw error;
-        };
-        try {
-          callCounter?.add(1, {
-            operation: spanName,
-            status: "started"
-          });
-          const result = fn.call(this, ...args);
-          if (result instanceof Promise) {
-            return result.then(onSuccess, onError);
+            durationHistogram?.record(duration, {
+              operation: spanName,
+              status: "success"
+            });
+            const resultAttributes = options.attributesFromResult ? options.attributesFromResult(result) : {};
+            span2.setStatus({ code: SpanStatusCode.OK });
+            span2.setAttributes({
+              ...argsAttributes,
+              ...resultAttributes,
+              "operation.name": spanName,
+              "code.function": spanName,
+              "operation.duration": duration,
+              "operation.success": true
+            });
+            handleTailSampling(true, duration);
+            span2.end();
+            void flushIfNeeded();
+            return result;
+          };
+          const onError = (error) => {
+            const duration = performance.now() - startTime;
+            callCounter?.add(1, {
+              operation: spanName,
+              status: "error"
+            });
+            durationHistogram?.record(duration, {
+              operation: spanName,
+              status: "error"
+            });
+            const errorMessage = error instanceof Error ? error.message : "Unknown error";
+            const truncatedMessage = truncateErrorMessage(errorMessage);
+            span2.setStatus({
+              code: SpanStatusCode.ERROR,
+              message: truncatedMessage
+            });
+            span2.setAttributes({
+              ...argsAttributes,
+              "operation.name": spanName,
+              "code.function": spanName,
+              "operation.duration": duration,
+              "operation.success": false,
+              error: true,
+              "exception.type": error instanceof Error ? error.constructor.name : "Error",
+              "exception.message": truncatedMessage
+            });
+            span2.recordException(
+              error instanceof Error ? error : new Error(String(error))
+            );
+            handleTailSampling(false, duration, error);
+            span2.end();
+            void flushIfNeeded();
+            throw error;
+          };
+          try {
+            callCounter?.add(1, {
+              operation: spanName,
+              status: "started"
+            });
+            const result = fn.call(this, ...args);
+            if (result instanceof Promise) {
+              return result.then(onSuccess, onError);
+            }
+            return onSuccess(result);
+          } catch (error) {
+            return onError(error);
           }
-          return onSuccess(result);
-        } catch (error) {
-          return onError(error);
-        }
-      });
-    });
+        });
+      }
+    );
   }
   wrappedFunction[INSTRUMENTED_SYMBOL] = true;
   Object.defineProperty(wrappedFunction, "name", {
@@ -1444,159 +1456,165 @@ function executeImmediately(fn, options) {
   if (options.spanKind !== void 0) {
     spanOptions.kind = options.spanKind;
   }
-  return tracer.startActiveSpan(spanName, spanOptions, (span2) => {
-    return runInOperationContext(spanName, () => {
-      let shouldKeepSpan = true;
-      setSpanName(span2, spanName);
-      const ctxValue = createTraceContext(span2);
-      const handleTailSampling = (success, duration, error) => {
-        if (needsTailSampling && "shouldKeepTrace" in sampler && typeof sampler.shouldKeepTrace === "function") {
-          shouldKeepSpan = sampler.shouldKeepTrace(samplingContext, {
-            success,
-            duration,
-            error
+  const parentContext = getActiveContextWithBaggage();
+  return tracer.startActiveSpan(
+    spanName,
+    spanOptions,
+    parentContext,
+    (span2) => {
+      return runInOperationContext(spanName, () => {
+        let shouldKeepSpan = true;
+        setSpanName(span2, spanName);
+        const ctxValue = createTraceContext(span2);
+        const handleTailSampling = (success, duration, error) => {
+          if (needsTailSampling && "shouldKeepTrace" in sampler && typeof sampler.shouldKeepTrace === "function") {
+            shouldKeepSpan = sampler.shouldKeepTrace(samplingContext, {
+              success,
+              duration,
+              error
+            });
+            span2.setAttribute(AUTOTEL_SAMPLING_TAIL_KEEP, shouldKeepSpan);
+            span2.setAttribute(AUTOTEL_SAMPLING_TAIL_EVALUATED, true);
+          }
+        };
+        const onSuccessSync = (result) => {
+          const duration = performance.now() - startTime;
+          callCounter?.add(1, {
+            operation: spanName,
+            status: "success"
           });
-          span2.setAttribute("sampling.tail.keep", shouldKeepSpan);
-          span2.setAttribute("sampling.tail.evaluated", true);
-        }
-      };
-      const onSuccessSync = (result) => {
-        const duration = performance.now() - startTime;
-        callCounter?.add(1, {
-          operation: spanName,
-          status: "success"
-        });
-        durationHistogram?.record(duration, {
-          operation: spanName,
-          status: "success"
-        });
-        span2.setStatus({ code: SpanStatusCode.OK });
-        span2.setAttributes({
-          "operation.name": spanName,
-          "code.function": spanName,
-          "operation.duration": duration,
-          "operation.success": true
-        });
-        handleTailSampling(true, duration);
-        span2.end();
-        void flushIfNeeded();
-        return result;
-      };
-      const onErrorSync = (error) => {
-        const duration = performance.now() - startTime;
-        callCounter?.add(1, {
-          operation: spanName,
-          status: "error"
-        });
-        durationHistogram?.record(duration, {
-          operation: spanName,
-          status: "error"
-        });
-        const errorMessage = error instanceof Error ? error.message : "Unknown error";
-        const truncatedMessage = truncateErrorMessage(errorMessage);
-        span2.setStatus({
-          code: SpanStatusCode.ERROR,
-          message: truncatedMessage
-        });
-        span2.setAttributes({
-          "operation.name": spanName,
-          "code.function": spanName,
-          "operation.duration": duration,
-          "operation.success": false,
-          error: true,
-          "exception.type": error instanceof Error ? error.constructor.name : "Error",
-          "exception.message": truncatedMessage
-        });
-        if (error instanceof Error && error.stack) {
-          span2.setAttribute(
-            "exception.stack",
-            error.stack.slice(0, MAX_ERROR_MESSAGE_LENGTH)
+          durationHistogram?.record(duration, {
+            operation: spanName,
+            status: "success"
+          });
+          span2.setStatus({ code: SpanStatusCode.OK });
+          span2.setAttributes({
+            "operation.name": spanName,
+            "code.function": spanName,
+            "operation.duration": duration,
+            "operation.success": true
+          });
+          handleTailSampling(true, duration);
+          span2.end();
+          void flushIfNeeded();
+          return result;
+        };
+        const onErrorSync = (error) => {
+          const duration = performance.now() - startTime;
+          callCounter?.add(1, {
+            operation: spanName,
+            status: "error"
+          });
+          durationHistogram?.record(duration, {
+            operation: spanName,
+            status: "error"
+          });
+          const errorMessage = error instanceof Error ? error.message : "Unknown error";
+          const truncatedMessage = truncateErrorMessage(errorMessage);
+          span2.setStatus({
+            code: SpanStatusCode.ERROR,
+            message: truncatedMessage
+          });
+          span2.setAttributes({
+            "operation.name": spanName,
+            "code.function": spanName,
+            "operation.duration": duration,
+            "operation.success": false,
+            error: true,
+            "exception.type": error instanceof Error ? error.constructor.name : "Error",
+            "exception.message": truncatedMessage
+          });
+          if (error instanceof Error && error.stack) {
+            span2.setAttribute(
+              "exception.stack",
+              error.stack.slice(0, MAX_ERROR_MESSAGE_LENGTH)
+            );
+          }
+          span2.recordException(
+            error instanceof Error ? error : new Error(String(error))
           );
-        }
-        span2.recordException(
-          error instanceof Error ? error : new Error(String(error))
-        );
-        handleTailSampling(false, duration, error);
-        span2.end();
-        void flushIfNeeded();
-        throw error;
-      };
-      const onSuccessAsync = async (result) => {
-        const duration = performance.now() - startTime;
-        callCounter?.add(1, {
-          operation: spanName,
-          status: "success"
-        });
-        durationHistogram?.record(duration, {
-          operation: spanName,
-          status: "success"
-        });
-        span2.setStatus({ code: SpanStatusCode.OK });
-        span2.setAttributes({
-          "operation.name": spanName,
-          "code.function": spanName,
-          "operation.duration": duration,
-          "operation.success": true
-        });
-        handleTailSampling(true, duration);
-        span2.end();
-        await flushIfNeeded();
-        return result;
-      };
-      const onErrorAsync = async (error) => {
-        const duration = performance.now() - startTime;
-        callCounter?.add(1, {
-          operation: spanName,
-          status: "error"
-        });
-        durationHistogram?.record(duration, {
-          operation: spanName,
-          status: "error"
-        });
-        const errorMessage = error instanceof Error ? error.message : "Unknown error";
-        const truncatedMessage = truncateErrorMessage(errorMessage);
-        span2.setStatus({
-          code: SpanStatusCode.ERROR,
-          message: truncatedMessage
-        });
-        span2.setAttributes({
-          "operation.name": spanName,
-          "code.function": spanName,
-          "operation.duration": duration,
-          "operation.success": false,
-          error: true,
-          "exception.type": error instanceof Error ? error.constructor.name : "Error",
-          "exception.message": truncatedMessage
-        });
-        if (error instanceof Error && error.stack) {
-          span2.setAttribute(
-            "exception.stack",
-            error.stack.slice(0, MAX_ERROR_MESSAGE_LENGTH)
+          handleTailSampling(false, duration, error);
+          span2.end();
+          void flushIfNeeded();
+          throw error;
+        };
+        const onSuccessAsync = async (result) => {
+          const duration = performance.now() - startTime;
+          callCounter?.add(1, {
+            operation: spanName,
+            status: "success"
+          });
+          durationHistogram?.record(duration, {
+            operation: spanName,
+            status: "success"
+          });
+          span2.setStatus({ code: SpanStatusCode.OK });
+          span2.setAttributes({
+            "operation.name": spanName,
+            "code.function": spanName,
+            "operation.duration": duration,
+            "operation.success": true
+          });
+          handleTailSampling(true, duration);
+          span2.end();
+          await flushIfNeeded();
+          return result;
+        };
+        const onErrorAsync = async (error) => {
+          const duration = performance.now() - startTime;
+          callCounter?.add(1, {
+            operation: spanName,
+            status: "error"
+          });
+          durationHistogram?.record(duration, {
+            operation: spanName,
+            status: "error"
+          });
+          const errorMessage = error instanceof Error ? error.message : "Unknown error";
+          const truncatedMessage = truncateErrorMessage(errorMessage);
+          span2.setStatus({
+            code: SpanStatusCode.ERROR,
+            message: truncatedMessage
+          });
+          span2.setAttributes({
+            "operation.name": spanName,
+            "code.function": spanName,
+            "operation.duration": duration,
+            "operation.success": false,
+            error: true,
+            "exception.type": error instanceof Error ? error.constructor.name : "Error",
+            "exception.message": truncatedMessage
+          });
+          if (error instanceof Error && error.stack) {
+            span2.setAttribute(
+              "exception.stack",
+              error.stack.slice(0, MAX_ERROR_MESSAGE_LENGTH)
+            );
+          }
+          span2.recordException(
+            error instanceof Error ? error : new Error(String(error))
           );
+          handleTailSampling(false, duration, error);
+          span2.end();
+          await flushIfNeeded();
+          throw error;
+        };
+        try {
+          callCounter?.add(1, {
+            operation: spanName,
+            status: "started"
+          });
+          const result = fn(ctxValue);
+          if (result instanceof Promise) {
+            return result.then(onSuccessAsync, onErrorAsync);
+          }
+          return onSuccessSync(result);
+        } catch (error) {
+          return onErrorSync(error);
         }
-        span2.recordException(
-          error instanceof Error ? error : new Error(String(error))
-        );
-        handleTailSampling(false, duration, error);
-        span2.end();
-        await flushIfNeeded();
-        throw error;
-      };
-      try {
-        callCounter?.add(1, {
-          operation: spanName,
-          status: "started"
-        });
-        const result = fn(ctxValue);
-        if (result instanceof Promise) {
-          return result.then(onSuccessAsync, onErrorAsync);
-        }
-        return onSuccessSync(result);
-      } catch (error) {
-        return onErrorSync(error);
-      }
-    });
-  });
+      });
+    }
+  );
 }
 function trace2(fnOrNameOrOptions, maybeFn) {
   if (typeof fnOrNameOrOptions === "function") {
@@ -1728,7 +1746,8 @@ function span(options, fn) {
       }
     });
   };
-  const result = tracer.startActiveSpan(name, executeSpan);
+  const parentContext = getActiveContextWithBaggage();
+  const result = tracer.startActiveSpan(name, {}, parentContext, executeSpan);
   if (result instanceof Promise) {
     return result;
   }
@@ -1764,7 +1783,7 @@ function withBaggage(options) {
   const newContext = propagation.setBaggage(currentContext, updatedBaggage);
   const ctxStorage = getContextStorage();
   const previousStored = ctxStorage.getStore();
-  const baggageEnrichedStored = previousStored ? propagation.setBaggage(previousStored, updatedBaggage) : newContext;
+  const baggageEnrichedStored = previousStored ? { value: propagation.setBaggage(previousStored.value, updatedBaggage) } : { value: newContext };
   const result = previousStored ? ctxStorage.run(baggageEnrichedStored, () => context.with(newContext, fn)) : context.with(newContext, fn);
   if (result instanceof Promise) {
     return result.then(
@@ -1788,5 +1807,5 @@ function withBaggage(options) {
 }
 
 export { ctx, getEventQueue, instrument, resetEventQueue, span, trace2 as trace, track, withBaggage, withNewContext, withTracing };
-//# sourceMappingURL=chunk-IKRHEUS7.js.map
-//# sourceMappingURL=chunk-IKRHEUS7.js.map
+//# sourceMappingURL=chunk-OPTGXEVN.js.map
+//# sourceMappingURL=chunk-OPTGXEVN.js.map