@effect/opentelemetry 0.22.1 → 0.24.0

package/package.json

@@ -1,46 +1,14 @@
 {
   "name": "@effect/opentelemetry",
-  "version": "0.22.1",
-  "publishConfig": {
-    "access": "public"
-  },
+  "version": "0.24.0",
+  "description": "Functional programming in TypeScript",
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/Effect-TS/opentelemetry.git"
   },
+  "sideEffects": [],
   "author": "Michael Arnaldi <ma@matechs.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/Effect-TS/opentelemetry/issues"
-  },
-  "homepage": "https://github.com/Effect-TS/opentelemetry",
-  "description": "Functional programming in TypeScript",
-  "main": "dist/effect-opentelemetry.cjs.js",
-  "module": "dist/effect-opentelemetry.esm.js",
-  "tags": [
-    "typescript",
-    "algebraic-data-types",
-    "functional-programming"
-  ],
-  "keywords": [
-    "typescript",
-    "algebraic-data-types",
-    "functional-programming"
-  ],
-  "preconstruct": {
-    "distFilenameStrategy": "full",
-    "exports": {
-      "importConditionDefaultExport": "default"
-    },
-    "entrypoints": [
-      "*.ts"
-    ]
-  },
-  "effect": {
-    "generateIndex": true,
-    "includeInternal": true
-  },
-  "packageManager": "pnpm@8.6.10",
   "peerDependencies": {
     "@opentelemetry/api": "^1.6",
     "@opentelemetry/resources": "^1.17",
@@ -49,7 +17,7 @@
     "@opentelemetry/sdk-trace-node": "^1.17",
     "@opentelemetry/sdk-trace-web": "^1.17",
     "@opentelemetry/semantic-conventions": "^1.17",
-    "effect": "2.0.0-next.54"
+    "effect": "2.0.0-next.56"
   },
   "peerDependenciesMeta": {
     "@opentelemetry/sdk-metrics": {
@@ -65,113 +33,59 @@
       "optional": true
     }
   },
-  "devDependencies": {
-    "@babel/core": "^7.23.2",
-    "@babel/preset-typescript": "^7.23.2",
-    "@changesets/changelog-github": "^0.4.8",
-    "@changesets/cli": "^2.26.2",
-    "@effect/babel-plugin": "^0.2.0",
-    "@effect/build-utils": "^0.1.9",
-    "@effect/docgen": "^0.2.1",
-    "@effect/eslint-plugin": "^0.1.2",
-    "@effect/language-service": "^0.0.21",
-    "@opentelemetry/api": "^1.6.0",
-    "@opentelemetry/context-async-hooks": "^1.17.1",
-    "@opentelemetry/exporter-metrics-otlp-http": "0.43.0",
-    "@opentelemetry/exporter-prometheus": "0.43.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.43.0",
-    "@opentelemetry/otlp-exporter-base": "0.43.0",
-    "@opentelemetry/resources": "^1.17.1",
-    "@opentelemetry/sdk-metrics": "^1.17.1",
-    "@opentelemetry/sdk-trace-base": "^1.17.1",
-    "@opentelemetry/sdk-trace-node": "^1.17.1",
-    "@opentelemetry/sdk-trace-web": "^1.17.1",
-    "@opentelemetry/semantic-conventions": "^1.17.1",
-    "@preconstruct/cli": "^2.8.1",
-    "@types/chai": "^4.3.9",
-    "@types/node": "^20.8.10",
-    "@typescript-eslint/eslint-plugin": "^6.9.1",
-    "@typescript-eslint/parser": "^6.9.1",
-    "@vitejs/plugin-react": "^4.1.1",
-    "@vitest/coverage-v8": "^0.34.6",
-    "@vitest/expect": "^0.34.6",
-    "babel-plugin-annotate-pure-calls": "^0.4.0",
-    "concurrently": "^8.2.2",
-    "effect": "2.0.0-next.54",
-    "eslint": "^8.52.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-codegen": "0.17.0",
-    "eslint-plugin-deprecation": "^2.0.0",
-    "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-simple-import-sort": "^10.0.0",
-    "eslint-plugin-sort-destructure-keys": "^1.5.0",
-    "madge": "^6.1.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.2.2",
-    "vite": "^4.5.0",
-    "vitest": "0.34.6"
-  },
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
+  "types": "./dist/dts/index.d.ts",
   "exports": {
+    "./package.json": "./package.json",
     ".": {
-      "types": "./dist/declarations/src/index.d.ts",
-      "module": "./dist/effect-opentelemetry.esm.js",
-      "import": "./dist/effect-opentelemetry.cjs.mjs",
-      "default": "./dist/effect-opentelemetry.cjs.js"
+      "types": "./dist/dts/index.d.ts",
+      "import": "./dist/esm/index.js",
+      "default": "./dist/cjs/index.js"
     },
-    "./package.json": "./package.json",
     "./Metrics": {
-      "types": "./dist/declarations/src/Metrics.d.ts",
-      "module": "./Metrics/dist/effect-opentelemetry-Metrics.esm.js",
-      "import": "./Metrics/dist/effect-opentelemetry-Metrics.cjs.mjs",
-      "default": "./Metrics/dist/effect-opentelemetry-Metrics.cjs.js"
+      "types": "./dist/dts/Metrics.d.ts",
+      "import": "./dist/esm/Metrics.js",
+      "default": "./dist/cjs/Metrics.js"
     },
     "./NodeSdk": {
-      "types": "./dist/declarations/src/NodeSdk.d.ts",
-      "module": "./NodeSdk/dist/effect-opentelemetry-NodeSdk.esm.js",
-      "import": "./NodeSdk/dist/effect-opentelemetry-NodeSdk.cjs.mjs",
-      "default": "./NodeSdk/dist/effect-opentelemetry-NodeSdk.cjs.js"
+      "types": "./dist/dts/NodeSdk.d.ts",
+      "import": "./dist/esm/NodeSdk.js",
+      "default": "./dist/cjs/NodeSdk.js"
     },
     "./Resource": {
-      "types": "./dist/declarations/src/Resource.d.ts",
-      "module": "./Resource/dist/effect-opentelemetry-Resource.esm.js",
-      "import": "./Resource/dist/effect-opentelemetry-Resource.cjs.mjs",
-      "default": "./Resource/dist/effect-opentelemetry-Resource.cjs.js"
+      "types": "./dist/dts/Resource.d.ts",
+      "import": "./dist/esm/Resource.js",
+      "default": "./dist/cjs/Resource.js"
     },
     "./Tracer": {
-      "types": "./dist/declarations/src/Tracer.d.ts",
-      "module": "./Tracer/dist/effect-opentelemetry-Tracer.esm.js",
-      "import": "./Tracer/dist/effect-opentelemetry-Tracer.cjs.mjs",
-      "default": "./Tracer/dist/effect-opentelemetry-Tracer.cjs.js"
+      "types": "./dist/dts/Tracer.d.ts",
+      "import": "./dist/esm/Tracer.js",
+      "default": "./dist/cjs/Tracer.js"
     },
     "./WebSdk": {
-      "types": "./dist/declarations/src/WebSdk.d.ts",
-      "module": "./WebSdk/dist/effect-opentelemetry-WebSdk.esm.js",
-      "import": "./WebSdk/dist/effect-opentelemetry-WebSdk.cjs.mjs",
-      "default": "./WebSdk/dist/effect-opentelemetry-WebSdk.cjs.js"
+      "types": "./dist/dts/WebSdk.d.ts",
+      "import": "./dist/esm/WebSdk.js",
+      "default": "./dist/cjs/WebSdk.js"
     }
   },
-  "files": [
-    "src",
-    "dist",
-    "internal",
-    "Metrics",
-    "NodeSdk",
-    "Resource",
-    "Tracer",
-    "WebSdk"
-  ],
-  "scripts": {
-    "example": "node -r ts-node/register",
-    "version": "changeset version",
-    "clean": "node scripts/clean.mjs",
-    "build": "pnpm gen && preconstruct fix && preconstruct build && pnpm gen",
-    "gen": "build-utils prepare-v1",
-    "lint": "eslint --ext .ts,.tsx src/**/* test/**/*",
-    "autofix": "pnpm lint --fix",
-    "tc": "tsc --noEmit",
-    "docs": "docgen",
-    "circular": "madge --ts-config ./tsconfig.madge.json --circular --no-color --no-spinner --warning dist",
-    "test": "vitest",
-    "coverage": "vitest run --coverage"
+  "typesVersions": {
+    "*": {
+      "Metrics": [
+        "./dist/dts/Metrics.d.ts"
+      ],
+      "NodeSdk": [
+        "./dist/dts/NodeSdk.d.ts"
+      ],
+      "Resource": [
+        "./dist/dts/Resource.d.ts"
+      ],
+      "Tracer": [
+        "./dist/dts/Tracer.d.ts"
+      ],
+      "WebSdk": [
+        "./dist/dts/WebSdk.d.ts"
+      ]
+    }
   }
 }

package/src/Metrics.ts

@@ -1,14 +1,13 @@
 /**
  * @since 1.0.0
  */
-import type { MetricReader } from "@opentelemetry/sdk-metrics"
-import type { MetricProducer } from "@opentelemetry/sdk-metrics/build/src/export/MetricProducer"
+import type { MetricProducer, MetricReader } from "@opentelemetry/sdk-metrics"
 import type * as Effect from "effect/Effect"
 import type { LazyArg } from "effect/Function"
 import type { Layer } from "effect/Layer"
 import type * as Scope from "effect/Scope"
-import * as internal from "./internal/metrics"
-import type { Resource } from "./Resource"
+import * as internal from "./internal/metrics.js"
+import type { Resource } from "./Resource.js"
 
 /**
  * @since 1.0.0

package/src/NodeSdk.ts

@@ -9,9 +9,9 @@ import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node"
 import * as Effect from "effect/Effect"
 import type { LazyArg } from "effect/Function"
 import * as Layer from "effect/Layer"
-import * as Metrics from "./Metrics"
-import * as Resource from "./Resource"
-import * as Tracer from "./Tracer"
+import * as Metrics from "./Metrics.js"
+import * as Resource from "./Resource.js"
+import * as Tracer from "./Tracer.js"
 
 /**
  * @since 1.0.0

package/src/Tracer.ts

@@ -7,8 +7,8 @@ import type { Effect } from "effect/Effect"
 import type { Layer } from "effect/Layer"
 import type * as Option from "effect/Option"
 import type { ExternalSpan, Tracer as EffectTracer } from "effect/Tracer"
-import * as internal from "./internal/tracer"
-import type { Resource } from "./Resource"
+import * as internal from "./internal/tracer.js"
+import type { Resource } from "./Resource.js"
 
 /**
  * @since 1.0.0

package/src/WebSdk.ts

@@ -9,9 +9,9 @@ import { WebTracerProvider } from "@opentelemetry/sdk-trace-web"
 import * as Effect from "effect/Effect"
 import type { LazyArg } from "effect/Function"
 import * as Layer from "effect/Layer"
-import * as Metrics from "./Metrics"
-import * as Resource from "./Resource"
-import * as Tracer from "./Tracer"
+import * as Metrics from "./Metrics.js"
+import * as Resource from "./Resource.js"
+import * as Tracer from "./Tracer.js"
 
 /**
  * @since 1.0.0

package/src/index.ts

@@ -1,24 +1,24 @@
 /**
  * @since 1.0.0
  */
-export * as Metrics from "@effect/opentelemetry/Metrics"
+export * as Metrics from "./Metrics.js"
 
 /**
  * @since 1.0.0
  */
-export * as NodeSdk from "@effect/opentelemetry/NodeSdk"
+export * as NodeSdk from "./NodeSdk.js"
 
 /**
  * @since 1.0.0
  */
-export * as Resource from "@effect/opentelemetry/Resource"
+export * as Resource from "./Resource.js"
 
 /**
  * @since 1.0.0
  */
-export * as Tracer from "@effect/opentelemetry/Tracer"
+export * as Tracer from "./Tracer.js"
 
 /**
  * @since 1.0.0
  */
-export * as WebSdk from "@effect/opentelemetry/WebSdk"
+export * as WebSdk from "./WebSdk.js"

package/src/internal/metrics.ts

@@ -4,12 +4,13 @@ import type * as Resources from "@opentelemetry/resources"
 import type {
   CollectionResult,
   DataPoint,
-  InstrumentDescriptor,
+  MetricCollectOptions,
   MetricData,
+  MetricDescriptor,
+  MetricProducer,
   MetricReader
 } from "@opentelemetry/sdk-metrics"
 import { AggregationTemporality, DataPointType, InstrumentType } from "@opentelemetry/sdk-metrics"
-import type { MetricCollectOptions, MetricProducer } from "@opentelemetry/sdk-metrics/build/src/export/MetricProducer"
 import * as Effect from "effect/Effect"
 import type { LazyArg } from "effect/Function"
 import * as HashSet from "effect/HashSet"
@@ -19,7 +20,7 @@ import type * as MetricKey from "effect/MetricKey"
 import * as MetricKeyType from "effect/MetricKeyType"
 import * as MetricState from "effect/MetricState"
 import * as Option from "effect/Option"
-import * as Resource from "../Resource"
+import * as Resource from "../Resource.js"
 
 const sdkName = "@effect/opentelemetry/Metrics"
 
@@ -210,7 +211,7 @@ const descriptorFromKey = (
   metricKey: MetricKey.MetricKey.Untyped,
   tags: Record<string, string>,
   suffix?: string
-): InstrumentDescriptor => ({
+): MetricDescriptor => ({
   ...descriptorMeta(metricKey, suffix),
   unit: tags.unit ?? tags.time_unit ?? "1",
   type: instrumentTypeFromKey(metricKey),

package/src/internal/tracer.ts

@@ -7,7 +7,7 @@ import * as FiberRef from "effect/FiberRef"
 import * as Layer from "effect/Layer"
 import * as Option from "effect/Option"
 import * as EffectTracer from "effect/Tracer"
-import { Resource } from "../Resource"
+import { Resource } from "../Resource.js"
 
 /** @internal */
 export class OtelSpan implements EffectTracer.Span {
@@ -39,7 +39,7 @@ export class OtelSpan implements EffectTracer.Span {
             context: makeSpanContext(link.span),
             attributes: recordToAttributes(link.attributes)
           }))
-          : undefined
+          : undefined as any
       },
       parent._tag === "Some"
         ? populateContext(active, parent.value, context)
@@ -145,8 +145,8 @@ export const traceStateTag = Context.Tag<OtelApi.TraceState>("@effect/openteleme
 export const makeExternalSpan = (options: {
   readonly traceId: string
   readonly spanId: string
-  readonly traceFlags?: number
-  readonly traceState?: string | OtelApi.TraceState
+  readonly traceFlags?: number | undefined
+  readonly traceState?: string | OtelApi.TraceState | undefined
 }): EffectTracer.ExternalSpan => {
   let context = Context.empty()
 
@@ -254,7 +254,7 @@ const makeSpanContext = (span: EffectTracer.ParentSpan, context?: Context.Contex
     context ?
       extractTraceTag(span, context, traceStateTag) :
       Context.getOption(span.context, traceStateTag)
-  )
+  ) as OtelApi.TraceState
 })
 
 const extractTraceTag = <I, S>(

package/Metrics/dist/effect-opentelemetry-Metrics.cjs.d.mts

@@ -1,2 +0,0 @@
-export * from "../../dist/declarations/src/Metrics.js";
-//# sourceMappingURL=effect-opentelemetry-Metrics.cjs.d.mts.map

package/Metrics/dist/effect-opentelemetry-Metrics.cjs.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"effect-opentelemetry-Metrics.cjs.d.mts","sourceRoot":"","sources":["../../dist/declarations/src/Metrics.d.ts"],"names":[],"mappings":"AAAA"}

package/Metrics/dist/effect-opentelemetry-Metrics.cjs.d.ts

@@ -1,2 +0,0 @@
-export * from "../../dist/declarations/src/Metrics";
-//# sourceMappingURL=effect-opentelemetry-Metrics.cjs.d.ts.map

package/Metrics/dist/effect-opentelemetry-Metrics.cjs.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"effect-opentelemetry-Metrics.cjs.d.ts","sourceRoot":"","sources":["../../dist/declarations/src/Metrics.d.ts"],"names":[],"mappings":"AAAA"}

package/Metrics/dist/effect-opentelemetry-Metrics.cjs.js

@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === "production") {
-  module.exports = require("./effect-opentelemetry-Metrics.cjs.prod.js");
-} else {
-  module.exports = require("./effect-opentelemetry-Metrics.cjs.dev.js");
-}

package/Metrics/dist/effect-opentelemetry-Metrics.cjs.mjs

@@ -1,5 +0,0 @@
-export {
-  layer,
-  makeProducer,
-  registerProducer
-} from "./effect-opentelemetry-Metrics.cjs.js";