@effect/opentelemetry 0.60.0 → 4.0.0-beta.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-present The Contributors
+Copyright (c) 2023 Effectful Technologies Inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/{dts/Logger.d.ts → Logger.d.ts}

@@ -3,37 +3,43 @@
  */
 import * as Otel from "@opentelemetry/sdk-logs";
 import type { NonEmptyReadonlyArray } from "effect/Array";
-import * as Context from "effect/Context";
 import type { DurationInput } from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Logger from "effect/Logger";
-import { Resource } from "./Resource.js";
-declare const OtelLoggerProvider_base: Context.TagClass<OtelLoggerProvider, "@effect/opentelemetry/Logger/OtelLoggerProvider", Otel.LoggerProvider>;
+import * as ServiceMap from "effect/ServiceMap";
+import { Resource } from "./Resource.ts";
+declare const OtelLoggerProvider_base: ServiceMap.ServiceClass<OtelLoggerProvider, "@effect/opentelemetry/Logger/OtelLoggerProvider", Otel.LoggerProvider>;
 /**
  * @since 1.0.0
- * @category tags
+ * @category Services
  */
 export declare class OtelLoggerProvider extends OtelLoggerProvider_base {
 }
 /**
  * @since 1.0.0
- * @category constructors
+ * @category Constructors
  */
 export declare const make: Effect.Effect<Logger.Logger<unknown, void>, never, OtelLoggerProvider>;
 /**
  * @since 1.0.0
- * @category layers
+ * @category Layers
  */
-export declare const layerLoggerAdd: Layer.Layer<never, never, OtelLoggerProvider>;
+export declare const layer: (options: {
+    /**
+     * If set to `true`, the OpenTelemetry logger will be merged with existing
+     * loggers in the application.
+     *
+     * If set to `false`, the OpenTelemetry logger will replace all existing
+     * loggers in the application.
+     *
+     * Defaults to `true`.
+     */
+    readonly mergeWithExisting?: boolean | undefined;
+}) => Layer.Layer<never, never, OtelLoggerProvider>;
 /**
  * @since 1.0.0
- * @category layers
- */
-export declare const layerLoggerReplace: Layer.Layer<never, never, OtelLoggerProvider>;
-/**
- * @since 1.0.0
- * @category layers
+ * @category Layers
  */
 export declare const layerLoggerProvider: (processor: Otel.LogRecordProcessor | NonEmptyReadonlyArray<Otel.LogRecordProcessor>, config?: Omit<Otel.LoggerProviderConfig, "resource"> & {
     readonly shutdownTimeout?: DurationInput | undefined;

package/dist/Logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../src/Logger.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,IAAI,MAAM,yBAAyB,CAAA;AAC/C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAGzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAG/C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;;AAExC;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,uBAGc;CAAG;AAEzD;;;GAGG;AACH,eAAO,MAAM,IAAI,EAAE,MAAM,CAAC,MAAM,CAC9B,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,EAC5B,KAAK,EACL,kBAAkB,CAqClB,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS;IAC7B;;;;;;;;OAQG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CACjD,KAAG,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,kBAAkB,CAG5C,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAC9B,WAAW,IAAI,CAAC,kBAAkB,GAAG,qBAAqB,CAAC,IAAI,CAAC,kBAAkB,CAAC,EACnF,SAAS,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,UAAU,CAAC,GAAG;IACrD,QAAQ,CAAC,eAAe,CAAC,EAAE,aAAa,GAAG,SAAS,CAAA;CACrD,KACA,KAAK,CAAC,KAAK,CAAC,kBAAkB,EAAE,KAAK,EAAE,QAAQ,CAqB/C,CAAA"}

package/dist/Logger.js

@@ -0,0 +1,76 @@
+/**
+ * @since 1.0.0
+ */
+import * as Otel from "@opentelemetry/sdk-logs";
+import * as Arr from "effect/Array";
+import * as Clock from "effect/Clock";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Logger from "effect/Logger";
+import * as LogLevel from "effect/LogLevel";
+import * as Predicate from "effect/Predicate";
+import * as ServiceMap from "effect/ServiceMap";
+import * as Tracer from "effect/Tracer";
+import { unknownToAttributeValue } from "./internal/attributes.js";
+import { Resource } from "./Resource.js";
+/**
+ * @since 1.0.0
+ * @category Services
+ */
+export class OtelLoggerProvider extends /*#__PURE__*/ServiceMap.Service()("@effect/opentelemetry/Logger/OtelLoggerProvider") {}
+/**
+ * @since 1.0.0
+ * @category Constructors
+ */
+export const make = /*#__PURE__*/Effect.gen(function* () {
+  const loggerProvider = yield* OtelLoggerProvider;
+  const clock = yield* Clock.Clock;
+  const otelLogger = loggerProvider.getLogger("@effect/opentelemetry");
+  return Logger.make(options => {
+    const attributes = {
+      fiberId: options.fiber.id
+    };
+    const span = ServiceMap.getOrUndefined(options.fiber.services, Tracer.ParentSpan);
+    if (Predicate.isNotUndefined(span)) {
+      attributes.spanId = span.spanId;
+      attributes.traceId = span.traceId;
+    }
+    // TODO: add back after log spans / annotations
+    // for (const [key, value] of options.annotations) {
+    //   attributes[key] = unknownToAttributeValue(value)
+    // }
+    // const now = options.date.getTime()
+    // for (const span of options.spans) {
+    //   attributes[`logSpan.${span.label}`] = `${now - span.startTime}ms`
+    // }
+    const message = Arr.ensure(options.message).map(unknownToAttributeValue);
+    otelLogger.emit({
+      body: message.length === 1 ? message[0] : message,
+      severityText: options.logLevel,
+      severityNumber: LogLevel.getOrdinal(options.logLevel),
+      timestamp: options.date,
+      observedTimestamp: clock.currentTimeMillisUnsafe(),
+      attributes
+    });
+  });
+});
+/**
+ * @since 1.0.0
+ * @category Layers
+ */
+export const layer = options => Logger.layer([make], {
+  mergeWithExisting: options.mergeWithExisting ?? true
+});
+/**
+ * @since 1.0.0
+ * @category Layers
+ */
+export const layerLoggerProvider = (processor, config) => Layer.effect(OtelLoggerProvider, Effect.gen(function* () {
+  const resource = yield* Resource;
+  return yield* Effect.acquireRelease(Effect.sync(() => new Otel.LoggerProvider({
+    ...(config ?? undefined),
+    processors: Arr.ensure(processor),
+    resource
+  })), provider => Effect.promise(() => provider.forceFlush().then(() => provider.shutdown())).pipe(Effect.ignore, Effect.interruptible, Effect.timeoutOption(config?.shutdownTimeout ?? 3000)));
+}));
+//# sourceMappingURL=Logger.js.map

package/dist/Logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Logger.js","names":["Otel","Arr","Clock","Effect","Layer","Logger","LogLevel","Predicate","ServiceMap","Tracer","unknownToAttributeValue","Resource","OtelLoggerProvider","Service","make","gen","loggerProvider","clock","otelLogger","getLogger","options","attributes","fiberId","fiber","id","span","getOrUndefined","services","ParentSpan","isNotUndefined","spanId","traceId","message","ensure","map","emit","body","length","severityText","logLevel","severityNumber","getOrdinal","timestamp","date","observedTimestamp","currentTimeMillisUnsafe","layer","mergeWithExisting","layerLoggerProvider","processor","config","effect","resource","acquireRelease","sync","LoggerProvider","undefined","processors","provider","promise","forceFlush","then","shutdown","pipe","ignore","interruptible","timeoutOption","shutdownTimeout"],"sources":["../src/Logger.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/Metrics.d.ts

@@ -0,0 +1,76 @@
+/**
+ * @since 1.0.0
+ */
+import type { MetricProducer, MetricReader } from "@opentelemetry/sdk-metrics";
+import type * as Arr from "effect/Array";
+import type { DurationInput } from "effect/Duration";
+import * as Effect from "effect/Effect";
+import type { LazyArg } from "effect/Function";
+import * as Layer from "effect/Layer";
+import type * as Scope from "effect/Scope";
+import { Resource } from "./Resource.ts";
+/**
+ * Determines how metric values relate to the time interval over which they
+ * are aggregated.
+ *
+ * - `cumulative`: Reports total since a fixed start time. Each data point
+ *   depends on all previous measurements. This is the default behavior.
+ *
+ * - `delta`: Reports changes since the last export. Each interval is
+ *   independent with no dependency on previous measurements.
+ *
+ * @since 1.0.0
+ * @category Models
+ */
+export type TemporalityPreference = "cumulative" | "delta";
+/**
+ * Creates an OpenTelemetry metric producer from Effect metrics.
+ *
+ * @since 1.0.0
+ * @category Constructors
+ */
+export declare const makeProducer: (temporality?: TemporalityPreference) => Effect.Effect<MetricProducer, never, Resource>;
+/**
+ * Registers a metric producer with one or more metric readers.
+ *
+ * @since 1.0.0
+ * @category Constructors
+ */
+export declare const registerProducer: (self: MetricProducer, metricReader: LazyArg<MetricReader | Arr.NonEmptyReadonlyArray<MetricReader>>, options?: {
+    readonly shutdownTimeout?: DurationInput | undefined;
+}) => Effect.Effect<Array<any>, never, Scope.Scope>;
+/**
+ * Creates a Layer that registers a metric producer with metric readers.
+ *
+ * @example
+ * ```ts
+ * import { Metrics } from "@effect/opentelemetry"
+ * import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics"
+ * import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http"
+ *
+ * const metricExporter = new OTLPMetricExporter({ url: "<your-otel-url>" })
+ *
+ * // Use delta temporality for backends like Datadog or Dynatrace
+ * const metricsLayer = Metrics.layer(
+ *   () => new PeriodicExportingMetricReader({
+ *     exporter: metricExporter,
+ *     exportIntervalMillis: 10000
+ *   }),
+ *   { temporality: "delta" }
+ * )
+ *
+ * // Use cumulative temporality for backends like Prometheus (default)
+ * const cumulativeLayer = Metrics.layer(
+ *   () => new PeriodicExportingMetricReader({ exporter: metricExporter }),
+ *   { temporality: "cumulative" }
+ * )
+ * ```
+ *
+ * @since 1.0.0
+ * @category Layers
+ */
+export declare const layer: (evaluate: LazyArg<MetricReader | Arr.NonEmptyReadonlyArray<MetricReader>>, options?: {
+    readonly shutdownTimeout?: DurationInput | undefined;
+    readonly temporality?: TemporalityPreference | undefined;
+}) => Layer.Layer<never, never, Resource>;
+//# sourceMappingURL=Metrics.d.ts.map

package/dist/Metrics.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Metrics.d.ts","sourceRoot":"","sources":["../src/Metrics.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAC9E,OAAO,KAAK,KAAK,GAAG,MAAM,cAAc,CAAA;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAE1C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAExC;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,qBAAqB,GAAG,YAAY,GAAG,OAAO,CAAA;AAE1D;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,cAAc,qBAAqB,KAAG,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE,KAAK,EAAE,QAAQ,CAK5G,CAAA;AAEJ;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAC3B,MAAM,cAAc,EACpB,cAAc,OAAO,CAAC,YAAY,GAAG,GAAG,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC,EAC7E,UAAU;IACR,QAAQ,CAAC,eAAe,CAAC,EAAE,aAAa,GAAG,SAAS,CAAA;CACrD,KACA,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAkB5C,CAAA;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,eAAO,MAAM,KAAK,GAChB,UAAU,OAAO,CAAC,YAAY,GAAG,GAAG,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC,EACzE,UAAU;IACR,QAAQ,CAAC,eAAe,CAAC,EAAE,aAAa,GAAG,SAAS,CAAA;IACpD,QAAQ,CAAC,WAAW,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAA;CACzD,KACA,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAIjC,CAAA"}

package/dist/Metrics.js

@@ -0,0 +1,59 @@
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import { MetricProducerImpl } from "./internal/metrics.js";
+import { Resource } from "./Resource.js";
+/**
+ * Creates an OpenTelemetry metric producer from Effect metrics.
+ *
+ * @since 1.0.0
+ * @category Constructors
+ */
+export const makeProducer = temporality => Effect.gen(function* () {
+  const resource = yield* Resource;
+  const services = yield* Effect.services();
+  return new MetricProducerImpl(resource, services, temporality);
+});
+/**
+ * Registers a metric producer with one or more metric readers.
+ *
+ * @since 1.0.0
+ * @category Constructors
+ */
+export const registerProducer = (self, metricReader, options) => Effect.acquireRelease(Effect.sync(() => {
+  const reader = metricReader();
+  const readers = Array.isArray(reader) ? reader : [reader];
+  readers.forEach(reader => reader.setMetricProducer(self));
+  return readers;
+}), readers => Effect.promise(() => Promise.all(readers.map(reader => reader.shutdown()))).pipe(Effect.ignore, Effect.interruptible, Effect.timeoutOption(options?.shutdownTimeout ?? 3000)));
+/**
+ * Creates a Layer that registers a metric producer with metric readers.
+ *
+ * @example
+ * ```ts
+ * import { Metrics } from "@effect/opentelemetry"
+ * import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics"
+ * import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http"
+ *
+ * const metricExporter = new OTLPMetricExporter({ url: "<your-otel-url>" })
+ *
+ * // Use delta temporality for backends like Datadog or Dynatrace
+ * const metricsLayer = Metrics.layer(
+ *   () => new PeriodicExportingMetricReader({
+ *     exporter: metricExporter,
+ *     exportIntervalMillis: 10000
+ *   }),
+ *   { temporality: "delta" }
+ * )
+ *
+ * // Use cumulative temporality for backends like Prometheus (default)
+ * const cumulativeLayer = Metrics.layer(
+ *   () => new PeriodicExportingMetricReader({ exporter: metricExporter }),
+ *   { temporality: "cumulative" }
+ * )
+ * ```
+ *
+ * @since 1.0.0
+ * @category Layers
+ */
+export const layer = (evaluate, options) => Layer.effectDiscard(Effect.flatMap(makeProducer(options?.temporality), producer => registerProducer(producer, evaluate, options)));
+//# sourceMappingURL=Metrics.js.map

package/dist/Metrics.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Metrics.js","names":["Effect","Layer","MetricProducerImpl","Resource","makeProducer","temporality","gen","resource","services","registerProducer","self","metricReader","options","acquireRelease","sync","reader","readers","Array","isArray","forEach","setMetricProducer","promise","Promise","all","map","shutdown","pipe","ignore","interruptible","timeoutOption","shutdownTimeout","layer","evaluate","effectDiscard","flatMap","producer"],"sources":["../src/Metrics.ts"],"sourcesContent":[null],"mappings":"AAMA,OAAO,KAAKA,MAAM,MAAM,eAAe;AAEvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AAErC,SAASC,kBAAkB,QAAQ,uBAAuB;AAC1D,SAASC,QAAQ,QAAQ,eAAe;AAiBxC;;;;;;AAMA,OAAO,MAAMC,YAAY,GAAIC,WAAmC,IAC9DL,MAAM,CAACM,GAAG,CAAC,aAAS;EAClB,MAAMC,QAAQ,GAAG,OAAOJ,QAAQ;EAChC,MAAMK,QAAQ,GAAG,OAAOR,MAAM,CAACQ,QAAQ,EAAS;EAChD,OAAO,IAAIN,kBAAkB,CAACK,QAAQ,EAAEC,QAAQ,EAAEH,WAAW,CAAC;AAChE,CAAC,CAAC;AAEJ;;;;;;AAMA,OAAO,MAAMI,gBAAgB,GAAGA,CAC9BC,IAAoB,EACpBC,YAA6E,EAC7EC,OAEC,KAEDZ,MAAM,CAACa,cAAc,CACnBb,MAAM,CAACc,IAAI,CAAC,MAAK;EACf,MAAMC,MAAM,GAAGJ,YAAY,EAAE;EAC7B,MAAMK,OAAO,GAAwBC,KAAK,CAACC,OAAO,CAACH,MAAM,CAAC,GAAGA,MAAM,GAAG,CAACA,MAAM,CAAQ;EACrFC,OAAO,CAACG,OAAO,CAAEJ,MAAM,IAAKA,MAAM,CAACK,iBAAiB,CAACV,IAAI,CAAC,CAAC;EAC3D,OAAOM,OAAO;AAChB,CAAC,CAAC,EACDA,OAAO,IACNhB,MAAM,CAACqB,OAAO,CAAC,MACbC,OAAO,CAACC,GAAG,CACTP,OAAO,CAACQ,GAAG,CAAET,MAAM,IAAKA,MAAM,CAACU,QAAQ,EAAE,CAAC,CAC3C,CACF,CAACC,IAAI,CACJ1B,MAAM,CAAC2B,MAAM,EACb3B,MAAM,CAAC4B,aAAa,EACpB5B,MAAM,CAAC6B,aAAa,CAACjB,OAAO,EAAEkB,eAAe,IAAI,IAAI,CAAC,CACvD,CACJ;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8BA,OAAO,MAAMC,KAAK,GAAGA,CACnBC,QAAyE,EACzEpB,OAGC,KAEDX,KAAK,CAACgC,aAAa,CAACjC,MAAM,CAACkC,OAAO,CAChC9B,YAAY,CAACQ,OAAO,EAAEP,WAAW,CAAC,EACjC8B,QAAQ,IAAK1B,gBAAgB,CAAC0B,QAAQ,EAAEH,QAAQ,EAAEpB,OAAO,CAAC,CAC5D,CAAC","ignoreList":[]}

package/dist/{dts/NodeSdk.d.ts → NodeSdk.d.ts}

@@ -1,7 +1,7 @@
 /**
  * @since 1.0.0
  */
-import type * as OtelApi from "@opentelemetry/api";
+import type * as Otel from "@opentelemetry/api";
 import type { LoggerProviderConfig, LogRecordProcessor } from "@opentelemetry/sdk-logs";
 import type { MetricReader } from "@opentelemetry/sdk-metrics";
 import type { SpanProcessor, TracerConfig } from "@opentelemetry/sdk-trace-base";
@@ -10,45 +10,48 @@ import type { DurationInput } from "effect/Duration";
 import * as Effect from "effect/Effect";
 import { type LazyArg } from "effect/Function";
 import * as Layer from "effect/Layer";
-import * as Resource from "./Resource.js";
-import * as Tracer from "./Tracer.js";
+import * as Metrics from "./Metrics.ts";
+import * as Resource from "./Resource.ts";
+import * as Tracer from "./Tracer.ts";
 /**
  * @since 1.0.0
- * @category model
+ * @category Models
  */
 export interface Configuration {
     readonly spanProcessor?: SpanProcessor | ReadonlyArray<SpanProcessor> | undefined;
     readonly tracerConfig?: Omit<TracerConfig, "resource"> | undefined;
     readonly metricReader?: MetricReader | ReadonlyArray<MetricReader> | undefined;
+    readonly metricTemporality?: Metrics.TemporalityPreference | undefined;
     readonly logRecordProcessor?: LogRecordProcessor | ReadonlyArray<LogRecordProcessor> | undefined;
     readonly loggerProviderConfig?: Omit<LoggerProviderConfig, "resource"> | undefined;
+    readonly loggerMergeWithExisting?: boolean | undefined;
     readonly resource?: {
         readonly serviceName: string;
         readonly serviceVersion?: string;
-        readonly attributes?: OtelApi.Attributes;
+        readonly attributes?: Otel.Attributes;
     } | undefined;
     readonly shutdownTimeout?: DurationInput | undefined;
 }
 /**
  * @since 1.0.0
- * @category layers
+ * @category Layers
  */
 export declare const layerTracerProvider: (processor: SpanProcessor | NonEmptyReadonlyArray<SpanProcessor>, config?: Omit<TracerConfig, "resource"> & {
     readonly shutdownTimeout?: DurationInput | undefined;
 }) => Layer.Layer<Tracer.OtelTracerProvider, never, Resource.Resource>;
 /**
  * @since 1.0.0
- * @category layer
+ * @category Layers
  */
 export declare const layer: {
     /**
      * @since 1.0.0
-     * @category layer
+     * @category Layers
      */
     (evaluate: LazyArg<Configuration>): Layer.Layer<Resource.Resource>;
     /**
      * @since 1.0.0
-     * @category layer
+     * @category Layers
      */
     <R, E>(evaluate: Effect.Effect<Configuration, E, R>): Layer.Layer<Resource.Resource, E, R>;
 };

package/dist/NodeSdk.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NodeSdk.d.ts","sourceRoot":"","sources":["../src/NodeSdk.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAC/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AACvF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAEhF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAY,KAAK,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACxD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,aAAa,CAAC,EAAE,aAAa,GAAG,aAAa,CAAC,aAAa,CAAC,GAAG,SAAS,CAAA;IACjF,QAAQ,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,GAAG,SAAS,CAAA;IAClE,QAAQ,CAAC,YAAY,CAAC,EAAE,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC,GAAG,SAAS,CAAA;IAC9E,QAAQ,CAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAA;IACtE,QAAQ,CAAC,kBAAkB,CAAC,EAAE,kBAAkB,GAAG,aAAa,CAAC,kBAAkB,CAAC,GAAG,SAAS,CAAA;IAChG,QAAQ,CAAC,oBAAoB,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,UAAU,CAAC,GAAG,SAAS,CAAA;IAClF,QAAQ,CAAC,uBAAuB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACtD,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAClB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;QAC5B,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;QAChC,QAAQ,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,UAAU,CAAA;KACtC,GAAG,SAAS,CAAA;IACb,QAAQ,CAAC,eAAe,CAAC,EAAE,aAAa,GAAG,SAAS,CAAA;CACrD;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAC9B,WAAW,aAAa,GAAG,qBAAqB,CAAC,aAAa,CAAC,EAC/D,SAAS,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,GAAG;IACxC,QAAQ,CAAC,eAAe,CAAC,EAAE,aAAa,GAAG,SAAS,CAAA;CACrD,KACA,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,kBAAkB,EAAE,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAsB/D,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE;IAClB;;;OAGG;IACH,CAAC,QAAQ,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAClE;;;OAGG;IACH,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;CA2CzF,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAuB,CAAA"}

package/dist/{esm/NodeSdk.js → NodeSdk.js}

@@ -2,35 +2,44 @@ import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
 import * as Effect from "effect/Effect";
 import { constant } from "effect/Function";
 import * as Layer from "effect/Layer";
-import { isNonEmpty } from "./internal/utils.js";
+import { isNonEmpty } from "./internal/utilities.js";
 import * as Logger from "./Logger.js";
 import * as Metrics from "./Metrics.js";
 import * as Resource from "./Resource.js";
 import * as Tracer from "./Tracer.js";
 /**
  * @since 1.0.0
- * @category layers
+ * @category Layers
  */
-export const layerTracerProvider = (processor, config) => Layer.scoped(Tracer.OtelTracerProvider, Effect.flatMap(Resource.Resource, resource => Effect.acquireRelease(Effect.sync(() => {
-  const provider = new NodeTracerProvider({
-    ...(config ?? undefined),
-    resource,
-    spanProcessors: Array.isArray(processor) ? processor : [processor]
-  });
-  return provider;
-}), provider => Effect.promise(() => provider.forceFlush().then(() => provider.shutdown())).pipe(Effect.ignoreLogged, Effect.interruptible, Effect.timeoutOption(config?.shutdownTimeout ?? 3000)))));
+export const layerTracerProvider = (processor, config) => Layer.effect(Tracer.OtelTracerProvider, Effect.gen(function* () {
+  const resource = yield* Resource.Resource;
+  return yield* Effect.acquireRelease(Effect.sync(() => {
+    const provider = new NodeTracerProvider({
+      ...(config ?? undefined),
+      resource,
+      spanProcessors: Array.isArray(processor) ? processor : [processor]
+    });
+    return provider;
+  }), provider => Effect.promise(() => provider.forceFlush().then(() => provider.shutdown())).pipe(Effect.ignore, Effect.interruptible, Effect.timeoutOption(config?.shutdownTimeout ?? 3000)));
+}));
 /**
  * @since 1.0.0
- * @category layer
+ * @category Layers
  */
-export const layer = evaluate => Layer.unwrapEffect(Effect.map(Effect.isEffect(evaluate) ? evaluate : Effect.sync(evaluate), config => {
+export const layer = evaluate => Layer.unwrap(Effect.gen(function* () {
+  const config = yield* Effect.isEffect(evaluate) ? evaluate : Effect.sync(evaluate);
   const ResourceLive = Resource.layerFromEnv(config.resource && Resource.configToAttributes(config.resource));
   const TracerLive = isNonEmpty(config.spanProcessor) ? Layer.provide(Tracer.layer, layerTracerProvider(config.spanProcessor, {
     ...config.tracerConfig,
     shutdownTimeout: config.shutdownTimeout
   })) : Layer.empty;
-  const MetricsLive = isNonEmpty(config.metricReader) ? Metrics.layer(constant(config.metricReader), config) : Layer.empty;
-  const LoggerLive = isNonEmpty(config.logRecordProcessor) ? Layer.provide(Logger.layerLoggerAdd, Logger.layerLoggerProvider(config.logRecordProcessor, {
+  const MetricsLive = isNonEmpty(config.metricReader) ? Metrics.layer(constant(config.metricReader), {
+    shutdownTimeout: config.shutdownTimeout,
+    temporality: config.metricTemporality
+  }) : Layer.empty;
+  const LoggerLive = isNonEmpty(config.logRecordProcessor) ? Layer.provide(Logger.layer({
+    mergeWithExisting: config.loggerMergeWithExisting
+  }), Logger.layerLoggerProvider(config.logRecordProcessor, {
     ...config.loggerProviderConfig,
     shutdownTimeout: config.shutdownTimeout
   })) : Layer.empty;

package/dist/NodeSdk.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NodeSdk.js","names":["NodeTracerProvider","Effect","constant","Layer","isNonEmpty","Logger","Metrics","Resource","Tracer","layerTracerProvider","processor","config","effect","OtelTracerProvider","gen","resource","acquireRelease","sync","provider","undefined","spanProcessors","Array","isArray","promise","forceFlush","then","shutdown","pipe","ignore","interruptible","timeoutOption","shutdownTimeout","layer","evaluate","unwrap","isEffect","ResourceLive","layerFromEnv","configToAttributes","TracerLive","spanProcessor","provide","tracerConfig","empty","MetricsLive","metricReader","temporality","metricTemporality","LoggerLive","logRecordProcessor","mergeWithExisting","loggerMergeWithExisting","layerLoggerProvider","loggerProviderConfig","mergeAll","provideMerge","layerEmpty"],"sources":["../src/NodeSdk.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/{dts/Resource.d.ts → Resource.d.ts}

@@ -4,21 +4,17 @@
 import type * as OtelApi from "@opentelemetry/api";
 import * as Resources from "@opentelemetry/resources";
 import * as Layer from "effect/Layer";
+import * as ServiceMap from "effect/ServiceMap";
+declare const Resource_base: ServiceMap.ServiceClass<Resource, "@effect/opentelemetry/Resource", Resources.Resource>;
 /**
  * @since 1.0.0
- * @category identifier
+ * @category Services
  */
-export interface Resource {
-    readonly _: unique symbol;
+export declare class Resource extends Resource_base {
 }
 /**
  * @since 1.0.0
- * @category tag
- */
-export declare const Resource: import("effect/Context").Tag<Resource, Resources.Resource>;
-/**
- * @since 1.0.0
- * @category layer
+ * @category Layers
  */
 export declare const layer: (config: {
     readonly serviceName: string;
@@ -27,7 +23,7 @@ export declare const layer: (config: {
 }) => Layer.Layer<Resource, never, never>;
 /**
  * @since 1.0.0
- * @category config
+ * @category Configuration
  */
 export declare const configToAttributes: (options: {
     readonly serviceName: string;
@@ -36,12 +32,13 @@ export declare const configToAttributes: (options: {
 }) => Record<string, string>;
 /**
  * @since 1.0.0
- * @category layer
+ * @category Layers
  */
 export declare const layerFromEnv: (additionalAttributes?: OtelApi.Attributes | undefined) => Layer.Layer<Resource>;
 /**
- * @since 2.0.0
- * @category layer
+ * @since 1.0.0
+ * @category Layers
  */
 export declare const layerEmpty: Layer.Layer<Resource, never, never>;
+export {};
 //# sourceMappingURL=Resource.d.ts.map

package/dist/Resource.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Resource.d.ts","sourceRoot":"","sources":["../src/Resource.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAA;AAKrD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;;AAE/C;;;GAGG;AACH,qBAAa,QAAS,SAAQ,aAGO;CAAG;AAExC;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,QAAQ;IAC5B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAChC,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,UAAU,CAAA;CACzC,wCAIE,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,SAAS;IAC1C,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAChC,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,UAAU,CAAA;CACzC,KAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAaxB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY,GACvB,uBACI,OAAO,CAAC,UAAU,GAClB,SAAS,KACZ,KAAK,CAAC,KAAK,CAAC,QAAQ,CA2BpB,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,UAAU,qCAGtB,CAAA"}

package/dist/{esm/Resource.js → Resource.js}

@@ -2,23 +2,22 @@ import * as Resources from "@opentelemetry/resources";
 import * as OtelSemConv from "@opentelemetry/semantic-conventions";
 import * as Arr from "effect/Array";
 import * as Config from "effect/Config";
-import { GenericTag } from "effect/Context";
 import * as Effect from "effect/Effect";
-import { pipe } from "effect/Function";
 import * as Layer from "effect/Layer";
+import * as ServiceMap from "effect/ServiceMap";
 /**
  * @since 1.0.0
- * @category tag
+ * @category Services
  */
-export const Resource = /*#__PURE__*/GenericTag("@effect/opentelemetry/Resource");
+export class Resource extends /*#__PURE__*/ServiceMap.Service()("@effect/opentelemetry/Resource") {}
 /**
  * @since 1.0.0
- * @category layer
+ * @category Layers
  */
 export const layer = config => Layer.succeed(Resource, Resources.resourceFromAttributes(configToAttributes(config)));
 /**
  * @since 1.0.0
- * @category config
+ * @category Configuration
  */
 export const configToAttributes = options => {
   const attributes = {
@@ -34,11 +33,11 @@ export const configToAttributes = options => {
 };
 /**
  * @since 1.0.0
- * @category layer
+ * @category Layers
  */
 export const layerFromEnv = additionalAttributes => Layer.effect(Resource, Effect.gen(function* () {
-  const serviceName = yield* pipe(Config.string("OTEL_SERVICE_NAME"), Config.option, Effect.orDie);
-  const attributes = yield* pipe(Config.string("OTEL_RESOURCE_ATTRIBUTES"), Config.withDefault(""), Config.map(s => {
+  const serviceName = yield* Config.option(Config.string("OTEL_SERVICE_NAME"));
+  const attributes = yield* Config.string("OTEL_RESOURCE_ATTRIBUTES").pipe(Config.withDefault(() => ""), Config.map(s => {
     const attrs = s.split(",");
     return Arr.reduce(attrs, {}, (acc, attr) => {
       const parts = attr.split("=");
@@ -48,7 +47,7 @@ export const layerFromEnv = additionalAttributes => Layer.effect(Resource, Effec
       acc[parts[0].trim()] = parts[1].trim();
       return acc;
     });
-  }), Effect.orDie);
+  }));
   if (serviceName._tag === "Some") {
     attributes[OtelSemConv.ATTR_SERVICE_NAME] = serviceName.value;
   }
@@ -56,10 +55,10 @@ export const layerFromEnv = additionalAttributes => Layer.effect(Resource, Effec
     Object.assign(attributes, additionalAttributes);
   }
   return Resources.resourceFromAttributes(attributes);
-}));
+}).pipe(Effect.orDie));
 /**
- * @since 2.0.0
- * @category layer
+ * @since 1.0.0
+ * @category Layers
  */
 export const layerEmpty = /*#__PURE__*/Layer.succeed(Resource, /*#__PURE__*/Resources.emptyResource());
 //# sourceMappingURL=Resource.js.map

package/dist/Resource.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Resource.js","names":["Resources","OtelSemConv","Arr","Config","Effect","Layer","ServiceMap","Resource","Service","layer","config","succeed","resourceFromAttributes","configToAttributes","options","attributes","undefined","ATTR_SERVICE_NAME","serviceName","ATTR_TELEMETRY_SDK_NAME","ATTR_TELEMETRY_SDK_LANGUAGE","globalThis","document","TELEMETRY_SDK_LANGUAGE_VALUE_NODEJS","TELEMETRY_SDK_LANGUAGE_VALUE_WEBJS","serviceVersion","ATTR_SERVICE_VERSION","layerFromEnv","additionalAttributes","effect","gen","option","string","pipe","withDefault","map","s","attrs","split","reduce","acc","attr","parts","length","trim","_tag","value","Object","assign","orDie","layerEmpty","emptyResource"],"sources":["../src/Resource.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}