@effect/opentelemetry 0.9.0 → 0.10.0

package/mjs/internal/metrics.mjs

@@ -0,0 +1,231 @@
+import * as HashSet from "@effect/data/HashSet";
+import * as Option from "@effect/data/Option";
+import * as Effect from "@effect/io/Effect";
+import * as Layer from "@effect/io/Layer";
+import * as Metric from "@effect/io/Metric";
+import * as MetricKeyType from "@effect/io/MetricKeyType";
+import * as MetricState from "@effect/io/MetricState";
+import * as Resource from "@effect/opentelemetry/Resource";
+import { ValueType } from "@opentelemetry/api";
+import { AggregationTemporality, DataPointType, InstrumentType } from "@opentelemetry/sdk-metrics";
+const sdkName = "@effect/opentelemetry/Metrics";
+/** @internal */
+export class MetricProducerImpl {
+  constructor(resource) {
+    this.resource = resource;
+  }
+  collect(_options) {
+    const snapshot = Metric.unsafeSnapshot();
+    const hrTimeNow = currentHrTime();
+    const metricData = [];
+    for (const {
+      metricKey,
+      metricState
+    } of snapshot) {
+      const attributes = HashSet.reduce(metricKey.tags, {}, (acc, label) => {
+        acc[label.key] = label.value;
+        return acc;
+      });
+      const descriptor = descriptorFromKey(metricKey, attributes);
+      if (MetricState.isCounterState(metricState)) {
+        metricData.push({
+          dataPointType: DataPointType.SUM,
+          descriptor,
+          isMonotonic: descriptor.type === InstrumentType.COUNTER,
+          aggregationTemporality: AggregationTemporality.CUMULATIVE,
+          dataPoints: [{
+            startTime: hrTimeNow,
+            endTime: hrTimeNow,
+            attributes,
+            value: metricState.count
+          }]
+        });
+      } else if (MetricState.isGaugeState(metricState)) {
+        metricData.push({
+          dataPointType: DataPointType.GAUGE,
+          descriptor,
+          aggregationTemporality: AggregationTemporality.CUMULATIVE,
+          dataPoints: [{
+            startTime: hrTimeNow,
+            endTime: hrTimeNow,
+            attributes,
+            value: metricState.value
+          }]
+        });
+      } else if (MetricState.isHistogramState(metricState)) {
+        const size = metricState.buckets.length;
+        const buckets = {
+          boundaries: Array(size - 1),
+          counts: Array(size)
+        };
+        let i = 0;
+        let prev = 0;
+        for (const [boundary, value] of metricState.buckets) {
+          if (i < size - 1) {
+            buckets.boundaries[i] = boundary;
+          }
+          buckets.counts[i] = value - prev;
+          prev = value;
+          i++;
+        }
+        metricData.push({
+          dataPointType: DataPointType.HISTOGRAM,
+          descriptor,
+          aggregationTemporality: AggregationTemporality.CUMULATIVE,
+          dataPoints: [{
+            startTime: hrTimeNow,
+            endTime: hrTimeNow,
+            attributes,
+            value: {
+              buckets,
+              count: metricState.count,
+              min: metricState.min,
+              max: metricState.max,
+              sum: metricState.sum
+            }
+          }]
+        });
+      } else if (MetricState.isFrequencyState(metricState)) {
+        const dataPoints = [];
+        for (const [freqKey, value] of metricState.occurrences) {
+          dataPoints.push({
+            startTime: hrTimeNow,
+            endTime: hrTimeNow,
+            attributes: {
+              ...attributes,
+              key: freqKey
+            },
+            value
+          });
+        }
+        metricData.push({
+          dataPointType: DataPointType.SUM,
+          descriptor: descriptorFromKey(metricKey, attributes),
+          aggregationTemporality: AggregationTemporality.CUMULATIVE,
+          isMonotonic: true,
+          dataPoints
+        });
+      } else if (MetricState.isSummaryState(metricState)) {
+        const dataPoints = [{
+          startTime: hrTimeNow,
+          endTime: hrTimeNow,
+          attributes: {
+            ...attributes,
+            quantile: "min"
+          },
+          value: metricState.min
+        }];
+        for (const [quantile, value] of metricState.quantiles) {
+          dataPoints.push({
+            startTime: hrTimeNow,
+            endTime: hrTimeNow,
+            attributes: {
+              ...attributes,
+              quantile: quantile.toString()
+            },
+            value: value._tag === "Some" ? value.value : 0
+          });
+        }
+        dataPoints.push({
+          startTime: hrTimeNow,
+          endTime: hrTimeNow,
+          attributes: {
+            ...attributes,
+            quantile: "max"
+          },
+          value: metricState.max
+        });
+        metricData.push({
+          dataPointType: DataPointType.SUM,
+          descriptor: descriptorFromKey(metricKey, attributes, "quantiles"),
+          aggregationTemporality: AggregationTemporality.CUMULATIVE,
+          isMonotonic: false,
+          dataPoints
+        });
+        metricData.push({
+          dataPointType: DataPointType.SUM,
+          descriptor: {
+            ...descriptorMeta(metricKey, "count"),
+            unit: "1",
+            type: InstrumentType.COUNTER,
+            valueType: ValueType.INT
+          },
+          aggregationTemporality: AggregationTemporality.CUMULATIVE,
+          isMonotonic: true,
+          dataPoints: [{
+            startTime: hrTimeNow,
+            endTime: hrTimeNow,
+            attributes,
+            value: metricState.count
+          }]
+        });
+        metricData.push({
+          dataPointType: DataPointType.SUM,
+          descriptor: {
+            ...descriptorMeta(metricKey, "sum"),
+            unit: "1",
+            type: InstrumentType.COUNTER,
+            valueType: ValueType.DOUBLE
+          },
+          aggregationTemporality: AggregationTemporality.CUMULATIVE,
+          isMonotonic: true,
+          dataPoints: [{
+            startTime: hrTimeNow,
+            endTime: hrTimeNow,
+            attributes,
+            value: metricState.sum
+          }]
+        });
+      }
+    }
+    return Promise.resolve({
+      resourceMetrics: {
+        resource: this.resource,
+        scopeMetrics: [{
+          scope: {
+            name: sdkName
+          },
+          metrics: metricData
+        }]
+      },
+      errors: []
+    });
+  }
+}
+const descriptorMeta = (metricKey, suffix) => ({
+  name: suffix ? `${metricKey.name}_${suffix}` : metricKey.name,
+  description: Option.getOrElse(metricKey.description, () => "")
+});
+const descriptorFromKey = (metricKey, tags, suffix) => ({
+  ...descriptorMeta(metricKey, suffix),
+  unit: tags.unit ?? tags.time_unit ?? "1",
+  type: instrumentTypeFromKey(metricKey),
+  valueType: ValueType.DOUBLE
+});
+const instrumentTypeFromKey = key => {
+  if (MetricKeyType.isHistogramKey(key.keyType)) {
+    return InstrumentType.HISTOGRAM;
+  } else if (MetricKeyType.isGaugeKey(key.keyType)) {
+    return InstrumentType.OBSERVABLE_GAUGE;
+  } else if (MetricKeyType.isSummaryKey(key.keyType)) {
+    return InstrumentType.UP_DOWN_COUNTER;
+  } else if (MetricKeyType.isFrequencyKey(key.keyType)) {
+    return InstrumentType.COUNTER;
+  }
+  return InstrumentType.UP_DOWN_COUNTER;
+};
+const currentHrTime = () => {
+  const now = Date.now();
+  return [Math.floor(now / 1000), now % 1000 * 1000000];
+};
+/** @internal */
+export const makeProducer = /*#__PURE__*/Effect.map(Resource.Resource, resource => new MetricProducerImpl(resource));
+/** @internal */
+export const registerProducer = (self, metricReader) => Effect.acquireRelease(Effect.sync(() => {
+  const reader = metricReader();
+  reader.setMetricProducer(self);
+  return reader;
+}), reader => Effect.promise(() => reader.shutdown()));
+/** @internal */
+export const layer = evaluate => Layer.scopedDiscard(Effect.flatMap(makeProducer, producer => registerProducer(producer, evaluate)));
+//# sourceMappingURL=metrics.mjs.map

package/mjs/internal/metrics.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"metrics.mjs","names":["HashSet","Option","Effect","Layer","Metric","MetricKeyType","MetricState","Resource","ValueType","AggregationTemporality","DataPointType","InstrumentType","sdkName","MetricProducerImpl","constructor","resource","collect","_options","snapshot","unsafeSnapshot","hrTimeNow","currentHrTime","metricData","metricKey","metricState","attributes","reduce","tags","acc","label","key","value","descriptor","descriptorFromKey","isCounterState","push","dataPointType","SUM","isMonotonic","type","COUNTER","aggregationTemporality","CUMULATIVE","dataPoints","startTime","endTime","count","isGaugeState","GAUGE","isHistogramState","size","buckets","length","boundaries","Array","counts","i","prev","boundary","HISTOGRAM","min","max","sum","isFrequencyState","freqKey","occurrences","isSummaryState","quantile","quantiles","toString","_tag","descriptorMeta","unit","valueType","INT","DOUBLE","Promise","resolve","resourceMetrics","scopeMetrics","scope","name","metrics","errors","suffix","description","getOrElse","time_unit","instrumentTypeFromKey","isHistogramKey","keyType","isGaugeKey","OBSERVABLE_GAUGE","isSummaryKey","UP_DOWN_COUNTER","isFrequencyKey","now","Date","Math","floor","makeProducer","map","registerProducer","self","metricReader","acquireRelease","sync","reader","setMetricProducer","promise","shutdown","layer","evaluate","scopedDiscard","flatMap","producer"],"sources":["../../src/internal/metrics.ts"],"sourcesContent":[null],"mappings":"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"}

package/mjs/internal/tracer.mjs

@@ -6,7 +6,6 @@ import * as Effect from "@effect/io/Effect";
 import * as FiberRef from "@effect/io/FiberRef";
 import * as FiberRefs from "@effect/io/FiberRefs";
 import * as Layer from "@effect/io/Layer";
-import * as Supervisor from "@effect/io/Supervisor";
 import * as Tracer from "@effect/io/Tracer";
 import { Resource } from "@effect/opentelemetry/Resource";
 import * as OtelApi from "@opentelemetry/api";
@@ -75,6 +74,13 @@ export class OtelSpan {
 export const make = /*#__PURE__*/Effect.map(tracer => Tracer.make({
   span(name, parent, context, links, startTime) {
     return new OtelSpan(OtelApi.context, tracer, name, parent, context, links, startTime);
+  },
+  context(execution, fiber) {
+    const currentSpan = Option.flatMap(FiberRefs.get(fiber.unsafeGetFiberRefs(), FiberRef.currentTracerSpan), List.head);
+    if (currentSpan._tag === "None") {
+      return execution();
+    }
+    return OtelApi.context.with(populateContext(OtelApi.context.active(), currentSpan.value), execution);
   }
 }))( /*#__PURE__*/Effect.flatMap(resource => Effect.sync(() => OtelApi.trace.getTracer(resource.attributes["service.name"], resource.attributes["service.version"])))(Resource));
 /** @internal */
@@ -101,22 +107,7 @@ export const makeExternalSpan = options => {
   };
 };
 /** @internal */
-export class OtelSupervisor extends Supervisor.AbstractSupervisor {
-  value() {
-    return Effect.unit;
-  }
-  onRun(execution, fiber) {
-    const currentSpan = Option.flatMap(FiberRefs.get(fiber.unsafeGetFiberRefs(), FiberRef.currentTracerSpan), List.head);
-    if (currentSpan._tag === "None") {
-      return execution();
-    }
-    return OtelApi.context.with(populateContext(OtelApi.context.active(), currentSpan.value), execution);
-  }
-}
-/** @internal */
-export const supervisor = /*#__PURE__*/new OtelSupervisor();
-/** @internal */
-export const layer = /*#__PURE__*/Layer.merge( /*#__PURE__*/Layer.unwrapEffect( /*#__PURE__*/Effect.map(make, Effect.setTracer)), /*#__PURE__*/Supervisor.addSupervisor(supervisor));
+export const layer = /*#__PURE__*/Layer.unwrapEffect( /*#__PURE__*/Effect.map(make, Effect.setTracer));
 // -------------------------------------------------------------------------------------
 // utils
 // -------------------------------------------------------------------------------------

package/mjs/internal/tracer.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"tracer.mjs","names":["Context","List","Option","Cause","Effect","FiberRef","FiberRefs","Layer","Supervisor","Tracer","Resource","OtelApi","OtelSpan","constructor","contextApi","tracer","name","parent","context","links","startTime","_tag","attributes","Map","active","span","startSpan","nanosToHrTime","length","map","link","makeSpanContext","undefined","populateContext","value","spanContext","spanId","traceId","status","attribute","key","setAttribute","set","end","endTime","exit","setStatus","code","SpanStatusCode","OK","isInterruptedOnly","cause","message","pretty","ERROR","event","addEvent","make","flatMap","resource","sync","trace","getTracer","traceFlagsTag","Tag","traceStateTag","makeExternalSpan","options","empty","traceFlags","add","traceState","match","createTraceState","onNone","onSome","OtelSupervisor","AbstractSupervisor","unit","onRun","execution","fiber","currentSpan","get","unsafeGetFiberRefs","currentTracerSpan","head","with","supervisor","layer","merge","unwrapEffect","setTracer","addSupervisor","bigint1e9","timestamp","Number","liftThrowable","otelContext","setSpan","setSpanContext","isRemote","getOrElse","extractTraceTag","getOption","TraceFlags","SAMPLED","getOrUndefined","tag","orElse"],"sources":["../../src/internal/tracer.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"tracer.mjs","names":["Context","List","Option","Cause","Effect","FiberRef","FiberRefs","Layer","Tracer","Resource","OtelApi","OtelSpan","constructor","contextApi","tracer","name","parent","context","links","startTime","_tag","attributes","Map","active","span","startSpan","nanosToHrTime","length","map","link","makeSpanContext","undefined","populateContext","value","spanContext","spanId","traceId","status","attribute","key","setAttribute","set","end","endTime","exit","setStatus","code","SpanStatusCode","OK","isInterruptedOnly","cause","message","pretty","ERROR","event","addEvent","make","execution","fiber","currentSpan","flatMap","get","unsafeGetFiberRefs","currentTracerSpan","head","with","resource","sync","trace","getTracer","traceFlagsTag","Tag","traceStateTag","makeExternalSpan","options","empty","traceFlags","add","traceState","match","createTraceState","onNone","onSome","layer","unwrapEffect","setTracer","bigint1e9","timestamp","Number","liftThrowable","otelContext","setSpan","setSpanContext","isRemote","getOrElse","extractTraceTag","getOption","TraceFlags","SAMPLED","getOrUndefined","tag","orElse"],"sources":["../../src/internal/tracer.ts"],"sourcesContent":[null],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/opentelemetry",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Functional programming in TypeScript",
   "license": "MIT",
   "repository": {
@@ -25,13 +25,14 @@
   "sideEffects": [],
   "author": "Michael Arnaldi <ma@matechs.com>",
   "dependencies": {
-    "@opentelemetry/resources": "^1.15.1",
-    "@opentelemetry/sdk-node": "^0.41.1",
-    "@opentelemetry/semantic-conventions": "^1.15.1"
+    "@opentelemetry/resources": "^1.15.2",
+    "@opentelemetry/sdk-metrics": "^1.15.2",
+    "@opentelemetry/sdk-node": "^0.41.2",
+    "@opentelemetry/semantic-conventions": "^1.15.2"
   },
   "peerDependencies": {
-    "@effect/data": "^0.17.1",
-    "@effect/io": "^0.38.0",
+    "@effect/data": "^0.18.3",
+    "@effect/io": "^0.39.0",
     "@opentelemetry/api": "^1.4.1"
   }
 }

package/src/Metrics.ts

@@ -0,0 +1,32 @@
+/**
+ * @since 1.0.0
+ */
+import type { LazyArg } from "@effect/data/Function"
+import type * as Effect from "@effect/io/Effect"
+import type { Layer } from "@effect/io/Layer"
+import type * as Scope from "@effect/io/Scope"
+import * as internal from "@effect/opentelemetry/internal/metrics"
+import type { Resource } from "@effect/opentelemetry/Resource"
+import type { MetricReader } from "@opentelemetry/sdk-metrics"
+import type { MetricProducer } from "@opentelemetry/sdk-metrics/build/src/export/MetricProducer"
+
+/**
+ * @since 1.0.0
+ * @category producer
+ */
+export const makeProducer: Effect.Effect<Resource, never, MetricProducer> = internal.makeProducer
+
+/**
+ * @since 1.0.0
+ * @category producer
+ */
+export const registerProducer: (
+  self: MetricProducer,
+  metricReader: LazyArg<MetricReader>
+) => Effect.Effect<Scope.Scope, never, MetricReader> = internal.registerProducer
+
+/**
+ * @since 1.0.0
+ * @category layers
+ */
+export const layer: (evaluate: LazyArg<MetricReader>) => Layer<Resource, never, never> = internal.layer

package/src/Resource.ts

@@ -33,9 +33,9 @@ export const layer = (config: {
     ...(config.attributes ?? {}),
     [SemanticResourceAttributes.SERVICE_NAME]: config.serviceName,
     [SemanticResourceAttributes.TELEMETRY_SDK_NAME]: "@effect/opentelemetry",
-    [SemanticResourceAttributes.TELEMETRY_SDK_LANGUAGE]: typeof (globalThis as any).document === "undefined" ?
-      TelemetrySdkLanguageValues.NODEJS :
-      TelemetrySdkLanguageValues.WEBJS
+    [SemanticResourceAttributes.TELEMETRY_SDK_LANGUAGE]: typeof (globalThis as any).document === "undefined"
+      ? TelemetrySdkLanguageValues.NODEJS
+      : TelemetrySdkLanguageValues.WEBJS
   }
   if (config.serviceVersion) {
     attributes[SemanticResourceAttributes.SERVICE_VERSION] = config.serviceVersion

package/src/Tracer.ts

@@ -6,7 +6,6 @@ import type { Effect } from "@effect/io/Effect"
 import type { Layer } from "@effect/io/Layer"
 import type { ExternalSpan, Tracer } from "@effect/io/Tracer"
 import * as internal from "@effect/opentelemetry/internal/tracer"
-import { OtelSupervisor } from "@effect/opentelemetry/internal/tracer"
 import type { Resource } from "@effect/opentelemetry/Resource"
 import type * as Otel from "@opentelemetry/api"
 
@@ -16,16 +15,6 @@ import type * as Otel from "@opentelemetry/api"
  */
 export const make: Effect<Resource, never, Tracer> = internal.make
 
-export {
-  /**
-   * An effect supervisor that sets up the OpenTelemetry context for the fiber executions.
-   *
-   * @since 1.0.0
-   * @category supervisor
-   */
-  OtelSupervisor
-}
-
 /**
  * @since 1.0.0
  * @category constructors