effect 2.0.0-next.49 → 2.0.0-next.50

package/dist/{tMap-811797bf.cjs.prod.js → tMap-a2cfde88.cjs.prod.js}

@@ -5,10 +5,10 @@ var Equal_dist_effectEqual = require('../Equal/dist/effect-Equal.cjs.prod.js');
 var Function_dist_effectFunction = require('../Function/dist/effect-Function.cjs.prod.js');
 var Hash_dist_effectHash = require('../Hash/dist/effect-Hash.cjs.prod.js');
 var HashMap_dist_effectHashMap = require('../HashMap/dist/effect-HashMap.cjs.prod.js');
-var core = require('./core-8072a539.cjs.prod.js');
-var stm = require('./stm-f792171c.cjs.prod.js');
-var tArray = require('./tArray-7f227674.cjs.prod.js');
-var tRef = require('./tRef-2892ee02.cjs.prod.js');
+var core = require('./core-d3f4e713.cjs.prod.js');
+var stm = require('./stm-6ad7b384.cjs.prod.js');
+var tArray = require('./tArray-5e42c290.cjs.prod.js');
+var tRef = require('./tRef-42a212cb.cjs.prod.js');
 var Option_dist_effectOption = require('../Option/dist/effect-Option.cjs.prod.js');
 var ReadonlyArray_dist_effectReadonlyArray = require('../ReadonlyArray/dist/effect-ReadonlyArray.cjs.prod.js');
 var STM_dist_effectSTM = require('../STM/dist/effect-STM.cjs.prod.js');

package/dist/{tMap-b9665a82.cjs.dev.js → tMap-f0df0ea0.cjs.dev.js}

@@ -5,10 +5,10 @@ var Equal_dist_effectEqual = require('../Equal/dist/effect-Equal.cjs.dev.js');
 var Function_dist_effectFunction = require('../Function/dist/effect-Function.cjs.dev.js');
 var Hash_dist_effectHash = require('../Hash/dist/effect-Hash.cjs.dev.js');
 var HashMap_dist_effectHashMap = require('../HashMap/dist/effect-HashMap.cjs.dev.js');
-var core = require('./core-e6f9fdbe.cjs.dev.js');
-var stm = require('./stm-4bf1a928.cjs.dev.js');
-var tArray = require('./tArray-996f4aba.cjs.dev.js');
-var tRef = require('./tRef-44d17d07.cjs.dev.js');
+var core = require('./core-dd1edd7a.cjs.dev.js');
+var stm = require('./stm-b080be31.cjs.dev.js');
+var tArray = require('./tArray-7d470ed7.cjs.dev.js');
+var tRef = require('./tRef-2e495254.cjs.dev.js');
 var Option_dist_effectOption = require('../Option/dist/effect-Option.cjs.dev.js');
 var ReadonlyArray_dist_effectReadonlyArray = require('../ReadonlyArray/dist/effect-ReadonlyArray.cjs.dev.js');
 var STM_dist_effectSTM = require('../STM/dist/effect-STM.cjs.dev.js');

package/dist/{tQueue-0c15312e.cjs.dev.js → tQueue-085f70b5.cjs.dev.js}

@@ -2,9 +2,9 @@
 
 var Chunk_dist_effectChunk = require('../Chunk/dist/effect-Chunk.cjs.dev.js');
 var Function_dist_effectFunction = require('../Function/dist/effect-Function.cjs.dev.js');
-var core = require('./core-e6f9fdbe.cjs.dev.js');
-var stm = require('./stm-4bf1a928.cjs.dev.js');
-var tRef = require('./tRef-44d17d07.cjs.dev.js');
+var core = require('./core-dd1edd7a.cjs.dev.js');
+var stm = require('./stm-b080be31.cjs.dev.js');
+var tRef = require('./tRef-2e495254.cjs.dev.js');
 var Option_dist_effectOption = require('../Option/dist/effect-Option.cjs.dev.js');
 var ReadonlyArray_dist_effectReadonlyArray = require('../ReadonlyArray/dist/effect-ReadonlyArray.cjs.dev.js');
 var STM_dist_effectSTM = require('../STM/dist/effect-STM.cjs.dev.js');

package/dist/{tQueue-8a6a0244.cjs.prod.js → tQueue-b80e940e.cjs.prod.js}

@@ -2,9 +2,9 @@
 
 var Chunk_dist_effectChunk = require('../Chunk/dist/effect-Chunk.cjs.prod.js');
 var Function_dist_effectFunction = require('../Function/dist/effect-Function.cjs.prod.js');
-var core = require('./core-8072a539.cjs.prod.js');
-var stm = require('./stm-f792171c.cjs.prod.js');
-var tRef = require('./tRef-2892ee02.cjs.prod.js');
+var core = require('./core-d3f4e713.cjs.prod.js');
+var stm = require('./stm-6ad7b384.cjs.prod.js');
+var tRef = require('./tRef-42a212cb.cjs.prod.js');
 var Option_dist_effectOption = require('../Option/dist/effect-Option.cjs.prod.js');
 var ReadonlyArray_dist_effectReadonlyArray = require('../ReadonlyArray/dist/effect-ReadonlyArray.cjs.prod.js');
 var STM_dist_effectSTM = require('../STM/dist/effect-STM.cjs.prod.js');

package/dist/{tRef-44d17d07.cjs.dev.js → tRef-2e495254.cjs.dev.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var Function_dist_effectFunction = require('../Function/dist/effect-Function.cjs.dev.js');
-var core = require('./core-e6f9fdbe.cjs.dev.js');
+var core = require('./core-dd1edd7a.cjs.dev.js');
 var Option_dist_effectOption = require('../Option/dist/effect-Option.cjs.dev.js');
 
 /** @internal */

package/dist/{tRef-2892ee02.cjs.prod.js → tRef-42a212cb.cjs.prod.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var Function_dist_effectFunction = require('../Function/dist/effect-Function.cjs.prod.js');
-var core = require('./core-8072a539.cjs.prod.js');
+var core = require('./core-d3f4e713.cjs.prod.js');
 var Option_dist_effectOption = require('../Option/dist/effect-Option.cjs.prod.js');
 
 /** @internal */

package/internal/cache.esm.js

@@ -10,7 +10,7 @@ import { size, get, has, set, remove, empty } from '../MutableHashMap/dist/effec
 import { offer, poll, EmptyMutableQueue, unbounded } from '../MutableQueue/dist/effect-MutableQueue.esm.js';
 import { compareAndSet, set as set$1, make as make$1 } from '../MutableRef/dist/effect-MutableRef.esm.js';
 import { match, none, isSome, some, getOrUndefined } from '../Option/dist/effect-Option.esm.js';
-import { map, context, fiberId, sync, suspend, succeed, flatMap, asUnit, onInterrupt, zipRight, exit, provideContext } from './core.esm.js';
+import { map, sync, suspend, succeed, flatMap, asUnit, onInterrupt, zipRight, exit, provideContext, context, fiberId } from './core.esm.js';
 import { clockWith, when } from './core-effect.esm.js';
 import { struct } from './Data.esm.js';
 import { none as none$1 } from './fiberId.esm.js';

package/internal/channel.esm.js

@@ -2,7 +2,7 @@ import { failureOrCause, map as map$2, die, isDieType, isInterrupted } from '../
 import { empty, isEmpty, unsafeFromArray, fromIterable, unsafeGet as unsafeGet$1 } from '../Chunk/dist/effect-Chunk.esm.js';
 import { add, merge as merge$1, make as make$4, unsafeGet } from '../Context/dist/effect-Context.esm.js';
 import { await as _await, make as make$1, succeed as succeed$2, failCause as failCause$2, isDone } from '../Deferred/dist/effect-Deferred.esm.js';
-import { unit, flatMap as flatMap$1, uninterruptible, tap, context as context$1, map as map$1, suspend as suspend$1, matchCause, flatten as flatten$1, gen, acquireRelease, makeSemaphore, matchCauseEffect, failCause as failCause$1, zipRight as zipRight$1, interruptible, asUnit as asUnit$1, succeed as succeed$1, uninterruptibleMask, exit, raceFirst, tapErrorCause, intoDeferred, forkScoped, forever, raceWith, as as as$1, race, scoped as scoped$1, when, repeatWhile, zip as zip$1, zipWith, forkDaemon, never as never$1, sync as sync$1, setSpan, repeatUntil, catchAllCause as catchAllCause$1 } from '../Effect/dist/effect-Effect.esm.js';
+import { unit, flatMap as flatMap$1, uninterruptible, tap, context as context$1, map as map$1, suspend as suspend$1, matchCause, flatten as flatten$1, gen, acquireRelease, makeSemaphore, matchCauseEffect, failCause as failCause$1, zipRight as zipRight$1, interruptible, asUnit as asUnit$1, succeed as succeed$1, uninterruptibleMask, exit, raceFirst, tapErrorCause, intoDeferred, forkScoped, forever, raceWith, as as as$1, race, scoped as scoped$1, when, repeatWhile, zip as zip$1, zipWith, forkDaemon, never as never$1, sync as sync$1, makeSpanScoped, repeatUntil, catchAllCause as catchAllCause$1 } from '../Effect/dist/effect-Effect.esm.js';
 import { match, left, right } from '../Either/dist/effect-Either.esm.js';
 import { equals } from '../Equal/dist/effect-Equal.esm.js';
 import { match as match$2, failCause as failCause$3, succeed as succeed$3, zip as zip$2 } from '../Exit/dist/effect-Exit.esm.js';
@@ -23,6 +23,7 @@ import { flatMap, fromEffect, ensuringWith, suspend, catchAllCause, failCause, c
 import { OP_DONE as OP_DONE$1 } from './opCodes/channelMergeDecision.esm.js';
 import { OP_RIGHT_DONE, OP_LEFT_DONE, OP_BOTH_RUNNING } from './opCodes/channelMergeState.esm.js';
 import { OP_READ, OP_FROM_EFFECT, OP_EMIT, OP_DONE } from './opCodes/channelState.esm.js';
+import { spanTag } from './tracer.esm.js';
 
 /** @internal */
 const acquireUseRelease = (acquire, use, release) => flatMap(fromEffect(make(() => unit)), ref => pipe(fromEffect(uninterruptible(tap(acquire, a => set(ref, exit => release(a, exit))))), flatMap(use), ensuringWith(exit => flatMap$1(get(ref), f => f(exit)))));
@@ -600,7 +601,7 @@ const unwrapScoped = self => concatAllWith(scoped(self), (d, _) => d, (d, _) =>
 const updateService = /*#__PURE__*/dual(3, (self, tag, f) => mapInputContext(self, context => merge$1(context, make$4(tag, f(unsafeGet(context, tag))))));
 
 /** @internal */
-const withSpan = /*#__PURE__*/dual(3, (self, name, options) => unwrapScoped(as$1(setSpan(name, options), self)));
+const withSpan = /*#__PURE__*/dual(3, (self, name, options) => unwrapScoped(flatMap$1(context$1(), context => map$1(makeSpanScoped(name, options), span => provideContext(self, add(context, spanTag, span))))));
 
 /** @internal */
 const writeAll = (...outs) => writeChunk(fromIterable(outs));

package/internal/core-effect.esm.js

@@ -1,6 +1,6 @@
 import { append, toReadonlyArray, fromIterable as fromIterable$2, isNonEmpty, headNonEmpty, tailNonEmpty } from '../Chunk/dist/effect-Chunk.esm.js';
 import { clockWith as clockWith$1, sleep as sleep$1, currentTimeMillis, currentTimeNanos } from '../Clock/dist/effect-Clock.esm.js';
-import { add, unsafeGet, empty as empty$1 } from '../Context/dist/effect-Context.esm.js';
+import { add, unsafeGet, getOption, empty as empty$1 } from '../Context/dist/effect-Context.esm.js';
 import { nanos } from '../Duration/dist/effect-Duration.esm.js';
 import { right, left } from '../Either/dist/effect-Either.esm.js';
 import { none as none$1 } from '../FiberId/dist/effect-FiberId.esm.js';
@@ -9,13 +9,14 @@ import { dual, identity, constVoid, constTrue, constFalse, pipe } from '../Funct
 import { set, forEach } from '../HashMap/dist/effect-HashMap.esm.js';
 import { fromIterable as fromIterable$1, union, size } from '../HashSet/dist/effect-HashSet.esm.js';
 import { fail, find, isDieType, empty, failures, failureOrCause, keepDefects, flatten, NoSuchElementException, isNoSuchElementException, interruptors, IllegalArgumentException, isCause } from './cause.esm.js';
-import { fiberRefLocallyWith, currentLogAnnotations, isEffect, map, mapError, asyncEither, unit, sync, makeEffectError, catchAll, fail as fail$1, catchAllCause, unified, failCause, matchCauseEffect, succeed, catchIf, matchCause, zipRight, withFiberRuntime, flatMap, suspend, context, orElse, yieldNow, dieSync, dieMessage, failSync, flip, matchEffect, currentLogSpan, fiberRefGet, failCauseSync, intoDeferred, deferredAwait, as, zip, updateRuntimeFlags, deferredMake, asUnit, whenEffect, async, contextWithEffect, provideContext, currentMetricLabels, mapInputContext, currentTracerSpanAnnotations, currentTracerSpan, currentTracerSpanLinks, acquireUseRelease, currentInterruptedCause, interrupt, runtimeFlags, fiberRefGetWith, currentTracerTimingEnabled, exitSucceed, exitDie } from './core.esm.js';
+import { fiberRefLocallyWith, currentLogAnnotations, isEffect, map, mapError, asyncEither, unit, sync, makeEffectError, catchAll, fail as fail$1, catchAllCause, unified, failCause, matchCauseEffect, succeed, catchIf, matchCause, zipRight, withFiberRuntime, flatMap, suspend, context, orElse, yieldNow, dieSync, dieMessage, failSync, flip, matchEffect, currentLogSpan, fiberRefGet, failCauseSync, intoDeferred, deferredAwait, as, zip, updateRuntimeFlags, deferredMake, asUnit, whenEffect, async, contextWithEffect, provideContext, currentMetricLabels, mapInputContext, currentTracerSpanAnnotations, currentTracerSpanLinks, acquireUseRelease, currentInterruptedCause, interrupt, runtimeFlags, fiberRefGetWith, currentTracerTimingEnabled, exitSucceed, exitDie } from './core.esm.js';
 import { randomWith } from './defaultServices.esm.js';
 import { diff, patch } from './fiberRefs/patch.esm.js';
 import { make as make$2 } from './metric/label.esm.js';
 import { diff as diff$1 } from './runtimeFlags.esm.js';
 import { SingleShotGen } from './singleShotGen.esm.js';
-import { prepend, head as head$1, findFirst as findFirst$1, empty as empty$2 } from '../List/dist/effect-List.esm.js';
+import { spanTag } from './tracer.esm.js';
+import { prepend, empty as empty$2 } from '../List/dist/effect-List.esm.js';
 import { Trace, Debug, Info, Warning, Error, Fatal } from '../LogLevel/dist/effect-LogLevel.esm.js';
 import { make } from '../LogSpan/dist/effect-LogSpan.esm.js';
 import { some, none as none$2, match as match$1, fromNullable as fromNullable$1 } from '../Option/dist/effect-Option.esm.js';
@@ -530,7 +531,7 @@ const promise = evaluate => evaluate.length >= 1 ? async((resolve, signal) => {
 });
 
 /* @internal */
-const provideService = /*#__PURE__*/dual(3, (self, tag, service) => provideServiceEffect(self, tag, succeed(service)));
+const provideService = /*#__PURE__*/dual(3, (self, tag, service) => contextWithEffect(env => provideContext(self, add(env, tag, service))));
 
 /* @internal */
 const provideServiceEffect = /*#__PURE__*/dual(3, (self, tag, effect) => contextWithEffect(env => flatMap(effect, service => provideContext(self, pipe(env, add(tag, service))))));
@@ -796,6 +797,9 @@ const serviceMembers = tag => ({
   constants: serviceConstants(tag)
 });
 
+/** @internal */
+const serviceOption = tag => map(context(), getOption(tag));
+
 // -----------------------------------------------------------------------------
 // tracing
 // -----------------------------------------------------------------------------
@@ -820,11 +824,14 @@ const annotateSpans = /*#__PURE__*/dual(args => isEffect(args[0]), function () {
   return fiberRefLocallyWith(args[0], currentTracerSpanAnnotations, typeof args[1] === "string" ? set(args[1], args[2]) : annotations => Object.entries(args[1]).reduce((acc, [key, value]) => set(acc, key, value), annotations));
 });
 
-/* @internal */
-const currentParentSpan = /*#__PURE__*/map( /*#__PURE__*/fiberRefGet(currentTracerSpan), head$1);
+/** @internal */
+const currentParentSpan = /*#__PURE__*/serviceOption(spanTag);
 
-/* @internal */
-const currentSpan = /*#__PURE__*/map( /*#__PURE__*/fiberRefGet(currentTracerSpan), /*#__PURE__*/findFirst$1(span => span._tag === "Span"));
+/** @internal */
+const currentSpan = /*#__PURE__*/map( /*#__PURE__*/context(), context => {
+  const span = context.unsafeMap.get(spanTag);
+  return span !== undefined && span._tag === "Span" ? some(span) : none$2();
+});
 const bigint0 = /*#__PURE__*/BigInt(0);
 /** @internal */
 const currentTimeNanosTracing = /*#__PURE__*/fiberRefGetWith(currentTracerTimingEnabled, enabled => enabled ? currentTimeNanos : succeed(bigint0));
@@ -839,7 +846,7 @@ const linkSpans = /*#__PURE__*/dual(args => isEffect(args[0]), (self, span, attr
 /** @internal */
 const makeSpan = (name, options) => tracerWith(tracer => flatMap(options?.parent ? succeedSome(options.parent) : options?.root ? succeedNone : currentParentSpan, parent => flatMap(fiberRefGet(currentTracerSpanAnnotations), annotations => flatMap(fiberRefGet(currentTracerSpanLinks), links => flatMap(currentTimeNanosTracing, startTime => sync(() => {
   const linksArray = options?.links ? [...toReadonlyArray(links), ...options.links] : toReadonlyArray(links);
-  const span = tracer.span(name, parent, options?.context ?? empty$1(), linksArray, options?.sampled ?? (parent._tag === "Some" ? parent.value.sampled : true), startTime);
+  const span = tracer.span(name, parent, options?.context ?? empty$1(), linksArray, startTime);
   forEach(annotations, (value, key) => span.attribute(key, value));
   Object.entries(options?.attributes ?? {}).forEach(([k, v]) => span.attribute(k, v));
   return span;
@@ -859,7 +866,7 @@ const useSpan = (name, ...args) => {
 };
 
 /** @internal */
-const withParentSpan = /*#__PURE__*/dual(2, (self, span) => fiberRefLocallyWith(self, currentTracerSpan, prepend(span)));
+const withParentSpan = /*#__PURE__*/dual(2, (self, span) => provideService(self, spanTag, span));
 
 /** @internal */
 const withSpan = /*#__PURE__*/dual(args => typeof args[0] !== "string", (self, name, options) => useSpan(name, options ?? {}, span => withParentSpan(self, span)));
@@ -874,4 +881,4 @@ const fromNullable = value => value == null ? fail$1(NoSuchElementException()) :
 /* @internal */
 const optionFromOptional = self => catchAll(map(self, some), error => isNoSuchElementException(error) ? succeedNone : fail$1(error));
 
-export { Do, _catch, allowInterrupt, annotateCurrentSpan, annotateLogs, annotateSpans, asSome, asSomeError, asyncOption, bind, bindTo, bindValue, catchAllDefect, catchSomeCause, catchSomeDefect, catchTag, catchTags, cause, clock, clockWith, contextWith, currentParentSpan, currentSpan, currentTimeNanosTracing, delay, descriptor, descriptorWith, diffFiberRefs, diffFiberRefsAndRuntimeFlags, dropUntil, dropWhile, eventually, every, fiberRefs, filterOrDie, filterOrDieMessage, filterOrElse, filterOrFail, findFirst, firstSuccessOf, flipWith, forever, fromNullable, gen, head, ignore, ignoreLogged, inheritFiberRefs, isFailure, isSuccess, iterate, labelMetrics, labelMetricsSet, linkSpans, log, logAnnotations, logDebug, logError, logFatal, logInfo, logTrace, logWarning, loop, makeSpan, mapAccum, mapErrorCause, match, memoize, merge, negate, none, once, option, optionFromOptional, orElseFail, orElseSucceed, parallelErrors, patchFiberRefs, promise, provideService, provideServiceEffect, random, reduce, reduceRight, reduceWhile, repeatN, sandbox, serviceConstants, serviceFunction, serviceFunctionEffect, serviceFunctions, serviceMembers, setFiberRefs, sleep, spanAnnotations, spanLinks, succeedNone, succeedSome, summarized, tagMetrics, takeUntil, takeWhile, tapBoth, tapDefect, tapError, tapErrorCause, tapErrorTag, timed, timedWith, tracer, tracerWith, tryMap, tryMapPromise, tryPromise, try_, unless, unlessEffect, unsandbox, updateFiberRefs, updateService, useSpan, when, whenFiberRef, whenRef, withLogSpan, withMetric, withParentSpan, withSpan };
+export { Do, _catch, allowInterrupt, annotateCurrentSpan, annotateLogs, annotateSpans, asSome, asSomeError, asyncOption, bind, bindTo, bindValue, catchAllDefect, catchSomeCause, catchSomeDefect, catchTag, catchTags, cause, clock, clockWith, contextWith, currentParentSpan, currentSpan, currentTimeNanosTracing, delay, descriptor, descriptorWith, diffFiberRefs, diffFiberRefsAndRuntimeFlags, dropUntil, dropWhile, eventually, every, fiberRefs, filterOrDie, filterOrDieMessage, filterOrElse, filterOrFail, findFirst, firstSuccessOf, flipWith, forever, fromNullable, gen, head, ignore, ignoreLogged, inheritFiberRefs, isFailure, isSuccess, iterate, labelMetrics, labelMetricsSet, linkSpans, log, logAnnotations, logDebug, logError, logFatal, logInfo, logTrace, logWarning, loop, makeSpan, mapAccum, mapErrorCause, match, memoize, merge, negate, none, once, option, optionFromOptional, orElseFail, orElseSucceed, parallelErrors, patchFiberRefs, promise, provideService, provideServiceEffect, random, reduce, reduceRight, reduceWhile, repeatN, sandbox, serviceConstants, serviceFunction, serviceFunctionEffect, serviceFunctions, serviceMembers, serviceOption, setFiberRefs, sleep, spanAnnotations, spanLinks, succeedNone, succeedSome, summarized, tagMetrics, takeUntil, takeWhile, tapBoth, tapDefect, tapError, tapErrorCause, tapErrorTag, timed, timedWith, tracer, tracerWith, tryMap, tryMapPromise, tryPromise, try_, unless, unlessEffect, unsandbox, updateFiberRefs, updateService, useSpan, when, whenFiberRef, whenRef, withLogSpan, withMetric, withParentSpan, withSpan };

package/internal/core.esm.js

@@ -16,9 +16,10 @@ import { DeferredTypeId, deferredVariance, pending, done } from './deferred.esm.
 import { OP_STATE_PENDING, OP_STATE_DONE } from './opCodes/deferred.esm.js';
 import { OP_SUCCESS, OP_FAILURE, OP_WITH_RUNTIME, OP_ON_FAILURE, OP_ON_SUCCESS, OP_ON_SUCCESS_AND_FAILURE, OP_UPDATE_RUNTIME_FLAGS, OP_SYNC, OP_WHILE, OP_YIELD, OP_REVERT_FLAGS, OP_ASYNC } from './opCodes/effect.esm.js';
 import { Interruption, interruption, differ } from './runtimeFlags.esm.js';
-import { empty as empty$3, isCons } from '../List/dist/effect-List.esm.js';
+import { spanTag } from './tracer.esm.js';
+import { empty as empty$3 } from '../List/dist/effect-List.esm.js';
 import { make as make$1, get, set } from '../MutableRef/dist/effect-MutableRef.esm.js';
-import { getOrElse, getOrThrow, some, none as none$1, match } from '../Option/dist/effect-Option.esm.js';
+import { getOrElse, getOrThrow, some, none as none$1, match, isSome } from '../Option/dist/effect-Option.esm.js';
 import { pipeArguments } from '../Pipeable/dist/effect-Pipeable.esm.js';
 import { reduce as reduce$1, fromIterable as fromIterable$1 } from '../ReadonlyArray/dist/effect-ReadonlyArray.esm.js';
 import { enable, disable } from '../RuntimeFlagsPatch/dist/effect-RuntimeFlagsPatch.esm.js';
@@ -376,31 +377,28 @@ const originalInstance = obj => {
 
 /* @internal */
 const capture = (obj, span) => {
-  if (isCons(span)) {
-    const head = span.head;
-    if (head._tag === "Span") {
-      return new Proxy(obj, {
-        has(target, p) {
-          return p === spanSymbol || p === originalSymbol || p in target;
-        },
-        get(target, p) {
-          if (p === spanSymbol) {
-            return head;
-          }
-          if (p === originalSymbol) {
-            return obj;
-          }
-          // @ts-expect-error
-          return target[p];
+  if (isSome(span)) {
+    return new Proxy(obj, {
+      has(target, p) {
+        return p === spanSymbol || p === originalSymbol || p in target;
+      },
+      get(target, p) {
+        if (p === spanSymbol) {
+          return span.value;
         }
-      });
-    }
+        if (p === originalSymbol) {
+          return obj;
+        }
+        // @ts-expect-error
+        return target[p];
+      }
+    });
   }
   return obj;
 };
 
 /* @internal */
-const die = defect => typeof defect === "object" && defect !== null && !(spanSymbol in defect) ? withFiberRuntime(fiber => failCause(die$1(capture(defect, fiber.getFiberRef(currentTracerSpan))))) : failCause(die$1(defect));
+const die = defect => typeof defect === "object" && defect !== null && !(spanSymbol in defect) ? withFiberRuntime(fiber => failCause(die$1(capture(defect, currentSpanFromFiber(fiber))))) : failCause(die$1(defect));
 
 /* @internal */
 const dieMessage = message => failCauseSync(() => die$1(RuntimeException(message)));
@@ -414,12 +412,6 @@ const either = self => matchEffect(self, {
   onSuccess: a => succeed(right(a))
 });
 
-/* @internal */
-const context = () => suspend(() => fiberRefGet(currentContext));
-
-/* @internal */
-const contextWithEffect = f => flatMap(context(), f);
-
 /* @internal */
 const exit = self => matchCause(self, {
   onFailure: exitFailCause,
@@ -427,7 +419,7 @@ const exit = self => matchCause(self, {
 });
 
 /* @internal */
-const fail = error => typeof error === "object" && error !== null && !(spanSymbol in error) ? withFiberRuntime(fiber => failCause(fail$1(capture(error, fiber.getFiberRef(currentTracerSpan))))) : failCause(fail$1(error));
+const fail = error => typeof error === "object" && error !== null && !(spanSymbol in error) ? withFiberRuntime(fiber => failCause(fail$1(capture(error, currentSpanFromFiber(fiber))))) : failCause(fail$1(error));
 
 /* @internal */
 const failSync = evaluate => flatMap(sync(evaluate), fail);
@@ -673,15 +665,6 @@ const partitionMap = (elements, f) => fromIterable$1(elements).reduceRight(([lef
   }
 }, [new Array(), new Array()]);
 
-/* @internal */
-const provideContext = /*#__PURE__*/dual(2, (self, context) => fiberRefLocally(currentContext, context)(self));
-
-/* @internal */
-const provideSomeContext = /*#__PURE__*/dual(2, (self, context) => fiberRefLocallyWith(currentContext, parent => merge(parent, context))(self));
-
-/* @internal */
-const mapInputContext = /*#__PURE__*/dual(2, (self, f) => contextWithEffect(context => provideContext(self, f(context))));
-
 /* @internal */
 const runtimeFlags = /*#__PURE__*/withFiberRuntime((_, status) => succeed(status.runtimeFlags));
 
@@ -1161,9 +1144,6 @@ const currentInterruptedCause = /*#__PURE__*/globalValue( /*#__PURE__*/Symbol.fo
   join: (parent, _) => parent
 }));
 
-/** @internal */
-const currentTracerSpan = /*#__PURE__*/globalValue( /*#__PURE__*/Symbol.for("effect/FiberRef/currentTracerSpan"), () => fiberRefUnsafeMake(empty$3()));
-
 /** @internal */
 const currentTracerTimingEnabled = /*#__PURE__*/globalValue( /*#__PURE__*/Symbol.for("effect/FiberRef/currentTracerTiming"), () => fiberRefUnsafeMake(true));
 
@@ -1742,4 +1722,35 @@ const deferredInterruptJoiner = (self, joiner) => sync(() => {
   }
 });
 
-export { CloseableScopeTypeId, EffectErrorTypeId, EffectTypeId, FiberRefTypeId, RequestResolverImpl, RequestResolverTypeId, RevertFlags, ScopeTypeId, acquireUseRelease, allLogLevels, as, asUnit, async, asyncEither, attemptOrElse, blocked, catchAll, catchAllCause, catchIf, catchSome, checkInterruptible, context, contextWithEffect, currentConcurrency, currentContext, currentForkScopeOverride, currentInterruptedCause, currentLogAnnotations, currentLogLevel, currentLogSpan, currentMaxOpsBeforeYield, currentMetricLabels, currentRequestBatching, currentSchedulingPriority, currentTracerSpan, currentTracerSpanAnnotations, currentTracerSpanLinks, currentTracerTimingEnabled, currentUnhandledErrorLogLevel, deferredAwait, deferredComplete, deferredCompleteWith, deferredDie, deferredDieSync, deferredDone, deferredFail, deferredFailCause, deferredFailCauseSync, deferredFailSync, deferredInterrupt, deferredInterruptWith, deferredIsDone, deferredMake, deferredMakeAs, deferredPoll, deferredSucceed, deferredSync, deferredUnsafeDone, deferredUnsafeMake, die, dieMessage, dieSync, either, exit, exitAs, exitAsUnit, exitCauseOption, exitCollectAll, exitDie, exitExists, exitFail, exitFailCause, exitFlatMap, exitFlatMapEffect, exitFlatten, exitForEachEffect, exitFromEither, exitFromOption, exitGetOrElse, exitInterrupt, exitIsExit, exitIsFailure, exitIsInterrupted, exitIsSuccess, exitMap, exitMapBoth, exitMapError, exitMapErrorCause, exitMatch, exitMatchEffect, exitSucceed, exitUnit, exitZip, exitZipLeft, exitZipPar, exitZipParLeft, exitZipParRight, exitZipRight, exitZipWith, fail, failCause, failCauseSync, failSync, fiberId, fiberIdWith, fiberRefDelete, fiberRefGet, fiberRefGetAndSet, fiberRefGetAndUpdate, fiberRefGetAndUpdateSome, fiberRefGetWith, fiberRefLocally, fiberRefLocallyWith, fiberRefModify, fiberRefModifySome, fiberRefReset, fiberRefSet, fiberRefUnsafeMake, fiberRefUnsafeMakeContext, fiberRefUnsafeMakeHashSet, fiberRefUnsafeMakePatch, fiberRefUnsafeMakeRuntimeFlags, fiberRefUpdate, fiberRefUpdateAndGet, fiberRefUpdateSome, fiberRefUpdateSomeAndGet, flatMap, flatMapStep, flatten, flip, forEachSequential, forEachSequentialDiscard, if_, interrupt, interruptAsFiber, interruptFiber, interruptWith, interruptible, interruptibleMask, intoDeferred, isEffect, isEffectError, isRequestResolver, logLevelAll, logLevelDebug, logLevelError, logLevelFatal, logLevelInfo, logLevelNone, logLevelTrace, logLevelWarning, makeEffectError, map, mapBoth, mapError, mapInputContext, matchCause, matchCauseEffect, matchEffect, metricLabels, never, onError, onExit, onInterrupt, orDie, orDieWith, orElse, originalInstance, partitionMap, provideContext, provideSomeContext, releaseMapAdd, releaseMapAddIfOpen, releaseMapMake, releaseMapRelease, requestBlockLocally, resolverLocally, runRequestBlock, runtimeFlags, scopeAddFinalizer, scopeAddFinalizerExit, scopeClose, scopeFork, step, succeed, suspend, sync, tap, transplant, unified, uninterruptible, uninterruptibleMask, unit, updateRuntimeFlags, whenEffect, whileLoop, withConcurrency, withFiberRuntime, withMaxOpsBeforeYield, withRequestBatching, withRuntimeFlags, withSchedulingPriority, withTracerTiming, withUnhandledErrorLogLevel, yieldNow, zip, zipLeft, zipRight, zipWith };
+// -----------------------------------------------------------------------------
+// Context
+// -----------------------------------------------------------------------------
+
+const constContext = /*#__PURE__*/fiberRefGet(currentContext);
+
+/* @internal */
+const context = () => constContext;
+
+/* @internal */
+const contextWithEffect = f => flatMap(context(), f);
+
+/* @internal */
+const provideContext = /*#__PURE__*/dual(2, (self, context) => fiberRefLocally(currentContext, context)(self));
+
+/* @internal */
+const provideSomeContext = /*#__PURE__*/dual(2, (self, context) => fiberRefLocallyWith(currentContext, parent => merge(parent, context))(self));
+
+/* @internal */
+const mapInputContext = /*#__PURE__*/dual(2, (self, f) => contextWithEffect(context => provideContext(self, f(context))));
+
+// -----------------------------------------------------------------------------
+// Tracing
+// -----------------------------------------------------------------------------
+
+/** @internal */
+const currentSpanFromFiber = fiber => {
+  const span = fiber.getFiberRef(currentContext).unsafeMap.get(spanTag);
+  return span !== undefined && span._tag === "Span" ? some(span) : none$1();
+};
+
+export { CloseableScopeTypeId, EffectErrorTypeId, EffectTypeId, FiberRefTypeId, RequestResolverImpl, RequestResolverTypeId, RevertFlags, ScopeTypeId, acquireUseRelease, allLogLevels, as, asUnit, async, asyncEither, attemptOrElse, blocked, catchAll, catchAllCause, catchIf, catchSome, checkInterruptible, context, contextWithEffect, currentConcurrency, currentContext, currentForkScopeOverride, currentInterruptedCause, currentLogAnnotations, currentLogLevel, currentLogSpan, currentMaxOpsBeforeYield, currentMetricLabels, currentRequestBatching, currentSchedulingPriority, currentSpanFromFiber, currentTracerSpanAnnotations, currentTracerSpanLinks, currentTracerTimingEnabled, currentUnhandledErrorLogLevel, deferredAwait, deferredComplete, deferredCompleteWith, deferredDie, deferredDieSync, deferredDone, deferredFail, deferredFailCause, deferredFailCauseSync, deferredFailSync, deferredInterrupt, deferredInterruptWith, deferredIsDone, deferredMake, deferredMakeAs, deferredPoll, deferredSucceed, deferredSync, deferredUnsafeDone, deferredUnsafeMake, die, dieMessage, dieSync, either, exit, exitAs, exitAsUnit, exitCauseOption, exitCollectAll, exitDie, exitExists, exitFail, exitFailCause, exitFlatMap, exitFlatMapEffect, exitFlatten, exitForEachEffect, exitFromEither, exitFromOption, exitGetOrElse, exitInterrupt, exitIsExit, exitIsFailure, exitIsInterrupted, exitIsSuccess, exitMap, exitMapBoth, exitMapError, exitMapErrorCause, exitMatch, exitMatchEffect, exitSucceed, exitUnit, exitZip, exitZipLeft, exitZipPar, exitZipParLeft, exitZipParRight, exitZipRight, exitZipWith, fail, failCause, failCauseSync, failSync, fiberId, fiberIdWith, fiberRefDelete, fiberRefGet, fiberRefGetAndSet, fiberRefGetAndUpdate, fiberRefGetAndUpdateSome, fiberRefGetWith, fiberRefLocally, fiberRefLocallyWith, fiberRefModify, fiberRefModifySome, fiberRefReset, fiberRefSet, fiberRefUnsafeMake, fiberRefUnsafeMakeContext, fiberRefUnsafeMakeHashSet, fiberRefUnsafeMakePatch, fiberRefUnsafeMakeRuntimeFlags, fiberRefUpdate, fiberRefUpdateAndGet, fiberRefUpdateSome, fiberRefUpdateSomeAndGet, flatMap, flatMapStep, flatten, flip, forEachSequential, forEachSequentialDiscard, if_, interrupt, interruptAsFiber, interruptFiber, interruptWith, interruptible, interruptibleMask, intoDeferred, isEffect, isEffectError, isRequestResolver, logLevelAll, logLevelDebug, logLevelError, logLevelFatal, logLevelInfo, logLevelNone, logLevelTrace, logLevelWarning, makeEffectError, map, mapBoth, mapError, mapInputContext, matchCause, matchCauseEffect, matchEffect, metricLabels, never, onError, onExit, onInterrupt, orDie, orDieWith, orElse, originalInstance, partitionMap, provideContext, provideSomeContext, releaseMapAdd, releaseMapAddIfOpen, releaseMapMake, releaseMapRelease, requestBlockLocally, resolverLocally, runRequestBlock, runtimeFlags, scopeAddFinalizer, scopeAddFinalizerExit, scopeClose, scopeFork, step, succeed, suspend, sync, tap, transplant, unified, uninterruptible, uninterruptibleMask, unit, updateRuntimeFlags, whenEffect, whileLoop, withConcurrency, withFiberRuntime, withMaxOpsBeforeYield, withRequestBatching, withRuntimeFlags, withSchedulingPriority, withTracerTiming, withUnhandledErrorLogLevel, yieldNow, zip, zipLeft, zipRight, zipWith };

package/internal/fiberRuntime.esm.js

@@ -1,6 +1,6 @@
 import { not } from '../Boolean/dist/effect-Boolean.esm.js';
 import { fromIterable as fromIterable$1, isNonEmpty, headNonEmpty, tailNonEmpty, unsafeFromArray, prepend } from '../Chunk/dist/effect-Chunk.esm.js';
-import { get as get$1, getOption, add, Tag, merge, make as make$2, unsafeGet } from '../Context/dist/effect-Context.esm.js';
+import { getOption, get as get$1, add, Tag, merge, make as make$2, unsafeGet } from '../Context/dist/effect-Context.esm.js';
 import { await as _await$1 } from '../Deferred/dist/effect-Deferred.esm.js';
 import { parallel, sequential, parallelN } from '../ExecutionStrategy/dist/effect-ExecutionStrategy.esm.js';
 import { threadName, combine, none as none$2, unsafeMake as unsafeMake$1 } from '../FiberId/dist/effect-FiberId.esm.js';
@@ -16,8 +16,8 @@ import { clockTag } from './clock.esm.js';
 import { currentRequestMap } from './completedRequestMap.esm.js';
 import { matchSimple, match as match$1 } from './concurrency.esm.js';
 import { configProviderTag } from './configProvider.esm.js';
-import { fiberRefUnsafeMake, currentTracerSpan, fiberRefUnsafeMakeHashSet, uninterruptible, tap, isEffect, withFiberRuntime, fiberRefLocally, currentForkScopeOverride, map as map$2, exit, exitIsSuccess, onError, failCause, partitionMap, either, flatMap as flatMap$1, unit, succeed, fail, dieSync, uninterruptibleMask, interruptible, forEachSequential, zipRight, asUnit, onInterrupt, zipLeft, interruptFiber, deferredMake, exitMatchEffect, flatten, deferredFailCause, deferredSucceed, contextWithEffect, scopeFork, currentMetricLabels, acquireUseRelease, scopeClose, exitZipWith, flip, fiberIdWith, updateRuntimeFlags, runtimeFlags, ScopeTypeId, releaseMapMake, CloseableScopeTypeId, releaseMapAdd, scopeAddFinalizerExit, as, mapInputContext, onExit, fiberRefUnsafeMakePatch, fiberRefGet, fiberRefSet, fiberRefGetWith, sync, fiberRefUpdate, fiberRefDelete, fiberRefUnsafeMakeContext, fiberRefUnsafeMakeRuntimeFlags, forEachSequentialDiscard, exitSucceed, matchCauseEffect, suspend, fiberRefLocallyWith, currentInterruptedCause, deferredUnsafeMake, deferredAwait, async, currentSchedulingPriority, whileLoop, currentUnhandledErrorLogLevel, currentLogLevel, currentLogSpan, currentLogAnnotations, exitFailCause, exitUnit, currentContext, blocked, catchAllCause, runRequestBlock, RevertFlags, yieldNow as yieldNow$1, isEffectError, withRuntimeFlags, matchEffect, if_, zipWith, currentRequestBatching, transplant, step, deferredUnsafeDone, deferredFail, exitCollectAll, exitIsFailure, exitInterrupt, exitAsUnit, interruptAsFiber, flatMapStep } from './core.esm.js';
-import { makeSpan, currentTimeNanosTracing, mapErrorCause } from './core-effect.esm.js';
+import { fiberRefUnsafeMake, currentContext, fiberRefUnsafeMakeHashSet, uninterruptible, tap, isEffect, withFiberRuntime, fiberRefLocally, currentForkScopeOverride, map as map$2, exit, exitIsSuccess, onError, failCause, partitionMap, either, flatMap as flatMap$1, unit, succeed, fail, dieSync, uninterruptibleMask, interruptible, forEachSequential, zipRight, asUnit, onInterrupt, zipLeft, interruptFiber, deferredMake, exitMatchEffect, flatten, deferredFailCause, deferredSucceed, contextWithEffect, scopeFork, currentMetricLabels, acquireUseRelease, scopeClose, exitZipWith, flip, fiberIdWith, updateRuntimeFlags, runtimeFlags, ScopeTypeId, releaseMapMake, CloseableScopeTypeId, releaseMapAdd, scopeAddFinalizerExit, as, mapInputContext, onExit, fiberRefUnsafeMakePatch, fiberRefGet, fiberRefSet, fiberRefGetWith, sync, fiberRefUpdate, fiberRefDelete, fiberRefUnsafeMakeContext, fiberRefUnsafeMakeRuntimeFlags, forEachSequentialDiscard, exitSucceed, matchCauseEffect, suspend, currentInterruptedCause, deferredUnsafeMake, deferredAwait, async, currentSchedulingPriority, whileLoop, currentUnhandledErrorLogLevel, currentLogLevel, currentLogSpan, currentLogAnnotations, exitFailCause, exitUnit, blocked, catchAllCause, runRequestBlock, RevertFlags, yieldNow as yieldNow$1, isEffectError, withRuntimeFlags, matchEffect, if_, zipWith, currentRequestBatching, transplant, step, deferredUnsafeDone, deferredFail, exitCollectAll, exitIsFailure, exitInterrupt, exitAsUnit, interruptAsFiber, flatMapStep } from './core.esm.js';
+import { makeSpan, currentTimeNanosTracing, provideService, mapErrorCause } from './core-effect.esm.js';
 import { currentServices } from './defaultServices.esm.js';
 import { consoleTag } from './defaultServices/console.esm.js';
 import { sequential as sequential$2, isSequential, isParallel } from './executionStrategy.esm.js';
@@ -34,8 +34,7 @@ import { complete } from './request.esm.js';
 import { patch, diff, runtimeMetrics, WindDown, Interruption, interruptible as interruptible$1, enable, cooperativeYielding, OpSupervision, none as none$3 } from './runtimeFlags.esm.js';
 import { none as none$1 } from './supervisor.esm.js';
 import { differ, empty as empty$1 } from './supervisor/patch.esm.js';
-import { tracerTag } from './tracer.esm.js';
-import { head, prepend as prepend$1 } from '../List/dist/effect-List.esm.js';
+import { spanTag, tracerTag } from './tracer.esm.js';
 import { fromLiteral, greaterThan } from '../LogLevel/dist/effect-LogLevel.esm.js';
 import { make as make$4, compareAndSet } from '../MutableRef/dist/effect-MutableRef.esm.js';
 import { flatMap, map, some, none, match, fromNullable, isSome, getOrElse } from '../Option/dist/effect-Option.esm.js';
@@ -1175,7 +1174,7 @@ const tracerLogger = /*#__PURE__*/makeLogger(({
   logLevel,
   message
 }) => {
-  const span = flatMap(get(context, currentTracerSpan), head);
+  const span = flatMap(get(context, currentContext), getOption(spanTag));
   const clockService = map(get(context, currentServices), _ => get$1(_, clockTag));
   if (span._tag === "None" || span.value._tag === "ExternalSpan" || clockService._tag === "None") {
     return;
@@ -1997,16 +1996,10 @@ const interruptWhenPossible = /*#__PURE__*/dual(2, (self, all) => fiberRefGetWit
 /** @internal */
 const makeSpanScoped = (name, options) => acquireRelease(makeSpan(name, options), (span, exit) => flatMap$1(currentTimeNanosTracing, endTime => sync(() => span.end(endTime, exit))));
 
-/* @internal */
-const setSpan = (name, options) => tap(makeSpanScoped(name, options), span => setParentSpan(span));
-
 /* @internal */
 const withTracerScoped = value => fiberRefLocallyScopedWith(currentServices, add(tracerTag, value));
 
-/* @internal */
-const setParentSpan = span => fiberRefLocallyScopedWith(currentTracerSpan, prepend$1(span));
-
 /** @internal */
-const withSpanScoped = /*#__PURE__*/dual(args => typeof args[0] !== "string", (self, name, options) => flatMap$1(makeSpanScoped(name, options), span => fiberRefLocallyWith(self, currentTracerSpan, prepend$1(span))));
+const withSpanScoped = /*#__PURE__*/dual(args => typeof args[0] !== "string", (self, name, options) => flatMap$1(makeSpanScoped(name, options), span => provideService(self, spanTag, span)));
 
-export { FiberRuntime, acquireRelease, acquireReleaseInterruptible, addFinalizer, all, allSuccesses, allWith, currentLoggers, currentMinimumLogLevel, currentRuntimeFlags, currentSupervisor, daemonChildren, defaultLogger, disconnect, ensuring, exists, fiberActive, fiberAll, fiberAwaitAll, fiberFailures, fiberInterruptFork, fiberJoinAll, fiberLifetimes, fiberRefLocallyScoped, fiberRefLocallyScopedWith, fiberRefMake, fiberRefMakeContext, fiberRefMakeRuntimeFlags, fiberRefMakeWith, fiberRefUnsafeMakeSupervisor, fiberScoped, fiberStarted, fiberSuccesses, filter, finalizersMask, forEachOptions, forEachParN, forEachParNDiscard, forEachParUnbounded, forEachParUnboundedDiscard, fork, forkDaemon, forkWithErrorHandler, getConsole, interruptWhenPossible, invokeWithInterrupt, labelMetricsScoped, labelMetricsScopedSet, logFmtLogger, makeSpanScoped, mergeAll, parallelFinalizers, parallelNFinalizers, partition, race, raceAll, raceFibersWith, raceWith, reduceEffect, releaseMapReleaseAll, replicate, replicateEffect, runtimeFiberVariance, scope, scopeExtend, scopeMake, scopeTag, scopeUse, scopeWith, scopedEffect, sequentialFinalizers, setParentSpan, setSpan, tagMetricsScoped, tracerLogger, unsafeFork, unsafeMakeChildFiber, using, validate, validateAll, validateFirst, validateWith, withClockScoped, withConfigProviderScoped, withEarlyRelease, withRuntimeFlagsScoped, withSpanScoped, withTracerScoped, zipLeftOptions, zipOptions, zipRightOptions, zipWithOptions };
+export { FiberRuntime, acquireRelease, acquireReleaseInterruptible, addFinalizer, all, allSuccesses, allWith, currentLoggers, currentMinimumLogLevel, currentRuntimeFlags, currentSupervisor, daemonChildren, defaultLogger, disconnect, ensuring, exists, fiberActive, fiberAll, fiberAwaitAll, fiberFailures, fiberInterruptFork, fiberJoinAll, fiberLifetimes, fiberRefLocallyScoped, fiberRefLocallyScopedWith, fiberRefMake, fiberRefMakeContext, fiberRefMakeRuntimeFlags, fiberRefMakeWith, fiberRefUnsafeMakeSupervisor, fiberScoped, fiberStarted, fiberSuccesses, filter, finalizersMask, forEachOptions, forEachParN, forEachParNDiscard, forEachParUnbounded, forEachParUnboundedDiscard, fork, forkDaemon, forkWithErrorHandler, getConsole, interruptWhenPossible, invokeWithInterrupt, labelMetricsScoped, labelMetricsScopedSet, logFmtLogger, makeSpanScoped, mergeAll, parallelFinalizers, parallelNFinalizers, partition, race, raceAll, raceFibersWith, raceWith, reduceEffect, releaseMapReleaseAll, replicate, replicateEffect, runtimeFiberVariance, scope, scopeExtend, scopeMake, scopeTag, scopeUse, scopeWith, scopedEffect, sequentialFinalizers, tagMetricsScoped, tracerLogger, unsafeFork, unsafeMakeChildFiber, using, validate, validateAll, validateFirst, validateWith, withClockScoped, withConfigProviderScoped, withEarlyRelease, withRuntimeFlagsScoped, withSpanScoped, withTracerScoped, zipLeftOptions, zipOptions, zipRightOptions, zipWithOptions };

package/internal/layer/circular.esm.js

@@ -1,13 +1,16 @@
+import { make } from '../../Context/dist/effect-Context.esm.js';
 import { dual } from '../../Function/dist/effect-Function.esm.js';
 import { add, remove } from '../../HashSet/dist/effect-HashSet.esm.js';
-import { fiberRefLocally, map, tap, zipRight } from '../core.esm.js';
-import { fiberRefLocallyScoped, currentMinimumLogLevel, fiberRefLocallyScopedWith, currentLoggers, currentSupervisor, withRuntimeFlagsScoped, withConfigProviderScoped, setParentSpan as setParentSpan$1, makeSpanScoped, addFinalizer, setSpan as setSpan$1, withTracerScoped } from '../fiberRuntime.esm.js';
-import { scopedDiscard, unwrapEffect, unwrapScoped, flatMap } from '../layer.esm.js';
+import { fiberRefLocally, map, tap } from '../core.esm.js';
+import { fiberRefLocallyScoped, currentMinimumLogLevel, fiberRefLocallyScopedWith, currentLoggers, currentSupervisor, withRuntimeFlagsScoped, withConfigProviderScoped, makeSpanScoped, addFinalizer, withTracerScoped } from '../fiberRuntime.esm.js';
+import { scopedDiscard, unwrapEffect, unwrapScoped, flatMap, succeedContext, scoped } from '../layer.esm.js';
 import { CooperativeYielding, Interruption, OpSupervision, RuntimeMetrics, WindDown } from '../runtimeFlags.esm.js';
 import { enable, disable } from '../runtimeFlagsPatch.esm.js';
 import { Zip } from '../supervisor.esm.js';
+import { spanTag } from '../tracer.esm.js';
 
 // circular with Logger
+
 /** @internal */
 const minimumLogLevel = level => scopedDiscard(fiberRefLocallyScoped(currentMinimumLogLevel, level));
 
@@ -72,12 +75,12 @@ const disableWindDown = /*#__PURE__*/scopedDiscard( /*#__PURE__*/withRuntimeFlag
 const setConfigProvider = configProvider => scopedDiscard(withConfigProviderScoped(configProvider));
 
 /** @internal */
-const setParentSpan = span => scopedDiscard(setParentSpan$1(span));
+const parentSpan = span => succeedContext(make(spanTag, span));
 
 /** @internal */
-const setSpan = (name, options) => scopedDiscard(options?.onEnd ? tap(makeSpanScoped(name, options), span => zipRight(addFinalizer(exit => options.onEnd(span, exit)), setParentSpan$1(span))) : setSpan$1(name, options));
+const span = (name, options) => scoped(spanTag, options?.onEnd ? tap(makeSpanScoped(name, options), span => addFinalizer(exit => options.onEnd(span, exit))) : makeSpanScoped(name, options));
 
 /** @internal */
 const setTracer = tracer => scopedDiscard(withTracerScoped(tracer));
 
-export { addLogger, addLoggerEffect, addLoggerScoped, addSupervisor, disableCooperativeYielding, disableInterruption, disableOpSupervision, disableRuntimeMetrics, disableWindDown, enableCooperativeYielding, enableInterruption, enableOpSupervision, enableRuntimeMetrics, enableWindDown, minimumLogLevel, removeLogger, replaceLogger, replaceLoggerEffect, replaceLoggerScoped, setConfigProvider, setParentSpan, setSpan, setTracer, withMinimumLogLevel };
+export { addLogger, addLoggerEffect, addLoggerScoped, addSupervisor, disableCooperativeYielding, disableInterruption, disableOpSupervision, disableRuntimeMetrics, disableWindDown, enableCooperativeYielding, enableInterruption, enableOpSupervision, enableRuntimeMetrics, enableWindDown, minimumLogLevel, parentSpan, removeLogger, replaceLogger, replaceLoggerEffect, replaceLoggerScoped, setConfigProvider, setTracer, span, withMinimumLogLevel };

package/internal/layer.esm.js

@@ -4,7 +4,7 @@ import { empty, get, make, merge as merge$1, unsafeGet, Tag, isContext, isTag }
 import { millis } from '../Duration/dist/effect-Duration.esm.js';
 import { diff as diff$1 } from '../FiberRefsPatch/dist/effect-FiberRefsPatch.esm.js';
 import { dual, pipe } from '../Function/dist/effect-Function.esm.js';
-import { flatMap as flatMap$1, sync as sync$1, zipWith, provideContext, matchCauseEffect, context as context$1, failCause as failCause$1, failCauseSync as failCauseSync$1, map as map$1, fiberRefLocally as fiberRefLocally$1, fiberRefLocallyWith as fiberRefLocallyWith$1, zipRight, never, as, succeed as succeed$1, fail as fail$2, tap as tap$1, currentTracerSpan, provideSomeContext, acquireUseRelease, scopeClose, updateRuntimeFlags, flatten as flatten$1, onExit, exitMatch, unit, scopeAddFinalizerExit, deferredMake, uninterruptibleMask, exit, whenEffect, asUnit, deferredSucceed, deferredFailCause, deferredAwait, exitMatchEffect } from './core.esm.js';
+import { flatMap as flatMap$1, sync as sync$1, zipWith, provideContext, matchCauseEffect, failCause as failCause$1, failCauseSync as failCauseSync$1, map as map$1, fiberRefLocally as fiberRefLocally$1, fiberRefLocallyWith as fiberRefLocallyWith$1, zipRight, never, as, succeed as succeed$1, fail as fail$2, tap as tap$1, provideSomeContext, context as context$1, acquireUseRelease, scopeClose, updateRuntimeFlags, flatten as flatten$1, onExit, exitMatch, unit, scopeAddFinalizerExit, deferredMake, uninterruptibleMask, exit, whenEffect, asUnit, deferredSucceed, deferredFailCause, deferredAwait, exitMatchEffect } from './core.esm.js';
 import { memoize as memoize$1, patchFiberRefs, diffFiberRefs } from './core-effect.esm.js';
 import { makeSynchronized } from './effect/circular.esm.js';
 import { scopeWith, zipWithOptions, scopeExtend, fiberRefLocallyScoped as fiberRefLocallyScoped$1, fiberRefLocallyScopedWith as fiberRefLocallyScopedWith$1, scopedEffect, acquireRelease, scopeMake, makeSpanScoped, addFinalizer } from './fiberRuntime.esm.js';
@@ -13,12 +13,12 @@ import { OP_FRESH, OP_EXTEND_SCOPE, OP_FROM_EFFECT, OP_FOLD, OP_ZIP_WITH, OP_SCO
 import { make as make$1, set, modify, update, get as get$1 } from './ref.esm.js';
 import { runtime, defaultRuntime } from './runtime.esm.js';
 import { modifyEffect } from './synchronizedRef.esm.js';
-import { prepend } from '../List/dist/effect-List.esm.js';
 import { pipeArguments } from '../Pipeable/dist/effect-Pipeable.esm.js';
 import { isDone } from '../ScheduleDecision/dist/effect-ScheduleDecision.esm.js';
 import { start } from '../ScheduleIntervals/dist/effect-ScheduleIntervals.esm.js';
 import { Scope } from '../Scope/dist/effect-Scope.esm.js';
 import { diff } from './runtimeFlags.esm.js';
+import { spanTag } from './tracer.esm.js';
 
 /** @internal */
 const LayerSymbolKey = "effect/Layer";
@@ -556,7 +556,7 @@ const unwrapScoped = self => {
 const withSpan = /*#__PURE__*/dual(args => isLayer(args[0]), (self, name, options) => unwrapScoped(map$1(options?.onEnd ? tap$1(makeSpanScoped(name, options), span => addFinalizer(exit => options.onEnd(span, exit))) : makeSpanScoped(name, options), span => withParentSpan(self, span))));
 
 /** @internal */
-const withParentSpan = /*#__PURE__*/dual(2, (self, span) => fiberRefLocallyWith(self, currentTracerSpan, prepend(span)));
+const withParentSpan = /*#__PURE__*/dual(2, (self, span) => provide(succeedContext(make(spanTag, span)), self));
 
 // circular with Effect
 

package/internal/sink.esm.js

@@ -2,7 +2,7 @@ import { die as die$1, RuntimeException } from '../Cause/dist/effect-Cause.esm.j
 import { appendAll, splitAt, isEmpty, empty, append, toReadonlyArray, unsafeFromArray, drop as drop$1, flatten, map as map$3, dropWhile as dropWhile$1, filter, isNonEmpty, unsafeGet as unsafeGet$1, of, last as last$1, reduce } from '../Chunk/dist/effect-Chunk.esm.js';
 import { currentTimeMillis } from '../Clock/dist/effect-Clock.esm.js';
 import { millis } from '../Duration/dist/effect-Duration.esm.js';
-import { takeWhile, map as map$1, zip as zip$1, forEach as forEach$1, dropUntil as dropUntil$1, dropWhile as dropWhile$2, context as context$1, contextWith as contextWith$1, filter as filter$1, succeed as succeed$2, flatMap as flatMap$2, dieMessage as dieMessage$1, acquireRelease, never as never$1, gen, suspend as suspend$2, isEffect, failCause as failCause$2 } from '../Effect/dist/effect-Effect.esm.js';
+import { takeWhile, map as map$1, zip as zip$1, forEach as forEach$1, dropUntil as dropUntil$1, dropWhile as dropWhile$2, contextWith as contextWith$1, filter as filter$1, succeed as succeed$2, flatMap as flatMap$2, dieMessage as dieMessage$1, acquireRelease, never as never$1, gen, suspend as suspend$2, isEffect, failCause as failCause$2, context as context$1 } from '../Effect/dist/effect-Effect.esm.js';
 import { match as match$1, merge, left, right } from '../Either/dist/effect-Either.esm.js';
 import { match as match$2 } from '../Exit/dist/effect-Exit.esm.js';
 import { dual, pipe, constTrue, identity } from '../Function/dist/effect-Function.esm.js';

package/internal/stream.esm.js

@@ -5,13 +5,13 @@ import { sleep, currentTimeMillis } from '../Clock/dist/effect-Clock.esm.js';
 import { add, unsafeGet } from '../Context/dist/effect-Context.esm.js';
 import { make as make$4, succeed as succeed$2, await as _await, failCause as failCause$3, poll, fail as fail$4 } from '../Deferred/dist/effect-Deferred.esm.js';
 import { toMillis, millis, greaterThan, zero } from '../Duration/dist/effect-Duration.esm.js';
-import { acquireRelease as acquireRelease$1, all, when as when$1, flatMap as flatMap$2, zipRight as zipRight$1, succeed as succeed$1, map as map$1, forkScoped, scope, runtime, match as match$1, sync as sync$1, as as as$1, unit as unit$2, onError as onError$1, tap as tap$1, gen, suspend as suspend$1, transplant, die as die$1, dieSync as dieSync$1, dieMessage as dieMessage$1, makeSemaphore, matchCauseEffect, flatten as flatten$1, forEach, catchAllCause as catchAllCause$2, dropUntil as dropUntil$1, dropWhile as dropWhile$2, context as context$1, fail as fail$3, failSync as failSync$1, failCause as failCause$4, failCauseSync as failCauseSync$1, findFirst as findFirst$1, tryPromise, promise, isEffect, mapError as mapError$1, zip as zip$1, never as never$1, orDie as orDie$1, matchEffect, scoped as scoped$1, asUnit, forkDaemon, ensuring as ensuring$2, timeoutFail as timeoutFail$1, timeoutFailCause as timeoutFailCause$1, runSync, catchTags as catchTags$1, tapErrorCause as tapErrorCause$1, runPromise, setSpan, raceWith, zipWith as zipWith$1, forkIn, reduce as reduce$1, catchSomeCause as catchSomeCause$1, orElse as orElse$2, zipLeft as zipLeft$1, catchAll as catchAll$2, asSome, succeedNone, fork } from '../Effect/dist/effect-Effect.esm.js';
+import { acquireRelease as acquireRelease$1, all, when as when$1, flatMap as flatMap$2, zipRight as zipRight$1, succeed as succeed$1, map as map$1, forkScoped, scope, runtime, match as match$1, sync as sync$1, as as as$1, unit as unit$2, onError as onError$1, tap as tap$1, gen, suspend as suspend$1, transplant, die as die$1, dieSync as dieSync$1, dieMessage as dieMessage$1, makeSemaphore, matchCauseEffect, flatten as flatten$1, forEach, catchAllCause as catchAllCause$2, dropUntil as dropUntil$1, dropWhile as dropWhile$2, fail as fail$3, failSync as failSync$1, failCause as failCause$4, failCauseSync as failCauseSync$1, findFirst as findFirst$1, tryPromise, promise, isEffect, mapError as mapError$1, zip as zip$1, never as never$1, orDie as orDie$1, matchEffect, scoped as scoped$1, asUnit, forkDaemon, ensuring as ensuring$2, timeoutFail as timeoutFail$1, timeoutFailCause as timeoutFailCause$1, runSync, catchTags as catchTags$1, tapErrorCause as tapErrorCause$1, runPromise, raceWith, zipWith as zipWith$1, forkIn, reduce as reduce$1, catchSomeCause as catchSomeCause$1, context as context$2, orElse as orElse$2, zipLeft as zipLeft$1, catchAll as catchAll$2, asSome, succeedNone, fork } from '../Effect/dist/effect-Effect.esm.js';
 import { match, left, right } from '../Either/dist/effect-Either.esm.js';
 import { equals } from '../Equal/dist/effect-Equal.esm.js';
 import { match as match$3, failCause as failCause$2, fail as fail$2, isSuccess, succeed as succeed$4, unit as unit$3, isFailure } from '../Exit/dist/effect-Exit.esm.js';
 import { join, interrupt, poll as poll$1 } from '../Fiber/dist/effect-Fiber.esm.js';
 import { dual, pipe, identity, constTrue } from '../Function/dist/effect-Function.esm.js';
-import { build, context as context$2, merge as merge$1 } from '../Layer/dist/effect-Layer.esm.js';
+import { build, context as context$1, merge as merge$1 } from '../Layer/dist/effect-Layer.esm.js';
 import { none, some as some$1, match as match$2, getOrElse, map as map$4, isSome, isNone } from '../Option/dist/effect-Option.esm.js';
 import { pipeArguments } from '../Pipeable/dist/effect-Pipeable.esm.js';
 import { bounded as bounded$1, subscribe, shutdown as shutdown$1 } from '../PubSub/dist/effect-PubSub.esm.js';
@@ -21,7 +21,7 @@ import { runPromiseExit } from '../Runtime/dist/effect-Runtime.esm.js';
 import { forever as forever$1, driver, spaced } from '../Schedule/dist/effect-Schedule.esm.js';
 import { make as make$6, close, use } from '../Scope/dist/effect-Scope.esm.js';
 import { Both } from '../StreamHaltStrategy/dist/effect-StreamHaltStrategy.esm.js';
-import { unwrap as unwrap$1, zipRight as zipRight$2, pipeToOrFail, unwrapScoped as unwrapScoped$1, concatMap, writeChunk, drain as drain$1, identityChannel, ensuring as ensuring$1, mapOut, mapOutEffectPar, repeated, interruptWhen as interruptWhen$1, interruptWhenDeferred as interruptWhenDeferred$1, mapOutEffect, mapError as mapError$2, mapErrorCause as mapErrorCause$1, mergeWith as mergeWith$1, orDieWith as orDieWith$1, orElse as orElse$1, catchAll as catchAll$1, runDrain as runDrain$1, scoped as scoped$2, toPull as toPull$1, fromInput as fromInput$1, mergeMap, writeAll } from './channel.esm.js';
+import { unwrap as unwrap$1, zipRight as zipRight$2, pipeToOrFail, unwrapScoped as unwrapScoped$1, concatMap, writeChunk, drain as drain$1, identityChannel, ensuring as ensuring$1, mapOut, mapOutEffectPar, repeated, interruptWhen as interruptWhen$1, interruptWhenDeferred as interruptWhenDeferred$1, mapOutEffect, mapError as mapError$2, mapErrorCause as mapErrorCause$1, mergeWith as mergeWith$1, orDieWith as orDieWith$1, orElse as orElse$1, catchAll as catchAll$1, runDrain as runDrain$1, scoped as scoped$2, toPull as toPull$1, withSpan as withSpan$1, fromInput as fromInput$1, mergeMap, writeAll } from './channel.esm.js';
 import { run as run$1, runScoped as runScoped$1 } from './channel/channelExecutor.esm.js';
 import { BufferSliding } from './channel/mergeStrategy.esm.js';
 import { make as make$5 } from './channel/singleProducerAsyncInput.esm.js';
@@ -740,7 +740,7 @@ const ensuring = /*#__PURE__*/dual(2, (self, finalizer) => new StreamImpl(pipe(t
 const ensuringWith = /*#__PURE__*/dual(2, (self, finalizer) => new StreamImpl(ensuringWith$1(toChannel(self), finalizer)));
 
 /** @internal */
-const context = () => fromEffect(context$1());
+const context = () => fromEffect(context$2());
 
 /** @internal */
 const contextWith = f => pipe(context(), map(f));
@@ -1603,7 +1603,7 @@ const mapInputContext = /*#__PURE__*/dual(2, (self, f) => contextWithStream(env
 /** @internal */
 const provideSomeLayer = /*#__PURE__*/dual(2, (self, layer) =>
 // @ts-expect-error
-pipe(self, provideLayer(pipe(context$2(), merge$1(layer)))));
+pipe(self, provideLayer(pipe(context$1(), merge$1(layer)))));
 
 /** @internal */
 const range = (min, max, chunkSize = DefaultChunkSize) => suspend(() => {
@@ -2473,7 +2473,7 @@ const whenCaseEffect = /*#__PURE__*/dual(2, (self, pf) => pipe(fromEffect(self),
 const whenEffect = /*#__PURE__*/dual(2, (self, effect) => pipe(fromEffect(effect), flatMap(bool => bool ? self : empty)));
 
 /** @internal */
-const withSpan = /*#__PURE__*/dual(3, (self, name, options) => unwrapScoped(as$1(setSpan(name, options), self)));
+const withSpan = /*#__PURE__*/dual(3, (self, name, options) => new StreamImpl(withSpan$1(toChannel(self), name, options)));
 
 /** @internal */
 const zip = /*#__PURE__*/dual(2, (self, that) => pipe(self, zipWith(that, (a, a2) => [a, a2])));