@effect/opentelemetry 4.0.0-beta.99 → 4.0.0-rc.108

package/src/OtelTracer.ts

@@ -130,24 +130,20 @@ export const makeExternalSpan = (options: {
   readonly traceFlags?: number | undefined
   readonly traceState?: string | Otel.TraceState | undefined
 }): Tracer.ExternalSpan => {
-  const annotations = Context.mutate(Context.empty(), (annotations) => {
-    let next = annotations
-    if (options.traceFlags !== undefined) {
-      next = Context.add(next, OtelTraceFlags, options.traceFlags)
-    }
+  let annotations = Context.empty()
+  if (options.traceFlags !== undefined) {
+    annotations = Context.add(annotations, OtelTraceFlags, options.traceFlags)
+  }
 
-    if (typeof options.traceState === "string") {
-      try {
-        next = Context.add(next, OtelTraceState, Otel.createTraceState(options.traceState))
-      } catch {
-        //
-      }
-    } else if (options.traceState) {
-      next = Context.add(next, OtelTraceState, options.traceState)
+  if (typeof options.traceState === "string") {
+    try {
+      annotations = Context.add(annotations, OtelTraceState, Otel.createTraceState(options.traceState))
+    } catch {
+      //
     }
-
-    return next
-  })
+  } else if (options.traceState) {
+    annotations = Context.add(annotations, OtelTraceState, options.traceState)
+  }
 
   return {
     _tag: "ExternalSpan",
@@ -314,7 +310,7 @@ const makeOtelSpan = (span: Tracer.Span, clock: Clock.Clock): Otel.Span => {
       return self
     },
     setStatus(status) {
-      exit = Otel.SpanStatusCode.ERROR
+      exit = status.code === Otel.SpanStatusCode.ERROR
         ? Exit.die(status.message ?? "Unknown error")
         : Exit.void
       return self
@@ -535,18 +531,23 @@ export class OtelSpan implements Tracer.Span {
 const isSampled = (traceFlags: Otel.TraceFlags): boolean =>
   (traceFlags & Otel.TraceFlags.SAMPLED) === Otel.TraceFlags.SAMPLED
 
+class OtelParentSpanContext extends Context.Service<
+  OtelParentSpanContext,
+  Otel.SpanContext
+>()("@effect/opentelemetry/Tracer/OtelParentSpanContext") {}
+
 const getOtelParent = (
   tracer: Otel.TraceAPI,
   context: Otel.Context,
   annotations: Context.Context<never>
 ): Option.Option<Tracer.AnySpan> => {
-  const otelParent = tracer.getSpan(context)?.spanContext()
+  const otelParent = tracer.getSpanContext(context)
   if (!otelParent) return Option.none()
   return Option.some(Tracer.externalSpan({
     spanId: otelParent.spanId,
     traceId: otelParent.traceId,
-    sampled: (otelParent.traceFlags & 1) === 1,
-    annotations
+    sampled: isSampled(otelParent.traceFlags),
+    annotations: Context.add(annotations, OtelParentSpanContext, otelParent)
   }))
 }
 
@@ -554,6 +555,17 @@ const makeSpanContext = (
   span: Tracer.AnySpan,
   annotations?: Context.Context<never>
 ): Otel.SpanContext => {
+  const otelParent = Context.getOrUndefined(span.annotations, OtelParentSpanContext)
+  if (otelParent !== undefined) {
+    if (annotations === undefined) return otelParent
+    const traceFlags = extractTraceService(span, annotations, OtelTraceFlags)
+    const traceState = extractTraceService(span, annotations, OtelTraceState)
+    return {
+      ...otelParent,
+      traceFlags: traceFlags ?? otelParent.traceFlags,
+      traceState: traceState ?? otelParent.traceState!
+    }
+  }
   const traceFlags = makeTraceFlags(span, annotations)
   const traceState = makeTraceState(span, annotations)!
   return ({

package/src/Resource.ts

@@ -18,6 +18,7 @@ import * as Config from "effect/Config"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
+import * as Rec from "effect/Record"
 
 /**
  * Service tag for OpenTelemetry metadata attached to emitted telemetry.
@@ -74,7 +75,7 @@ export const layer = (config: {
  * @see {@link layer} for creating a `Resource` layer from explicit metadata
  * @see {@link layerFromEnv} for merging attributes with OpenTelemetry environment variables
  *
- * @category configuration
+ * @category converting
  * @since 4.0.0
  */
 export const configToAttributes = (options: {
@@ -120,7 +121,7 @@ export const layerFromEnv = (
             if (parts.length !== 2) {
               return acc
             }
-            acc[parts[0].trim()] = parts[1].trim()
+            Rec.assignProperty(acc, parts[0].trim(), parts[1].trim())
             return acc
           })
         })
@@ -128,10 +129,10 @@ export const layerFromEnv = (
       if (serviceName._tag === "Some") {
         attributes[OtelSemConv.ATTR_SERVICE_NAME] = serviceName.value
       }
-      if (additionalAttributes) {
-        Object.assign(attributes, additionalAttributes)
-      }
-      return Resources.resourceFromAttributes(attributes)
+      return Resources.resourceFromAttributes({
+        ...attributes,
+        ...additionalAttributes
+      })
     }).pipe(Effect.orDie)
   )
 

package/src/WebSdk.ts

@@ -69,8 +69,9 @@ export const layerTracerProvider = (
           return provider
         }),
         (provider) =>
-          Effect.ignore(
-            Effect.promise(() => provider.forceFlush().then(() => provider.shutdown()))
+          Effect.promise(() => provider.forceFlush()).pipe(
+            Effect.ensuring(Effect.promise(() => provider.shutdown())),
+            Effect.ignore
           )
       )
     })

package/src/internal/attributes.ts

@@ -1,5 +1,6 @@
 import type * as Otel from "@opentelemetry/api"
 import * as Inspectable from "effect/Inspectable"
+import * as Rec from "effect/Record"
 
 const bigint1e9 = BigInt(1_000_000_000)
 
@@ -12,7 +13,7 @@ export const nanosToHrTime = (timestamp: bigint): Otel.HrTime => {
 export const recordToAttributes = (record: Record<string, unknown>): Otel.Attributes => {
   const attributes: Otel.Attributes = {}
   for (const [key, value] of Object.entries(record)) {
-    attributes[key] = unknownToAttributeValue(value)
+    Rec.assignProperty(attributes, key, unknownToAttributeValue(value))
   }
   return attributes
 }

package/src/internal/metrics.ts

@@ -13,6 +13,7 @@ import type { InstrumentDescriptor } from "@opentelemetry/sdk-metrics/build/src/
 import * as Arr from "effect/Array"
 import type * as Context from "effect/Context"
 import * as Metric from "effect/Metric"
+import * as Rec from "effect/Record"
 import type * as Metrics from "../OtelMetrics.ts"
 
 const sdkName = "@effect/opentelemetry/Metrics"
@@ -64,6 +65,10 @@ export class MetricProducerImpl implements MetricProducer {
     this.previousSummaryState = new Map()
   }
 
+  fork(): MetricProducerImpl {
+    return new MetricProducerImpl(this.resource, this.context, this.temporality)
+  }
+
   startTimeFor(name: string, hrTime: HrTime) {
     if (this.startTimes.has(name)) {
       return this.startTimes.get(name)!
@@ -94,7 +99,7 @@ export class MetricProducerImpl implements MetricProducer {
       const state = snapshot[i]
       const attributes = state.attributes
         ? Arr.reduce(Object.entries(state.attributes), {} as Record<string, string>, (acc, [key, value]) => {
-          acc[key] = String(value)
+          Rec.assignProperty(acc, key, String(value))
           return acc
         })
         : {}