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

package/dist/declarations/src/Tracer.d.ts

@@ -19,7 +19,7 @@ export type TracerTypeId = typeof TracerTypeId;
  */
 export interface Tracer {
     readonly [TracerTypeId]: TracerTypeId;
-    readonly span: (name: string, parent: Option.Option<ParentSpan>, context: Context.Context<never>, links: ReadonlyArray<SpanLink>, sampled: boolean, startTime: bigint) => Span;
+    readonly span: (name: string, parent: Option.Option<ParentSpan>, context: Context.Context<never>, links: ReadonlyArray<SpanLink>, startTime: bigint) => Span;
     readonly context: <X>(f: () => X, fiber: Fiber.RuntimeFiber<any, any>) => X;
 }
 /**
@@ -40,6 +40,11 @@ export type SpanStatus = {
  * @category models
  */
 export type ParentSpan = Span | ExternalSpan;
+/**
+ * @since 2.0.0
+ * @category tags
+ */
+export declare const ParentSpan: Context.Tag<ParentSpan, ParentSpan>;
 /**
  * @since 2.0.0
  * @category models

package/dist/declarations/src/Tracer.d.ts.map

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

package/dist/{defaultServices-193b11dc.cjs.dev.js → defaultServices-6a9a2d2b.cjs.dev.js}

@@ -5,12 +5,11 @@ var Duration_dist_effectDuration = require('../Duration/dist/effect-Duration.cjs
 var Function_dist_effectFunction = require('../Function/dist/effect-Function.cjs.dev.js');
 var GlobalValue_dist_effectGlobalValue = require('../GlobalValue/dist/effect-GlobalValue.cjs.dev.js');
 var Either_dist_effectEither = require('../Either/dist/effect-Either.cjs.dev.js');
-var core = require('./core-6815193e.cjs.dev.js');
+var core = require('./core-b4bf44d3.cjs.dev.js');
 var timeout = require('./timeout-d380d3f8.cjs.dev.js');
-var configProvider = require('./configProvider-8567470d.cjs.dev.js');
+var configProvider = require('./configProvider-3d85d4ef.cjs.dev.js');
 var Chunk_dist_effectChunk = require('../Chunk/dist/effect-Chunk.cjs.dev.js');
 var Utils_dist_effectUtils = require('../Utils/dist/effect-Utils.cjs.dev.js');
-var MutableRef_dist_effectMutableRef = require('../MutableRef/dist/effect-MutableRef.cjs.dev.js');
 
 /** @internal */
 const ClockSymbolKey = "effect/Clock";
@@ -84,7 +83,7 @@ class ClockImpl {
 }
 
 /** @internal */
-const make$2 = () => new ClockImpl();
+const make$1 = () => new ClockImpl();
 
 /** @internal */
 const TypeId = /*#__PURE__*/Symbol.for("effect/Console");
@@ -227,76 +226,10 @@ const swap = (buffer, index1, index2) => {
   buffer[index2] = tmp;
   return buffer;
 };
-const make$1 = seed => new RandomImpl(seed);
-
-/**
- * @since 2.0.0
- */
-/** @internal */
-const TracerTypeId = /*#__PURE__*/Symbol.for("effect/Tracer");
-
-/** @internal */
-const make = options => ({
-  [TracerTypeId]: TracerTypeId,
-  ...options
-});
-
-/** @internal */
-const tracerTag = /*#__PURE__*/Context_dist_effectContext.Tag( /*#__PURE__*/Symbol.for("effect/Tracer"));
-const ids = /*#__PURE__*/GlobalValue_dist_effectGlobalValue.globalValue("effect/Tracer/SpanId.ids", () => MutableRef_dist_effectMutableRef.make(0));
-
-/** @internal */
-class NativeSpan {
-  _tag = "Span";
-  traceId = "native";
-  events = [];
-  constructor(name, parent, context, links, sampled, startTime) {
-    this.name = name;
-    this.parent = parent;
-    this.context = context;
-    this.links = links;
-    this.sampled = sampled;
-    this.startTime = startTime;
-    this.status = {
-      _tag: "Started",
-      startTime
-    };
-    this.attributes = new Map();
-    this.spanId = `span${MutableRef_dist_effectMutableRef.incrementAndGet(ids)}`;
-  }
-  end = (endTime, exit) => {
-    this.status = {
-      _tag: "Ended",
-      endTime,
-      exit,
-      startTime: this.status.startTime
-    };
-  };
-  attribute = (key, value) => {
-    this.attributes.set(key, value);
-  };
-  event = (name, startTime, attributes) => {
-    this.events.push([name, startTime, attributes ?? {}]);
-  };
-}
-
-/** @internal */
-const nativeTracer = /*#__PURE__*/make({
-  span: (name, parent, context, links, sampled, startTime) => new NativeSpan(name, parent, context, links, sampled, startTime),
-  context: f => f()
-});
-
-/** @internal */
-const externalSpan = options => ({
-  _tag: "ExternalSpan",
-  spanId: options.spanId,
-  traceId: options.traceId,
-  sampled: options.sampled ?? true,
-  context: options.context ?? Context_dist_effectContext.empty()
-});
+const make = seed => new RandomImpl(seed);
 
 /** @internal */
-const liveServices = /*#__PURE__*/Function_dist_effectFunction.pipe( /*#__PURE__*/Context_dist_effectContext.empty(), /*#__PURE__*/Context_dist_effectContext.add(clockTag, /*#__PURE__*/make$2()), /*#__PURE__*/Context_dist_effectContext.add(consoleTag, defaultConsole), /*#__PURE__*/Context_dist_effectContext.add(randomTag, /*#__PURE__*/make$1( /*#__PURE__*/Math.random() * 4294967296 >>> 0)), /*#__PURE__*/Context_dist_effectContext.add(configProvider.configProviderTag, /*#__PURE__*/configProvider.fromEnv()), /*#__PURE__*/Context_dist_effectContext.add(tracerTag, nativeTracer));
+const liveServices = /*#__PURE__*/Function_dist_effectFunction.pipe( /*#__PURE__*/Context_dist_effectContext.empty(), /*#__PURE__*/Context_dist_effectContext.add(clockTag, /*#__PURE__*/make$1()), /*#__PURE__*/Context_dist_effectContext.add(consoleTag, defaultConsole), /*#__PURE__*/Context_dist_effectContext.add(randomTag, /*#__PURE__*/make( /*#__PURE__*/Math.random() * 4294967296 >>> 0)), /*#__PURE__*/Context_dist_effectContext.add(configProvider.configProviderTag, /*#__PURE__*/configProvider.fromEnv()), /*#__PURE__*/Context_dist_effectContext.add(core.tracerTag, core.nativeTracer));
 
 /**
  * The `FiberRef` holding the default `Effect` services.
@@ -363,14 +296,13 @@ const shuffle = elements => randomWith(random => random.shuffle(elements));
 // circular with Tracer
 
 /** @internal */
-const tracerWith = f => core.fiberRefGetWith(currentServices, services => f(Context_dist_effectContext.get(services, tracerTag)));
+const tracerWith = f => core.fiberRefGetWith(currentServices, services => f(Context_dist_effectContext.get(services, core.tracerTag)));
 
 /** @internal */
-const withTracer = /*#__PURE__*/Function_dist_effectFunction.dual(2, (effect, value) => core.fiberRefLocallyWith(currentServices, Context_dist_effectContext.add(tracerTag, value))(effect));
+const withTracer = /*#__PURE__*/Function_dist_effectFunction.dual(2, (effect, value) => core.fiberRefLocallyWith(currentServices, Context_dist_effectContext.add(core.tracerTag, value))(effect));
 
 exports.ClockTypeId = ClockTypeId;
 exports.RandomTypeId = RandomTypeId;
-exports.TracerTypeId = TracerTypeId;
 exports.TypeId = TypeId;
 exports.clockTag = clockTag;
 exports.clockWith = clockWith;
@@ -380,10 +312,8 @@ exports.consoleTag = consoleTag;
 exports.currentServices = currentServices;
 exports.currentTimeMillis = currentTimeMillis;
 exports.currentTimeNanos = currentTimeNanos;
-exports.externalSpan = externalSpan;
 exports.liveServices = liveServices;
-exports.make = make$2;
-exports.make$1 = make;
+exports.make = make$1;
 exports.next = next;
 exports.nextBoolean = nextBoolean;
 exports.nextInt = nextInt;
@@ -392,7 +322,6 @@ exports.nextRange = nextRange;
 exports.randomWith = randomWith;
 exports.shuffle = shuffle;
 exports.sleep = sleep;
-exports.tracerTag = tracerTag;
 exports.tracerWith = tracerWith;
 exports.withClock = withClock;
 exports.withConfigProvider = withConfigProvider;

package/dist/{defaultServices-4c3bf140.cjs.prod.js → defaultServices-8ea5e664.cjs.prod.js}

@@ -5,12 +5,11 @@ var Duration_dist_effectDuration = require('../Duration/dist/effect-Duration.cjs
 var Function_dist_effectFunction = require('../Function/dist/effect-Function.cjs.prod.js');
 var GlobalValue_dist_effectGlobalValue = require('../GlobalValue/dist/effect-GlobalValue.cjs.prod.js');
 var Either_dist_effectEither = require('../Either/dist/effect-Either.cjs.prod.js');
-var core = require('./core-84667e8d.cjs.prod.js');
+var core = require('./core-473934ce.cjs.prod.js');
 var timeout = require('./timeout-489f3f86.cjs.prod.js');
-var configProvider = require('./configProvider-098f7113.cjs.prod.js');
+var configProvider = require('./configProvider-ae007b10.cjs.prod.js');
 var Chunk_dist_effectChunk = require('../Chunk/dist/effect-Chunk.cjs.prod.js');
 var Utils_dist_effectUtils = require('../Utils/dist/effect-Utils.cjs.prod.js');
-var MutableRef_dist_effectMutableRef = require('../MutableRef/dist/effect-MutableRef.cjs.prod.js');
 
 /** @internal */
 const ClockSymbolKey = "effect/Clock";
@@ -84,7 +83,7 @@ class ClockImpl {
 }
 
 /** @internal */
-const make$2 = () => new ClockImpl();
+const make$1 = () => new ClockImpl();
 
 /** @internal */
 const TypeId = /*#__PURE__*/Symbol.for("effect/Console");
@@ -227,76 +226,10 @@ const swap = (buffer, index1, index2) => {
   buffer[index2] = tmp;
   return buffer;
 };
-const make$1 = seed => new RandomImpl(seed);
-
-/**
- * @since 2.0.0
- */
-/** @internal */
-const TracerTypeId = /*#__PURE__*/Symbol.for("effect/Tracer");
-
-/** @internal */
-const make = options => ({
-  [TracerTypeId]: TracerTypeId,
-  ...options
-});
-
-/** @internal */
-const tracerTag = /*#__PURE__*/Context_dist_effectContext.Tag( /*#__PURE__*/Symbol.for("effect/Tracer"));
-const ids = /*#__PURE__*/GlobalValue_dist_effectGlobalValue.globalValue("effect/Tracer/SpanId.ids", () => MutableRef_dist_effectMutableRef.make(0));
-
-/** @internal */
-class NativeSpan {
-  _tag = "Span";
-  traceId = "native";
-  events = [];
-  constructor(name, parent, context, links, sampled, startTime) {
-    this.name = name;
-    this.parent = parent;
-    this.context = context;
-    this.links = links;
-    this.sampled = sampled;
-    this.startTime = startTime;
-    this.status = {
-      _tag: "Started",
-      startTime
-    };
-    this.attributes = new Map();
-    this.spanId = `span${MutableRef_dist_effectMutableRef.incrementAndGet(ids)}`;
-  }
-  end = (endTime, exit) => {
-    this.status = {
-      _tag: "Ended",
-      endTime,
-      exit,
-      startTime: this.status.startTime
-    };
-  };
-  attribute = (key, value) => {
-    this.attributes.set(key, value);
-  };
-  event = (name, startTime, attributes) => {
-    this.events.push([name, startTime, attributes ?? {}]);
-  };
-}
-
-/** @internal */
-const nativeTracer = /*#__PURE__*/make({
-  span: (name, parent, context, links, sampled, startTime) => new NativeSpan(name, parent, context, links, sampled, startTime),
-  context: f => f()
-});
-
-/** @internal */
-const externalSpan = options => ({
-  _tag: "ExternalSpan",
-  spanId: options.spanId,
-  traceId: options.traceId,
-  sampled: options.sampled ?? true,
-  context: options.context ?? Context_dist_effectContext.empty()
-});
+const make = seed => new RandomImpl(seed);
 
 /** @internal */
-const liveServices = /*#__PURE__*/Function_dist_effectFunction.pipe( /*#__PURE__*/Context_dist_effectContext.empty(), /*#__PURE__*/Context_dist_effectContext.add(clockTag, /*#__PURE__*/make$2()), /*#__PURE__*/Context_dist_effectContext.add(consoleTag, defaultConsole), /*#__PURE__*/Context_dist_effectContext.add(randomTag, /*#__PURE__*/make$1( /*#__PURE__*/Math.random() * 4294967296 >>> 0)), /*#__PURE__*/Context_dist_effectContext.add(configProvider.configProviderTag, /*#__PURE__*/configProvider.fromEnv()), /*#__PURE__*/Context_dist_effectContext.add(tracerTag, nativeTracer));
+const liveServices = /*#__PURE__*/Function_dist_effectFunction.pipe( /*#__PURE__*/Context_dist_effectContext.empty(), /*#__PURE__*/Context_dist_effectContext.add(clockTag, /*#__PURE__*/make$1()), /*#__PURE__*/Context_dist_effectContext.add(consoleTag, defaultConsole), /*#__PURE__*/Context_dist_effectContext.add(randomTag, /*#__PURE__*/make( /*#__PURE__*/Math.random() * 4294967296 >>> 0)), /*#__PURE__*/Context_dist_effectContext.add(configProvider.configProviderTag, /*#__PURE__*/configProvider.fromEnv()), /*#__PURE__*/Context_dist_effectContext.add(core.tracerTag, core.nativeTracer));
 
 /**
  * The `FiberRef` holding the default `Effect` services.
@@ -363,14 +296,13 @@ const shuffle = elements => randomWith(random => random.shuffle(elements));
 // circular with Tracer
 
 /** @internal */
-const tracerWith = f => core.fiberRefGetWith(currentServices, services => f(Context_dist_effectContext.get(services, tracerTag)));
+const tracerWith = f => core.fiberRefGetWith(currentServices, services => f(Context_dist_effectContext.get(services, core.tracerTag)));
 
 /** @internal */
-const withTracer = /*#__PURE__*/Function_dist_effectFunction.dual(2, (effect, value) => core.fiberRefLocallyWith(currentServices, Context_dist_effectContext.add(tracerTag, value))(effect));
+const withTracer = /*#__PURE__*/Function_dist_effectFunction.dual(2, (effect, value) => core.fiberRefLocallyWith(currentServices, Context_dist_effectContext.add(core.tracerTag, value))(effect));
 
 exports.ClockTypeId = ClockTypeId;
 exports.RandomTypeId = RandomTypeId;
-exports.TracerTypeId = TracerTypeId;
 exports.TypeId = TypeId;
 exports.clockTag = clockTag;
 exports.clockWith = clockWith;
@@ -380,10 +312,8 @@ exports.consoleTag = consoleTag;
 exports.currentServices = currentServices;
 exports.currentTimeMillis = currentTimeMillis;
 exports.currentTimeNanos = currentTimeNanos;
-exports.externalSpan = externalSpan;
 exports.liveServices = liveServices;
-exports.make = make$2;
-exports.make$1 = make;
+exports.make = make$1;
 exports.next = next;
 exports.nextBoolean = nextBoolean;
 exports.nextInt = nextInt;
@@ -392,7 +322,6 @@ exports.nextRange = nextRange;
 exports.randomWith = randomWith;
 exports.shuffle = shuffle;
 exports.sleep = sleep;
-exports.tracerTag = tracerTag;
 exports.tracerWith = tracerWith;
 exports.withClock = withClock;
 exports.withConfigProvider = withConfigProvider;

package/dist/{fiber-cbdeec72.cjs.dev.js → fiber-3d944398.cjs.dev.js}

@@ -3,13 +3,13 @@
 var Clock_dist_effectClock = require('../Clock/dist/effect-Clock.cjs.dev.js');
 var Either_dist_effectEither = require('../Either/dist/effect-Either.cjs.dev.js');
 var Exit_dist_effectExit = require('../Exit/dist/effect-Exit.cjs.dev.js');
-var FiberId_dist_effectFiberId = require('./FiberId-6708cdca.cjs.dev.js');
+var FiberId_dist_effectFiberId = require('./FiberId-6595cf4c.cjs.dev.js');
 var FiberStatus_dist_effectFiberStatus = require('../FiberStatus/dist/effect-FiberStatus.cjs.dev.js');
 var Function_dist_effectFunction = require('../Function/dist/effect-Function.cjs.dev.js');
 var HashSet_dist_effectHashSet = require('../HashSet/dist/effect-HashSet.cjs.dev.js');
-var core = require('./core-6815193e.cjs.dev.js');
+var core = require('./core-b4bf44d3.cjs.dev.js');
 var GlobalValue_dist_effectGlobalValue = require('../GlobalValue/dist/effect-GlobalValue.cjs.dev.js');
-var RuntimeFlagsPatch_dist_effectRuntimeFlagsPatch = require('./RuntimeFlagsPatch-9cbc441d.cjs.dev.js');
+var RuntimeFlagsPatch_dist_effectRuntimeFlagsPatch = require('./RuntimeFlagsPatch-7d62915d.cjs.dev.js');
 var Number_dist_effectNumber = require('../Number/dist/effect-Number.cjs.dev.js');
 var Option_dist_effectOption = require('../Option/dist/effect-Option.cjs.dev.js');
 var Order_dist_effectOrder = require('../Order/dist/effect-Order.cjs.dev.js');

package/dist/{fiber-a1a5e429.cjs.prod.js → fiber-cbd0613f.cjs.prod.js}

@@ -3,13 +3,13 @@
 var Clock_dist_effectClock = require('../Clock/dist/effect-Clock.cjs.prod.js');
 var Either_dist_effectEither = require('../Either/dist/effect-Either.cjs.prod.js');
 var Exit_dist_effectExit = require('../Exit/dist/effect-Exit.cjs.prod.js');
-var FiberId_dist_effectFiberId = require('./FiberId-54d8bd67.cjs.prod.js');
+var FiberId_dist_effectFiberId = require('./FiberId-0f0b7779.cjs.prod.js');
 var FiberStatus_dist_effectFiberStatus = require('../FiberStatus/dist/effect-FiberStatus.cjs.prod.js');
 var Function_dist_effectFunction = require('../Function/dist/effect-Function.cjs.prod.js');
 var HashSet_dist_effectHashSet = require('../HashSet/dist/effect-HashSet.cjs.prod.js');
-var core = require('./core-84667e8d.cjs.prod.js');
+var core = require('./core-473934ce.cjs.prod.js');
 var GlobalValue_dist_effectGlobalValue = require('../GlobalValue/dist/effect-GlobalValue.cjs.prod.js');
-var RuntimeFlagsPatch_dist_effectRuntimeFlagsPatch = require('./RuntimeFlagsPatch-35ed8dee.cjs.prod.js');
+var RuntimeFlagsPatch_dist_effectRuntimeFlagsPatch = require('./RuntimeFlagsPatch-3890e860.cjs.prod.js');
 var Number_dist_effectNumber = require('../Number/dist/effect-Number.cjs.prod.js');
 var Option_dist_effectOption = require('../Option/dist/effect-Option.cjs.prod.js');
 var Order_dist_effectOrder = require('../Order/dist/effect-Order.cjs.prod.js');

package/dist/{fiberRefs-f631451c.cjs.prod.js → fiberRefs-99808a27.cjs.prod.js}

@@ -3,7 +3,7 @@
 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 HashSet_dist_effectHashSet = require('../HashSet/dist/effect-HashSet.cjs.prod.js');
-var core = require('./core-84667e8d.cjs.prod.js');
+var core = require('./core-473934ce.cjs.prod.js');
 var Option_dist_effectOption = require('../Option/dist/effect-Option.cjs.prod.js');
 var Pipeable_dist_effectPipeable = require('../Pipeable/dist/effect-Pipeable.cjs.prod.js');
 var ReadonlyArray_dist_effectReadonlyArray = require('../ReadonlyArray/dist/effect-ReadonlyArray.cjs.prod.js');

package/dist/{fiberRefs-8d2401f9.cjs.dev.js → fiberRefs-ccc37f30.cjs.dev.js}

@@ -3,7 +3,7 @@
 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 HashSet_dist_effectHashSet = require('../HashSet/dist/effect-HashSet.cjs.dev.js');
-var core = require('./core-6815193e.cjs.dev.js');
+var core = require('./core-b4bf44d3.cjs.dev.js');
 var Option_dist_effectOption = require('../Option/dist/effect-Option.cjs.dev.js');
 var Pipeable_dist_effectPipeable = require('../Pipeable/dist/effect-Pipeable.cjs.dev.js');
 var ReadonlyArray_dist_effectReadonlyArray = require('../ReadonlyArray/dist/effect-ReadonlyArray.cjs.dev.js');

package/dist/{fiberRuntime-7cb6cd44.cjs.dev.js → fiberRuntime-0c1e7478.cjs.dev.js}

@@ -5,40 +5,40 @@ var Chunk_dist_effectChunk = require('../Chunk/dist/effect-Chunk.cjs.dev.js');
 var Context_dist_effectContext = require('../Context/dist/effect-Context.cjs.dev.js');
 var Deferred_dist_effectDeferred = require('../Deferred/dist/effect-Deferred.cjs.dev.js');
 var ExecutionStrategy_dist_effectExecutionStrategy = require('./ExecutionStrategy-7d9d457b.cjs.dev.js');
-var FiberId_dist_effectFiberId = require('./FiberId-6708cdca.cjs.dev.js');
+var FiberId_dist_effectFiberId = require('./FiberId-6595cf4c.cjs.dev.js');
 var FiberRefs_dist_effectFiberRefs = require('../FiberRefs/dist/effect-FiberRefs.cjs.dev.js');
 var FiberRefsPatch_dist_effectFiberRefsPatch = require('../FiberRefsPatch/dist/effect-FiberRefsPatch.cjs.dev.js');
 var FiberStatus_dist_effectFiberStatus = require('../FiberStatus/dist/effect-FiberStatus.cjs.dev.js');
 var Function_dist_effectFunction = require('../Function/dist/effect-Function.cjs.dev.js');
 var HashMap_dist_effectHashMap = require('../HashMap/dist/effect-HashMap.cjs.dev.js');
 var HashSet_dist_effectHashSet = require('../HashSet/dist/effect-HashSet.cjs.dev.js');
-var core = require('./core-6815193e.cjs.dev.js');
-var defaultServices = require('./defaultServices-193b11dc.cjs.dev.js');
+var core = require('./core-b4bf44d3.cjs.dev.js');
+var defaultServices = require('./defaultServices-6a9a2d2b.cjs.dev.js');
 var GlobalValue_dist_effectGlobalValue = require('../GlobalValue/dist/effect-GlobalValue.cjs.dev.js');
-var configProvider = require('./configProvider-8567470d.cjs.dev.js');
-var coreEffect = require('./core-effect-5700daea.cjs.dev.js');
-var fiber = require('./fiber-cbdeec72.cjs.dev.js');
-var fiberRefs = require('./fiberRefs-8d2401f9.cjs.dev.js');
+var configProvider = require('./configProvider-3d85d4ef.cjs.dev.js');
+var coreEffect = require('./core-effect-f4b1aad8.cjs.dev.js');
+var fiber = require('./fiber-3d944398.cjs.dev.js');
+var fiberRefs = require('./fiberRefs-ccc37f30.cjs.dev.js');
 var List_dist_effectList = require('../List/dist/effect-List.cjs.dev.js');
 var LogSpan_dist_effectLogSpan = require('../LogSpan/dist/effect-LogSpan.cjs.dev.js');
 var Option_dist_effectOption = require('../Option/dist/effect-Option.cjs.dev.js');
 var Pipeable_dist_effectPipeable = require('../Pipeable/dist/effect-Pipeable.cjs.dev.js');
 var Clock_dist_effectClock = require('../Clock/dist/effect-Clock.cjs.dev.js');
 var Duration_dist_effectDuration = require('../Duration/dist/effect-Duration.cjs.dev.js');
-var boundaries = require('./boundaries-6eea221f.cjs.dev.js');
-var key = require('./key-2d4efb00.cjs.dev.js');
+var boundaries = require('./boundaries-8dfe50cb.cjs.dev.js');
+var key = require('./key-e3189bbd.cjs.dev.js');
 var label = require('./label-b0cebeae.cjs.dev.js');
-var registry = require('./registry-ec8b84a2.cjs.dev.js');
+var registry = require('./registry-377855a9.cjs.dev.js');
 var ReadonlyArray_dist_effectReadonlyArray = require('../ReadonlyArray/dist/effect-ReadonlyArray.cjs.dev.js');
 var Effectable = require('./Effectable-71c10ab9.cjs.dev.js');
-var RuntimeFlagsPatch_dist_effectRuntimeFlagsPatch = require('./RuntimeFlagsPatch-9cbc441d.cjs.dev.js');
+var RuntimeFlagsPatch_dist_effectRuntimeFlagsPatch = require('./RuntimeFlagsPatch-7d62915d.cjs.dev.js');
 var MutableRef_dist_effectMutableRef = require('../MutableRef/dist/effect-MutableRef.cjs.dev.js');
 var SortedSet_dist_effectSortedSet = require('../SortedSet/dist/effect-SortedSet.cjs.dev.js');
 var Differ_dist_effectDiffer = require('../Differ/dist/effect-Differ.cjs.dev.js');
 var Equal_dist_effectEqual = require('../Equal/dist/effect-Equal.cjs.dev.js');
 var LogLevel_dist_effectLogLevel = require('../LogLevel/dist/effect-LogLevel.cjs.dev.js');
 var Predicate_dist_effectPredicate = require('../Predicate/dist/effect-Predicate.cjs.dev.js');
-var Ref_dist_effectRef = require('./Ref-c75b5362.cjs.dev.js');
+var Ref_dist_effectRef = require('./Ref-f990026b.cjs.dev.js');
 var Scheduler_dist_effectScheduler = require('../Scheduler/dist/effect-Scheduler.cjs.dev.js');
 
 /** @internal */
@@ -1027,7 +1027,7 @@ class FiberRuntime {
       fiberStarted.unsafeUpdate(1, tags);
       fiberActive.unsafeUpdate(1, tags);
     }
-    this._tracer = Context_dist_effectContext.get(this.getFiberRef(defaultServices.currentServices), defaultServices.tracerTag);
+    this._tracer = Context_dist_effectContext.get(this.getFiberRef(defaultServices.currentServices), core.tracerTag);
   }
 
   /**
@@ -1260,7 +1260,7 @@ class FiberRuntime {
     this.refreshRefCache();
   }
   refreshRefCache() {
-    this._tracer = Context_dist_effectContext.get(this.getFiberRef(defaultServices.currentServices), defaultServices.tracerTag);
+    this._tracer = Context_dist_effectContext.get(this.getFiberRef(defaultServices.currentServices), core.tracerTag);
     this._supervisor = this.getFiberRef(currentSupervisor);
     this._scheduler = this.getFiberRef(Scheduler_dist_effectScheduler.currentScheduler);
   }
@@ -2029,7 +2029,7 @@ const tracerLogger = /*#__PURE__*/makeLogger(({
   logLevel,
   message
 }) => {
-  const span = Option_dist_effectOption.flatMap(fiberRefs.get(context, core.currentTracerSpan), List_dist_effectList.head);
+  const span = Option_dist_effectOption.flatMap(fiberRefs.get(context, core.currentContext), Context_dist_effectContext.getOption(core.spanTag));
   const clockService = Option_dist_effectOption.map(fiberRefs.get(context, defaultServices.currentServices), _ => Context_dist_effectContext.get(_, defaultServices.clockTag));
   if (span._tag === "None" || span.value._tag === "ExternalSpan" || clockService._tag === "None") {
     return;
@@ -2852,16 +2852,10 @@ const interruptWhenPossible = /*#__PURE__*/Function_dist_effectFunction.dual(2,
 const makeSpanScoped = (name, options) => acquireRelease(coreEffect.makeSpan(name, options), (span, exit) => core.flatMap$1(coreEffect.currentTimeNanosTracing, endTime => core.sync(() => span.end(endTime, exit))));
 
 /* @internal */
-const setSpan = (name, options) => core.tap(makeSpanScoped(name, options), span => setParentSpan(span));
-
-/* @internal */
-const withTracerScoped = value => fiberRefLocallyScopedWith(defaultServices.currentServices, Context_dist_effectContext.add(defaultServices.tracerTag, value));
-
-/* @internal */
-const setParentSpan = span => fiberRefLocallyScopedWith(core.currentTracerSpan, List_dist_effectList.prepend(span));
+const withTracerScoped = value => fiberRefLocallyScopedWith(defaultServices.currentServices, Context_dist_effectContext.add(core.tracerTag, value));
 
 /** @internal */
-const withSpanScoped = /*#__PURE__*/Function_dist_effectFunction.dual(args => typeof args[0] !== "string", (self, name, options) => core.flatMap$1(makeSpanScoped(name, options), span => core.fiberRefLocallyWith(self, core.currentTracerSpan, List_dist_effectList.prepend(span))));
+const withSpanScoped = /*#__PURE__*/Function_dist_effectFunction.dual(args => typeof args[0] !== "string", (self, name, options) => core.flatMap$1(makeSpanScoped(name, options), span => coreEffect.provideService(self, core.spanTag, span)));
 
 exports.FiberRuntime = FiberRuntime;
 exports.Listeners = Listeners;
@@ -2962,8 +2956,6 @@ exports.scopeWith = scopeWith;
 exports.scopedEffect = scopedEffect;
 exports.sequentialFinalizers = sequentialFinalizers;
 exports.set = set;
-exports.setParentSpan = setParentSpan;
-exports.setSpan = setSpan;
 exports.simple = simple;
 exports.snapshot = snapshot;
 exports.stringLogger = stringLogger;

package/dist/{fiberRuntime-4691f31b.cjs.prod.js → fiberRuntime-f1e80ca7.cjs.prod.js}

@@ -5,40 +5,40 @@ var Chunk_dist_effectChunk = require('../Chunk/dist/effect-Chunk.cjs.prod.js');
 var Context_dist_effectContext = require('../Context/dist/effect-Context.cjs.prod.js');
 var Deferred_dist_effectDeferred = require('../Deferred/dist/effect-Deferred.cjs.prod.js');
 var ExecutionStrategy_dist_effectExecutionStrategy = require('./ExecutionStrategy-4808fe5d.cjs.prod.js');
-var FiberId_dist_effectFiberId = require('./FiberId-54d8bd67.cjs.prod.js');
+var FiberId_dist_effectFiberId = require('./FiberId-0f0b7779.cjs.prod.js');
 var FiberRefs_dist_effectFiberRefs = require('../FiberRefs/dist/effect-FiberRefs.cjs.prod.js');
 var FiberRefsPatch_dist_effectFiberRefsPatch = require('../FiberRefsPatch/dist/effect-FiberRefsPatch.cjs.prod.js');
 var FiberStatus_dist_effectFiberStatus = require('../FiberStatus/dist/effect-FiberStatus.cjs.prod.js');
 var Function_dist_effectFunction = require('../Function/dist/effect-Function.cjs.prod.js');
 var HashMap_dist_effectHashMap = require('../HashMap/dist/effect-HashMap.cjs.prod.js');
 var HashSet_dist_effectHashSet = require('../HashSet/dist/effect-HashSet.cjs.prod.js');
-var core = require('./core-84667e8d.cjs.prod.js');
-var defaultServices = require('./defaultServices-4c3bf140.cjs.prod.js');
+var core = require('./core-473934ce.cjs.prod.js');
+var defaultServices = require('./defaultServices-8ea5e664.cjs.prod.js');
 var GlobalValue_dist_effectGlobalValue = require('../GlobalValue/dist/effect-GlobalValue.cjs.prod.js');
-var configProvider = require('./configProvider-098f7113.cjs.prod.js');
-var coreEffect = require('./core-effect-520abd3d.cjs.prod.js');
-var fiber = require('./fiber-a1a5e429.cjs.prod.js');
-var fiberRefs = require('./fiberRefs-f631451c.cjs.prod.js');
+var configProvider = require('./configProvider-ae007b10.cjs.prod.js');
+var coreEffect = require('./core-effect-6666f2dc.cjs.prod.js');
+var fiber = require('./fiber-cbd0613f.cjs.prod.js');
+var fiberRefs = require('./fiberRefs-99808a27.cjs.prod.js');
 var List_dist_effectList = require('../List/dist/effect-List.cjs.prod.js');
 var LogSpan_dist_effectLogSpan = require('../LogSpan/dist/effect-LogSpan.cjs.prod.js');
 var Option_dist_effectOption = require('../Option/dist/effect-Option.cjs.prod.js');
 var Pipeable_dist_effectPipeable = require('../Pipeable/dist/effect-Pipeable.cjs.prod.js');
 var Clock_dist_effectClock = require('../Clock/dist/effect-Clock.cjs.prod.js');
 var Duration_dist_effectDuration = require('../Duration/dist/effect-Duration.cjs.prod.js');
-var boundaries = require('./boundaries-26f0dc82.cjs.prod.js');
-var key = require('./key-9b2f3322.cjs.prod.js');
+var boundaries = require('./boundaries-ebe66d32.cjs.prod.js');
+var key = require('./key-9c7368c8.cjs.prod.js');
 var label = require('./label-a588e6cd.cjs.prod.js');
-var registry = require('./registry-6fbdb4e3.cjs.prod.js');
+var registry = require('./registry-081e18a3.cjs.prod.js');
 var ReadonlyArray_dist_effectReadonlyArray = require('../ReadonlyArray/dist/effect-ReadonlyArray.cjs.prod.js');
 var Effectable = require('./Effectable-6a8a05f1.cjs.prod.js');
-var RuntimeFlagsPatch_dist_effectRuntimeFlagsPatch = require('./RuntimeFlagsPatch-35ed8dee.cjs.prod.js');
+var RuntimeFlagsPatch_dist_effectRuntimeFlagsPatch = require('./RuntimeFlagsPatch-3890e860.cjs.prod.js');
 var MutableRef_dist_effectMutableRef = require('../MutableRef/dist/effect-MutableRef.cjs.prod.js');
 var SortedSet_dist_effectSortedSet = require('../SortedSet/dist/effect-SortedSet.cjs.prod.js');
 var Differ_dist_effectDiffer = require('../Differ/dist/effect-Differ.cjs.prod.js');
 var Equal_dist_effectEqual = require('../Equal/dist/effect-Equal.cjs.prod.js');
 var LogLevel_dist_effectLogLevel = require('../LogLevel/dist/effect-LogLevel.cjs.prod.js');
 var Predicate_dist_effectPredicate = require('../Predicate/dist/effect-Predicate.cjs.prod.js');
-var Ref_dist_effectRef = require('./Ref-23b67ad9.cjs.prod.js');
+var Ref_dist_effectRef = require('./Ref-00103de4.cjs.prod.js');
 var Scheduler_dist_effectScheduler = require('../Scheduler/dist/effect-Scheduler.cjs.prod.js');
 
 /** @internal */
@@ -1027,7 +1027,7 @@ class FiberRuntime {
       fiberStarted.unsafeUpdate(1, tags);
       fiberActive.unsafeUpdate(1, tags);
     }
-    this._tracer = Context_dist_effectContext.get(this.getFiberRef(defaultServices.currentServices), defaultServices.tracerTag);
+    this._tracer = Context_dist_effectContext.get(this.getFiberRef(defaultServices.currentServices), core.tracerTag);
   }
 
   /**
@@ -1260,7 +1260,7 @@ class FiberRuntime {
     this.refreshRefCache();
   }
   refreshRefCache() {
-    this._tracer = Context_dist_effectContext.get(this.getFiberRef(defaultServices.currentServices), defaultServices.tracerTag);
+    this._tracer = Context_dist_effectContext.get(this.getFiberRef(defaultServices.currentServices), core.tracerTag);
     this._supervisor = this.getFiberRef(currentSupervisor);
     this._scheduler = this.getFiberRef(Scheduler_dist_effectScheduler.currentScheduler);
   }
@@ -2029,7 +2029,7 @@ const tracerLogger = /*#__PURE__*/makeLogger(({
   logLevel,
   message
 }) => {
-  const span = Option_dist_effectOption.flatMap(fiberRefs.get(context, core.currentTracerSpan), List_dist_effectList.head);
+  const span = Option_dist_effectOption.flatMap(fiberRefs.get(context, core.currentContext), Context_dist_effectContext.getOption(core.spanTag));
   const clockService = Option_dist_effectOption.map(fiberRefs.get(context, defaultServices.currentServices), _ => Context_dist_effectContext.get(_, defaultServices.clockTag));
   if (span._tag === "None" || span.value._tag === "ExternalSpan" || clockService._tag === "None") {
     return;
@@ -2852,16 +2852,10 @@ const interruptWhenPossible = /*#__PURE__*/Function_dist_effectFunction.dual(2,
 const makeSpanScoped = (name, options) => acquireRelease(coreEffect.makeSpan(name, options), (span, exit) => core.flatMap$1(coreEffect.currentTimeNanosTracing, endTime => core.sync(() => span.end(endTime, exit))));
 
 /* @internal */
-const setSpan = (name, options) => core.tap(makeSpanScoped(name, options), span => setParentSpan(span));
-
-/* @internal */
-const withTracerScoped = value => fiberRefLocallyScopedWith(defaultServices.currentServices, Context_dist_effectContext.add(defaultServices.tracerTag, value));
-
-/* @internal */
-const setParentSpan = span => fiberRefLocallyScopedWith(core.currentTracerSpan, List_dist_effectList.prepend(span));
+const withTracerScoped = value => fiberRefLocallyScopedWith(defaultServices.currentServices, Context_dist_effectContext.add(core.tracerTag, value));
 
 /** @internal */
-const withSpanScoped = /*#__PURE__*/Function_dist_effectFunction.dual(args => typeof args[0] !== "string", (self, name, options) => core.flatMap$1(makeSpanScoped(name, options), span => core.fiberRefLocallyWith(self, core.currentTracerSpan, List_dist_effectList.prepend(span))));
+const withSpanScoped = /*#__PURE__*/Function_dist_effectFunction.dual(args => typeof args[0] !== "string", (self, name, options) => core.flatMap$1(makeSpanScoped(name, options), span => coreEffect.provideService(self, core.spanTag, span)));
 
 exports.FiberRuntime = FiberRuntime;
 exports.Listeners = Listeners;
@@ -2962,8 +2956,6 @@ exports.scopeWith = scopeWith;
 exports.scopedEffect = scopedEffect;
 exports.sequentialFinalizers = sequentialFinalizers;
 exports.set = set;
-exports.setParentSpan = setParentSpan;
-exports.setSpan = setSpan;
 exports.simple = simple;
 exports.snapshot = snapshot;
 exports.stringLogger = stringLogger;

package/dist/{groupBy-5174c302.cjs.prod.js → groupBy-30f6e9ba.cjs.prod.js}

@@ -9,10 +9,10 @@ var Function_dist_effectFunction = require('../Function/dist/effect-Function.cjs
 var Option_dist_effectOption = require('../Option/dist/effect-Option.cjs.prod.js');
 var Pipeable_dist_effectPipeable = require('../Pipeable/dist/effect-Pipeable.cjs.prod.js');
 var Queue_dist_effectQueue = require('../Queue/dist/effect-Queue.cjs.prod.js');
-var Ref_dist_effectRef = require('./Ref-23b67ad9.cjs.prod.js');
-var sink = require('./sink-95371737.cjs.prod.js');
-var stream = require('./stream-254329d0.cjs.prod.js');
-var take = require('./take-981a87eb.cjs.prod.js');
+var Ref_dist_effectRef = require('./Ref-00103de4.cjs.prod.js');
+var sink = require('./sink-9208df8d.cjs.prod.js');
+var stream = require('./stream-e19805ca.cjs.prod.js');
+var take = require('./take-114476e5.cjs.prod.js');
 
 /** @internal */
 const GroupBySymbolKey = "effect/GroupBy";

package/dist/{groupBy-239a6e6e.cjs.dev.js → groupBy-8ae74e3b.cjs.dev.js}

@@ -9,10 +9,10 @@ var Function_dist_effectFunction = require('../Function/dist/effect-Function.cjs
 var Option_dist_effectOption = require('../Option/dist/effect-Option.cjs.dev.js');
 var Pipeable_dist_effectPipeable = require('../Pipeable/dist/effect-Pipeable.cjs.dev.js');
 var Queue_dist_effectQueue = require('../Queue/dist/effect-Queue.cjs.dev.js');
-var Ref_dist_effectRef = require('./Ref-c75b5362.cjs.dev.js');
-var sink = require('./sink-e4280f95.cjs.dev.js');
-var stream = require('./stream-c498ce8a.cjs.dev.js');
-var take = require('./take-bfd0a3ed.cjs.dev.js');
+var Ref_dist_effectRef = require('./Ref-f990026b.cjs.dev.js');
+var sink = require('./sink-1794329b.cjs.dev.js');
+var stream = require('./stream-09aeeac3.cjs.dev.js');
+var take = require('./take-d4fa1beb.cjs.dev.js');
 
 /** @internal */
 const GroupBySymbolKey = "effect/GroupBy";

package/dist/{key-9b2f3322.cjs.prod.js → key-9c7368c8.cjs.prod.js}

@@ -4,7 +4,7 @@ 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 HashSet_dist_effectHashSet = require('../HashSet/dist/effect-HashSet.cjs.prod.js');
-var keyType = require('./keyType-4ec0b247.cjs.prod.js');
+var keyType = require('./keyType-2ae6a00e.cjs.prod.js');
 var label = require('./label-a588e6cd.cjs.prod.js');
 var Option_dist_effectOption = require('../Option/dist/effect-Option.cjs.prod.js');
 var Pipeable_dist_effectPipeable = require('../Pipeable/dist/effect-Pipeable.cjs.prod.js');