@effect/opentelemetry 0.42.9 → 0.43.0

package/src/NodeSdk.ts

@@ -2,13 +2,16 @@
  * @since 1.0.0
  */
 import type * as Resources from "@opentelemetry/resources"
+import type { LoggerProviderConfig, LogRecordProcessor } from "@opentelemetry/sdk-logs"
 import type { MetricReader } from "@opentelemetry/sdk-metrics"
 import type { SpanProcessor, TracerConfig } from "@opentelemetry/sdk-trace-base"
 import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node"
 import type { NonEmptyReadonlyArray } from "effect/Array"
 import * as Effect from "effect/Effect"
-import type { LazyArg } from "effect/Function"
+import { constant, type LazyArg } from "effect/Function"
 import * as Layer from "effect/Layer"
+import { isNonEmpty } from "./internal/utils.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"
@@ -21,6 +24,8 @@ export interface Configuration {
   readonly spanProcessor?: SpanProcessor | ReadonlyArray<SpanProcessor> | undefined
   readonly tracerConfig?: Omit<TracerConfig, "resource"> | undefined
   readonly metricReader?: MetricReader | ReadonlyArray<MetricReader> | undefined
+  readonly logRecordProcessor?: LogRecordProcessor | ReadonlyArray<LogRecordProcessor> | undefined
+  readonly loggerProviderConfig?: Omit<LoggerProviderConfig, "resource"> | undefined
   readonly resource?: {
     readonly serviceName: string
     readonly serviceVersion?: string
@@ -83,20 +88,24 @@ export const layer: {
         ? evaluate as Effect.Effect<Configuration>
         : Effect.sync(evaluate),
       (config) => {
-        const ResourceLive = config.resource === undefined
-          ? Resource.layerFromEnv()
-          : Resource.layer(config.resource)
-        const TracerLive =
-          config.spanProcessor && !(Array.isArray(config.spanProcessor) && config.spanProcessor.length === 0) ?
-            Tracer.layer.pipe(
-              Layer.provide(layerTracerProvider(config.spanProcessor as any, config.tracerConfig))
-            )
-            : Layer.empty
-        const MetricsLive =
-          config.metricReader && !(Array.isArray(config.metricReader) && config.metricReader.length === 0)
-            ? Metrics.layer(() => config.metricReader as any)
-            : Layer.empty
-        return Layer.merge(TracerLive, MetricsLive).pipe(
+        const ResourceLive = Resource.layerFromEnv(config.resource && Resource.configToAttributes(config.resource))
+
+        const TracerLive = isNonEmpty(config.spanProcessor)
+          ? Layer.provide(Tracer.layer, layerTracerProvider(config.spanProcessor, config.tracerConfig))
+          : Layer.empty
+
+        const MetricsLive = isNonEmpty(config.metricReader)
+          ? Metrics.layer(constant(config.metricReader))
+          : Layer.empty
+
+        const LoggerLive = isNonEmpty(config.logRecordProcessor)
+          ? Layer.provide(
+            Logger.layerLoggerAdd,
+            Logger.layerLoggerProvider(config.logRecordProcessor, config.loggerProviderConfig)
+          )
+          : Layer.empty
+
+        return Layer.mergeAll(TracerLive, MetricsLive, LoggerLive).pipe(
           Layer.provideMerge(ResourceLive)
         )
       }

package/src/Resource.ts

@@ -39,22 +39,33 @@ export const layer = (config: {
   readonly serviceName: string
   readonly serviceVersion?: string
   readonly attributes?: Resources.ResourceAttributes
-}) => {
+}) =>
+  Layer.succeed(
+    Resource,
+    new Resources.Resource(configToAttributes(config))
+  )
+
+/**
+ * @since 1.0.0
+ * @category config
+ */
+export const configToAttributes = (options: {
+  readonly serviceName: string
+  readonly serviceVersion?: string
+  readonly attributes?: Resources.ResourceAttributes
+}): Record<string, string> => {
   const attributes: Record<string, string> = {
-    ...(config.attributes ?? undefined),
-    [SEMRESATTRS_SERVICE_NAME]: config.serviceName,
+    ...(options.attributes ?? undefined),
+    [SEMRESATTRS_SERVICE_NAME]: options.serviceName,
     [SEMRESATTRS_TELEMETRY_SDK_NAME]: "@effect/opentelemetry",
     [SEMRESATTRS_TELEMETRY_SDK_LANGUAGE]: typeof (globalThis as any).document === "undefined"
       ? TELEMETRYSDKLANGUAGEVALUES_NODEJS
       : TELEMETRYSDKLANGUAGEVALUES_WEBJS
   }
-  if (config.serviceVersion) {
-    attributes[SEMRESATTRS_SERVICE_VERSION] = config.serviceVersion
+  if (options.serviceVersion) {
+    attributes[SEMRESATTRS_SERVICE_VERSION] = options.serviceVersion
   }
-  return Layer.succeed(
-    Resource,
-    new Resources.Resource(attributes)
-  )
+  return attributes
 }
 
 /**

package/src/WebSdk.ts

@@ -2,13 +2,16 @@
  * @since 1.0.0
  */
 import type * as Resources from "@opentelemetry/resources"
+import type { LoggerProviderConfig, LogRecordProcessor } from "@opentelemetry/sdk-logs"
 import type { MetricReader } from "@opentelemetry/sdk-metrics"
 import type { SpanProcessor, TracerConfig } from "@opentelemetry/sdk-trace-base"
 import { WebTracerProvider } from "@opentelemetry/sdk-trace-web"
 import type { NonEmptyReadonlyArray } from "effect/Array"
 import * as Effect from "effect/Effect"
-import type { LazyArg } from "effect/Function"
+import { constant, type LazyArg } from "effect/Function"
 import * as Layer from "effect/Layer"
+import { isNonEmpty } from "./internal/utils.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"
@@ -21,6 +24,8 @@ export interface Configuration {
   readonly spanProcessor?: SpanProcessor | ReadonlyArray<SpanProcessor> | undefined
   readonly tracerConfig?: Omit<TracerConfig, "resource">
   readonly metricReader?: MetricReader | ReadonlyArray<MetricReader> | undefined
+  readonly logRecordProcessor?: LogRecordProcessor | ReadonlyArray<LogRecordProcessor> | undefined
+  readonly loggerProviderConfig?: Omit<LoggerProviderConfig, "resource"> | undefined
   readonly resource: {
     readonly serviceName: string
     readonly serviceVersion?: string
@@ -84,15 +89,23 @@ export const layer: {
         : Effect.sync(evaluate),
       (config) => {
         const ResourceLive = Resource.layer(config.resource)
-        const TracerLive =
-          config.spanProcessor && !(Array.isArray(config.spanProcessor) && config.spanProcessor.length === 0) ?
-            Tracer.layer.pipe(Layer.provide(layerTracerProvider(config.spanProcessor as any, config.tracerConfig)))
-            : Layer.effectDiscard(Effect.void)
-        const MetricsLive =
-          config.metricReader && !(Array.isArray(config.metricReader) && config.metricReader.length === 0)
-            ? Metrics.layer(() => config.metricReader as any)
-            : Layer.effectDiscard(Effect.void)
-        return Layer.merge(TracerLive, MetricsLive).pipe(
+
+        const TracerLive = isNonEmpty(config.spanProcessor)
+          ? Layer.provide(Tracer.layer, layerTracerProvider(config.spanProcessor, config.tracerConfig))
+          : Layer.empty
+
+        const LoggerLive = isNonEmpty(config.logRecordProcessor)
+          ? Layer.provide(
+            Logger.layerLoggerAdd,
+            Logger.layerLoggerProvider(config.logRecordProcessor, config.loggerProviderConfig)
+          )
+          : Layer.empty
+
+        const MetricsLive = isNonEmpty(config.metricReader)
+          ? Metrics.layer(constant(config.metricReader))
+          : Layer.empty
+
+        return Layer.mergeAll(TracerLive, MetricsLive, LoggerLive).pipe(
           Layer.provideMerge(ResourceLive)
         )
       }

package/src/index.ts

@@ -1,3 +1,8 @@
+/**
+ * @since 1.0.0
+ */
+export * as Logger from "./Logger.js"
+
 /**
  * @since 1.0.0
  */

package/src/internal/tracer.ts

@@ -4,12 +4,12 @@ import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import type { Exit } from "effect/Exit"
 import { dual } from "effect/Function"
-import * as Inspectable from "effect/Inspectable"
 import * as Layer from "effect/Layer"
 import * as Option from "effect/Option"
 import * as EffectTracer from "effect/Tracer"
 import { Resource } from "../Resource.js"
 import type { OtelTraceFlags, OtelTracer, OtelTracerProvider, OtelTraceState } from "../Tracer.js"
+import { nanosToHrTime, recordToAttributes, unknownToAttributeValue } from "./utils.js"
 
 const OtelSpanTypeId = Symbol.for("@effect/opentelemetry/Tracer/OtelSpan")
 
@@ -257,11 +257,6 @@ export const layer = layerWithoutOtelTracer.pipe(
 // utils
 // -------------------------------------------------------------------------------------
 
-const bigint1e9 = 1_000_000_000n
-const nanosToHrTime = (timestamp: bigint): OtelApi.HrTime => {
-  return [Number(timestamp / bigint1e9), Number(timestamp % bigint1e9)]
-}
-
 const createTraceState = Option.liftThrowable(OtelApi.createTraceState)
 
 const populateContext = (
@@ -300,22 +295,6 @@ const extractTraceTag = <I, S>(
     () => Context.getOption(parent.context, tag)
   )
 
-const recordToAttributes = (value: Record<string, unknown>): OtelApi.Attributes => {
-  return Object.entries(value).reduce((acc, [key, value]) => {
-    acc[key] = unknownToAttributeValue(value)
-    return acc
-  }, {} as OtelApi.Attributes)
-}
-
-const unknownToAttributeValue = (value: unknown): OtelApi.AttributeValue => {
-  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
-    return value
-  } else if (typeof value === "bigint") {
-    return Number(value)
-  }
-  return Inspectable.toStringUnknown(value)
-}
-
 /** @internal */
 export const withSpanContext = dual<
   (

package/src/internal/utils.ts

@@ -0,0 +1,31 @@
+import type * as OtelApi from "@opentelemetry/api"
+import type { NonEmptyReadonlyArray } from "effect/Array"
+import * as Inspectable from "effect/Inspectable"
+
+const bigint1e9 = 1_000_000_000n
+
+/** @internal */
+export const nanosToHrTime = (timestamp: bigint): OtelApi.HrTime => {
+  return [Number(timestamp / bigint1e9), Number(timestamp % bigint1e9)]
+}
+
+/** @internal */
+export const recordToAttributes = (value: Record<string, unknown>): OtelApi.Attributes =>
+  Object.entries(value).reduce((acc, [key, value]) => {
+    acc[key] = unknownToAttributeValue(value)
+    return acc
+  }, {} as OtelApi.Attributes)
+
+/** @internal */
+export const unknownToAttributeValue = (value: unknown): OtelApi.AttributeValue => {
+  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    return value
+  } else if (typeof value === "bigint") {
+    return Number(value)
+  }
+  return Inspectable.toStringUnknown(value)
+}
+
+/** @internal */
+export const isNonEmpty = <A>(a: A | ReadonlyArray<A> | undefined): a is A | NonEmptyReadonlyArray<A> =>
+  a !== undefined && !(Array.isArray(a) && a.length === 0)