@effect/opentelemetry 0.16.0 → 0.18.0

package/NodeSdk/dist/effect-opentelemetry-NodeSdk.cjs.dev.js

@@ -50,9 +50,9 @@ const config = config => config;
  * @since 1.0.0
  * @category layer
  */
-const layer = config => Layer__namespace.scopedDiscard(Effect__namespace.acquireRelease(Effect__namespace.flatMap(Effect__namespace.all([config, Resource_dist_effectOpentelemetryResource.Resource]), ([config, resource]) => Effect__namespace.sync(() => {
+const layer = config => Layer__namespace.scopedDiscard(Effect__namespace.acquireRelease(Effect__namespace.flatMap(Resource_dist_effectOpentelemetryResource.Resource, resource => Effect__namespace.sync(() => {
   const sdk = new sdkNode.NodeSDK({
-    ...config,
+    ...config(),
     resource
   });
   sdk.start();

package/NodeSdk/dist/effect-opentelemetry-NodeSdk.cjs.prod.js

@@ -50,9 +50,9 @@ const config = config => config;
  * @since 1.0.0
  * @category layer
  */
-const layer = config => Layer__namespace.scopedDiscard(Effect__namespace.acquireRelease(Effect__namespace.flatMap(Effect__namespace.all([config, Resource_dist_effectOpentelemetryResource.Resource]), ([config, resource]) => Effect__namespace.sync(() => {
+const layer = config => Layer__namespace.scopedDiscard(Effect__namespace.acquireRelease(Effect__namespace.flatMap(Resource_dist_effectOpentelemetryResource.Resource, resource => Effect__namespace.sync(() => {
   const sdk = new sdkNode.NodeSDK({
-    ...config,
+    ...config(),
     resource
   });
   sdk.start();

package/NodeSdk/dist/effect-opentelemetry-NodeSdk.esm.js

@@ -22,9 +22,9 @@ const config = config => config;
  * @since 1.0.0
  * @category layer
  */
-const layer = config => Layer.scopedDiscard(Effect.acquireRelease(Effect.flatMap(Effect.all([config, Resource]), ([config, resource]) => Effect.sync(() => {
+const layer = config => Layer.scopedDiscard(Effect.acquireRelease(Effect.flatMap(Resource, resource => Effect.sync(() => {
   const sdk = new NodeSDK({
-    ...config,
+    ...config(),
     resource
   });
   sdk.start();

package/Tracer/dist/effect-opentelemetry-Tracer.cjs.dev.js

@@ -49,17 +49,18 @@ var Tracer__namespace = /*#__PURE__*/_interopNamespace(Tracer);
 class OtelSpan {
   _tag = "Span";
   attributes = new Map();
-  constructor(contextApi, tracer, name, parent, context, links, startTime) {
+  constructor(contextApi, tracer, name, parent, context, links, sampled, startTime) {
     this.name = name;
     this.parent = parent;
     this.context = context;
     this.links = links;
+    this.sampled = sampled;
     const active = contextApi.active();
     this.span = tracer.startSpan(name, {
       startTime: nanosToHrTime(startTime),
       links: links.length > 0 ? links.map(link => ({
         context: makeSpanContext(link.span),
-        attributes: link.attributes
+        attributes: recordToAttributes(link.attributes)
       })) : undefined
     }, parent._tag === "Some" ? populateContext(active, parent.value, context) : OtelApi__namespace.trace.deleteSpan(active));
     const spanContext = this.span.spanContext();
@@ -71,7 +72,7 @@ class OtelSpan {
     };
   }
   attribute(key, value) {
-    this.span.setAttribute(key, value);
+    this.span.setAttribute(key, unknownToAttributeValue(value));
     this.attributes.set(key, value);
   }
   end(endTime, exit) {
@@ -103,7 +104,7 @@ class OtelSpan {
     this.span.end(nanosToHrTime(endTime));
   }
   event(name, startTime, attributes) {
-    this.span.addEvent(name, attributes, nanosToHrTime(startTime));
+    this.span.addEvent(name, attributes ? recordToAttributes(attributes) : undefined, nanosToHrTime(startTime));
   }
 }
 
@@ -112,8 +113,8 @@ const OtelTracer$1 = /*#__PURE__*/Context__namespace.Tag("@effect/opentelemetry/
 
 /** @internal */
 const make$1 = /*#__PURE__*/Effect__namespace.map(OtelTracer$1, tracer => Tracer__namespace.make({
-  span(name, parent, context, links, startTime) {
-    return new OtelSpan(OtelApi__namespace.context, tracer, name, parent, context, links, startTime);
+  span(name, parent, context, links, sampled, startTime) {
+    return new OtelSpan(OtelApi__namespace.context, tracer, name, parent, context, links, sampled, startTime);
   },
   context(execution, fiber) {
     const currentSpan = Option__namespace.flatMap(FiberRefs__namespace.get(fiber.getFiberRefs(), FiberRef__namespace.currentTracerSpan), List__namespace.head);
@@ -150,6 +151,7 @@ const makeExternalSpan$1 = options => {
     _tag: "ExternalSpan",
     traceId: options.traceId,
     spanId: options.spanId,
+    sampled: options.traceFlags ? options.traceFlags === OtelApi__namespace.TraceFlags.SAMPLED : true,
     context
   };
 };
@@ -161,7 +163,7 @@ const currentOtelSpan$1 = /*#__PURE__*/Effect__namespace.map(Effect__namespace.c
 const layerOtelTracer$1 = /*#__PURE__*/Layer__namespace.effect(OtelTracer$1, /*#__PURE__*/Effect__namespace.flatMap(Resource_dist_effectOpentelemetryResource.Resource, resource => Effect__namespace.sync(() => OtelApi__namespace.trace.getTracer(resource.attributes["service.name"], resource.attributes["service.version"]))));
 
 /** @internal */
-const layer$1 = /*#__PURE__*/Layer__namespace.provide(layerOtelTracer$1, /*#__PURE__*/Layer__namespace.unwrapEffect( /*#__PURE__*/Effect__namespace.map(make$1, Effect__namespace.setTracer)));
+const layer$1 = /*#__PURE__*/Layer__namespace.provide(layerOtelTracer$1, /*#__PURE__*/Layer__namespace.unwrapEffect( /*#__PURE__*/Effect__namespace.map(make$1, Layer__namespace.setTracer)));
 
 // -------------------------------------------------------------------------------------
 // utils
@@ -181,6 +183,27 @@ const makeSpanContext = (span, context) => ({
   traceState: Option__namespace.getOrUndefined(context ? extractTraceTag(span, context, traceStateTag) : Context__namespace.getOption(span.context, traceStateTag))
 });
 const extractTraceTag = (parent, context, tag) => Option__namespace.orElse(Context__namespace.getOption(context, tag), () => Context__namespace.getOption(parent.context, tag));
+const recordToAttributes = value => {
+  return Object.entries(value).reduce((acc, [key, value]) => {
+    acc[key] = unknownToAttributeValue(value);
+    return acc;
+  }, {});
+};
+const unknownToAttributeValue = value => {
+  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    return value;
+  } else if (typeof value === "bigint") {
+    return Number(value);
+  }
+  return objectToAttribute(value);
+};
+const objectToAttribute = value => {
+  try {
+    return JSON.stringify(value, null, 2);
+  } catch {
+    return String(value);
+  }
+};
 
 /**
  * @since 1.0.0

package/Tracer/dist/effect-opentelemetry-Tracer.cjs.prod.js

@@ -49,17 +49,18 @@ var Tracer__namespace = /*#__PURE__*/_interopNamespace(Tracer);
 class OtelSpan {
   _tag = "Span";
   attributes = new Map();
-  constructor(contextApi, tracer, name, parent, context, links, startTime) {
+  constructor(contextApi, tracer, name, parent, context, links, sampled, startTime) {
     this.name = name;
     this.parent = parent;
     this.context = context;
     this.links = links;
+    this.sampled = sampled;
     const active = contextApi.active();
     this.span = tracer.startSpan(name, {
       startTime: nanosToHrTime(startTime),
       links: links.length > 0 ? links.map(link => ({
         context: makeSpanContext(link.span),
-        attributes: link.attributes
+        attributes: recordToAttributes(link.attributes)
       })) : undefined
     }, parent._tag === "Some" ? populateContext(active, parent.value, context) : OtelApi__namespace.trace.deleteSpan(active));
     const spanContext = this.span.spanContext();
@@ -71,7 +72,7 @@ class OtelSpan {
     };
   }
   attribute(key, value) {
-    this.span.setAttribute(key, value);
+    this.span.setAttribute(key, unknownToAttributeValue(value));
     this.attributes.set(key, value);
   }
   end(endTime, exit) {
@@ -103,7 +104,7 @@ class OtelSpan {
     this.span.end(nanosToHrTime(endTime));
   }
   event(name, startTime, attributes) {
-    this.span.addEvent(name, attributes, nanosToHrTime(startTime));
+    this.span.addEvent(name, attributes ? recordToAttributes(attributes) : undefined, nanosToHrTime(startTime));
   }
 }
 
@@ -112,8 +113,8 @@ const OtelTracer$1 = /*#__PURE__*/Context__namespace.Tag("@effect/opentelemetry/
 
 /** @internal */
 const make$1 = /*#__PURE__*/Effect__namespace.map(OtelTracer$1, tracer => Tracer__namespace.make({
-  span(name, parent, context, links, startTime) {
-    return new OtelSpan(OtelApi__namespace.context, tracer, name, parent, context, links, startTime);
+  span(name, parent, context, links, sampled, startTime) {
+    return new OtelSpan(OtelApi__namespace.context, tracer, name, parent, context, links, sampled, startTime);
   },
   context(execution, fiber) {
     const currentSpan = Option__namespace.flatMap(FiberRefs__namespace.get(fiber.getFiberRefs(), FiberRef__namespace.currentTracerSpan), List__namespace.head);
@@ -150,6 +151,7 @@ const makeExternalSpan$1 = options => {
     _tag: "ExternalSpan",
     traceId: options.traceId,
     spanId: options.spanId,
+    sampled: options.traceFlags ? options.traceFlags === OtelApi__namespace.TraceFlags.SAMPLED : true,
     context
   };
 };
@@ -161,7 +163,7 @@ const currentOtelSpan$1 = /*#__PURE__*/Effect__namespace.map(Effect__namespace.c
 const layerOtelTracer$1 = /*#__PURE__*/Layer__namespace.effect(OtelTracer$1, /*#__PURE__*/Effect__namespace.flatMap(Resource_dist_effectOpentelemetryResource.Resource, resource => Effect__namespace.sync(() => OtelApi__namespace.trace.getTracer(resource.attributes["service.name"], resource.attributes["service.version"]))));
 
 /** @internal */
-const layer$1 = /*#__PURE__*/Layer__namespace.provide(layerOtelTracer$1, /*#__PURE__*/Layer__namespace.unwrapEffect( /*#__PURE__*/Effect__namespace.map(make$1, Effect__namespace.setTracer)));
+const layer$1 = /*#__PURE__*/Layer__namespace.provide(layerOtelTracer$1, /*#__PURE__*/Layer__namespace.unwrapEffect( /*#__PURE__*/Effect__namespace.map(make$1, Layer__namespace.setTracer)));
 
 // -------------------------------------------------------------------------------------
 // utils
@@ -181,6 +183,27 @@ const makeSpanContext = (span, context) => ({
   traceState: Option__namespace.getOrUndefined(context ? extractTraceTag(span, context, traceStateTag) : Context__namespace.getOption(span.context, traceStateTag))
 });
 const extractTraceTag = (parent, context, tag) => Option__namespace.orElse(Context__namespace.getOption(context, tag), () => Context__namespace.getOption(parent.context, tag));
+const recordToAttributes = value => {
+  return Object.entries(value).reduce((acc, [key, value]) => {
+    acc[key] = unknownToAttributeValue(value);
+    return acc;
+  }, {});
+};
+const unknownToAttributeValue = value => {
+  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    return value;
+  } else if (typeof value === "bigint") {
+    return Number(value);
+  }
+  return objectToAttribute(value);
+};
+const objectToAttribute = value => {
+  try {
+    return JSON.stringify(value, null, 2);
+  } catch {
+    return String(value);
+  }
+};
 
 /**
  * @since 1.0.0

package/dist/declarations/src/NodeSdk.d.ts

@@ -2,7 +2,7 @@
  * @since 1.0.0
  */
 import type { NodeSDKConfiguration } from "@opentelemetry/sdk-node";
-import * as Effect from "effect/Effect";
+import type { LazyArg } from "effect/Function";
 import * as Layer from "effect/Layer";
 import { Resource } from "./Resource.js";
 /**
@@ -19,5 +19,5 @@ export declare const config: (config: Configuration) => Configuration;
  * @since 1.0.0
  * @category layer
  */
-export declare const layer: <R, E>(config: Effect.Effect<R, E, Partial<Omit<NodeSDKConfiguration, "resource" | "serviceName">>>) => Layer.Layer<Resource | R, E, never>;
+export declare const layer: (config: LazyArg<Configuration>) => Layer.Layer<Resource, never, never>;
 //# sourceMappingURL=NodeSdk.d.ts.map

package/dist/declarations/src/NodeSdk.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NodeSdk.d.ts","sourceRoot":"../../../src","sources":["NodeSdk.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAEnE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,QAAQ,EAAE,sBAAkB;AAErC;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE,UAAU,GAAG,aAAa,CAAC,CAAC,CAAA;AAE3F;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,aAAiD,CAAA;AAEjG;;;GAGG;AACH,eAAO,MAAM,KAAK,6IAcd,CAAA"}
+{"version":3,"file":"NodeSdk.d.ts","sourceRoot":"../../../src","sources":["NodeSdk.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAGnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,QAAQ,EAAE,sBAAkB;AAErC;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE,UAAU,GAAG,aAAa,CAAC,CAAC,CAAA;AAE3F;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,aAAiD,CAAA;AAEjG;;;GAGG;AACH,eAAO,MAAM,KAAK,WACR,QAAQ,aAAa,CAAC,KAC7B,WAAW,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAYjC,CAAA"}

package/internal/tracer.esm.js

@@ -14,17 +14,18 @@ import { Resource } from '../Resource/dist/effect-opentelemetry-Resource.esm.js'
 class OtelSpan {
   _tag = "Span";
   attributes = new Map();
-  constructor(contextApi, tracer, name, parent, context, links, startTime) {
+  constructor(contextApi, tracer, name, parent, context, links, sampled, startTime) {
     this.name = name;
     this.parent = parent;
     this.context = context;
     this.links = links;
+    this.sampled = sampled;
     const active = contextApi.active();
     this.span = tracer.startSpan(name, {
       startTime: nanosToHrTime(startTime),
       links: links.length > 0 ? links.map(link => ({
         context: makeSpanContext(link.span),
-        attributes: link.attributes
+        attributes: recordToAttributes(link.attributes)
       })) : undefined
     }, parent._tag === "Some" ? populateContext(active, parent.value, context) : OtelApi.trace.deleteSpan(active));
     const spanContext = this.span.spanContext();
@@ -36,7 +37,7 @@ class OtelSpan {
     };
   }
   attribute(key, value) {
-    this.span.setAttribute(key, value);
+    this.span.setAttribute(key, unknownToAttributeValue(value));
     this.attributes.set(key, value);
   }
   end(endTime, exit) {
@@ -68,7 +69,7 @@ class OtelSpan {
     this.span.end(nanosToHrTime(endTime));
   }
   event(name, startTime, attributes) {
-    this.span.addEvent(name, attributes, nanosToHrTime(startTime));
+    this.span.addEvent(name, attributes ? recordToAttributes(attributes) : undefined, nanosToHrTime(startTime));
   }
 }
 
@@ -77,8 +78,8 @@ const OtelTracer = /*#__PURE__*/Context.Tag("@effect/opentelemetry/Tracer/OtelTr
 
 /** @internal */
 const make = /*#__PURE__*/Effect.map(OtelTracer, tracer => Tracer.make({
-  span(name, parent, context, links, startTime) {
-    return new OtelSpan(OtelApi.context, tracer, name, parent, context, links, startTime);
+  span(name, parent, context, links, sampled, startTime) {
+    return new OtelSpan(OtelApi.context, tracer, name, parent, context, links, sampled, startTime);
   },
   context(execution, fiber) {
     const currentSpan = Option.flatMap(FiberRefs.get(fiber.getFiberRefs(), FiberRef.currentTracerSpan), List.head);
@@ -115,6 +116,7 @@ const makeExternalSpan = options => {
     _tag: "ExternalSpan",
     traceId: options.traceId,
     spanId: options.spanId,
+    sampled: options.traceFlags ? options.traceFlags === OtelApi.TraceFlags.SAMPLED : true,
     context
   };
 };
@@ -126,7 +128,7 @@ const currentOtelSpan = /*#__PURE__*/Effect.map(Effect.currentSpan, span => Opti
 const layerOtelTracer = /*#__PURE__*/Layer.effect(OtelTracer, /*#__PURE__*/Effect.flatMap(Resource, resource => Effect.sync(() => OtelApi.trace.getTracer(resource.attributes["service.name"], resource.attributes["service.version"]))));
 
 /** @internal */
-const layer = /*#__PURE__*/Layer.provide(layerOtelTracer, /*#__PURE__*/Layer.unwrapEffect( /*#__PURE__*/Effect.map(make, Effect.setTracer)));
+const layer = /*#__PURE__*/Layer.provide(layerOtelTracer, /*#__PURE__*/Layer.unwrapEffect( /*#__PURE__*/Effect.map(make, Layer.setTracer)));
 
 // -------------------------------------------------------------------------------------
 // utils
@@ -146,5 +148,26 @@ const makeSpanContext = (span, context) => ({
   traceState: Option.getOrUndefined(context ? extractTraceTag(span, context, traceStateTag) : Context.getOption(span.context, traceStateTag))
 });
 const extractTraceTag = (parent, context, tag) => Option.orElse(Context.getOption(context, tag), () => Context.getOption(parent.context, tag));
+const recordToAttributes = value => {
+  return Object.entries(value).reduce((acc, [key, value]) => {
+    acc[key] = unknownToAttributeValue(value);
+    return acc;
+  }, {});
+};
+const unknownToAttributeValue = value => {
+  if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    return value;
+  } else if (typeof value === "bigint") {
+    return Number(value);
+  }
+  return objectToAttribute(value);
+};
+const objectToAttribute = value => {
+  try {
+    return JSON.stringify(value, null, 2);
+  } catch {
+    return String(value);
+  }
+};
 
 export { OtelSpan, OtelTracer, currentOtelSpan, layer, layerOtelTracer, make, makeExternalSpan, traceFlagsTag, traceStateTag };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/opentelemetry",
-  "version": "0.16.0",
+  "version": "0.18.0",
   "publishConfig": {
     "access": "public"
   },
@@ -49,7 +49,7 @@
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.4",
-    "effect": "2.0.0-next.46"
+    "effect": "2.0.0-next.48"
   },
   "devDependencies": {
     "@babel/core": "^7.23.0",
@@ -57,7 +57,7 @@
     "@changesets/changelog-github": "^0.4.8",
     "@changesets/cli": "^2.26.2",
     "@effect/babel-plugin": "^0.2.0",
-    "@effect/build-utils": "^0.1.6",
+    "@effect/build-utils": "^0.1.9",
     "@effect/docgen": "^0.1.8",
     "@effect/eslint-plugin": "^0.1.2",
     "@effect/language-service": "^0.0.21",
@@ -66,17 +66,17 @@
     "@opentelemetry/exporter-trace-otlp-http": "^0.43.0",
     "@opentelemetry/sdk-trace-base": "^1.17.0",
     "@preconstruct/cli": "^2.8.1",
-    "@types/chai": "^4.3.6",
-    "@types/node": "^20.8.2",
-    "@typescript-eslint/eslint-plugin": "^6.7.4",
-    "@typescript-eslint/parser": "^6.7.4",
+    "@types/chai": "^4.3.7",
+    "@types/node": "^20.8.4",
+    "@typescript-eslint/eslint-plugin": "^6.7.5",
+    "@typescript-eslint/parser": "^6.7.5",
     "@vitejs/plugin-react": "^4.1.0",
     "@vitest/coverage-v8": "^0.34.6",
     "@vitest/expect": "^0.34.6",
     "babel-plugin-annotate-pure-calls": "^0.4.0",
     "concurrently": "^8.2.1",
-    "effect": "2.0.0-next.46",
-    "eslint": "^8.50.0",
+    "effect": "2.0.0-next.48",
+    "eslint": "^8.51.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-codegen": "0.17.0",
     "eslint-plugin-deprecation": "^2.0.0",

package/src/NodeSdk.ts

@@ -4,6 +4,7 @@
 import type { NodeSDKConfiguration } from "@opentelemetry/sdk-node"
 import { NodeSDK } from "@opentelemetry/sdk-node"
 import * as Effect from "effect/Effect"
+import type { LazyArg } from "effect/Function"
 import * as Layer from "effect/Layer"
 import { Resource } from "./Resource"
 
@@ -23,15 +24,15 @@ export const config: (config: Configuration) => Configuration = (config: Configu
  * @since 1.0.0
  * @category layer
  */
-export const layer = <R, E>(
-  config: Effect.Effect<R, E, Configuration>
-): Layer.Layer<Resource | R, E, never> =>
+export const layer = (
+  config: LazyArg<Configuration>
+): Layer.Layer<Resource, never, never> =>
   Layer.scopedDiscard(Effect.acquireRelease(
     Effect.flatMap(
-      Effect.all([config, Resource]),
-      ([config, resource]) =>
+      Resource,
+      (resource) =>
         Effect.sync(() => {
-          const sdk = new NodeSDK({ ...config, resource })
+          const sdk = new NodeSDK({ ...config(), resource })
           sdk.start()
           return sdk
         })

package/src/internal/tracer.ts

@@ -18,7 +18,7 @@ export class OtelSpan implements Tracer.Span {
   readonly span: OtelApi.Span
   readonly spanId: string
   readonly traceId: string
-  readonly attributes = new Map<string, Tracer.AttributeValue>()
+  readonly attributes = new Map<string, unknown>()
   status: Tracer.SpanStatus
 
   constructor(
@@ -28,6 +28,7 @@ export class OtelSpan implements Tracer.Span {
     readonly parent: Option.Option<Tracer.ParentSpan>,
     readonly context: Context.Context<never>,
     readonly links: ReadonlyArray<Tracer.SpanLink>,
+    readonly sampled: boolean,
     startTime: bigint
   ) {
     const active = contextApi.active()
@@ -38,7 +39,7 @@ export class OtelSpan implements Tracer.Span {
         links: links.length > 0
           ? links.map((link) => ({
             context: makeSpanContext(link.span),
-            attributes: link.attributes
+            attributes: recordToAttributes(link.attributes)
           }))
           : undefined
       },
@@ -55,8 +56,8 @@ export class OtelSpan implements Tracer.Span {
     }
   }
 
-  attribute(key: string, value: Tracer.AttributeValue) {
-    this.span.setAttribute(key, value)
+  attribute(key: string, value: unknown) {
+    this.span.setAttribute(key, unknownToAttributeValue(value))
     this.attributes.set(key, value)
   }
 
@@ -90,8 +91,12 @@ export class OtelSpan implements Tracer.Span {
     this.span.end(nanosToHrTime(endTime))
   }
 
-  event(name: string, startTime: bigint, attributes?: Record<string, Tracer.AttributeValue>) {
-    this.span.addEvent(name, attributes, nanosToHrTime(startTime))
+  event(name: string, startTime: bigint, attributes?: Record<string, unknown>) {
+    this.span.addEvent(
+      name,
+      attributes ? recordToAttributes(attributes) : undefined,
+      nanosToHrTime(startTime)
+    )
   }
 }
 
@@ -101,7 +106,7 @@ export const OtelTracer = Context.Tag<OtelApi.Tracer>("@effect/opentelemetry/Tra
 /** @internal */
 export const make = Effect.map(OtelTracer, (tracer) =>
   Tracer.make({
-    span(name, parent, context, links, startTime) {
+    span(name, parent, context, links, sampled, startTime) {
       return new OtelSpan(
         OtelApi.context,
         tracer,
@@ -109,6 +114,7 @@ export const make = Effect.map(OtelTracer, (tracer) =>
         parent,
         context,
         links,
+        sampled,
         startTime
       )
     },
@@ -166,6 +172,9 @@ export const makeExternalSpan = (options: {
     _tag: "ExternalSpan",
     traceId: options.traceId,
     spanId: options.spanId,
+    sampled: options.traceFlags
+      ? options.traceFlags === OtelApi.TraceFlags.SAMPLED
+      : true,
     context
   }
 }
@@ -198,7 +207,7 @@ export const layerOtelTracer = Layer.effect(
 /** @internal */
 export const layer = Layer.provide(
   layerOtelTracer,
-  Layer.unwrapEffect(Effect.map(make, Effect.setTracer))
+  Layer.unwrapEffect(Effect.map(make, Layer.setTracer))
 )
 
 // -------------------------------------------------------------------------------------
@@ -247,3 +256,28 @@ const extractTraceTag = <I, S>(
     Context.getOption(context, tag),
     () => 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 objectToAttribute(value)
+}
+
+const objectToAttribute = (value: unknown): string => {
+  try {
+    return JSON.stringify(value, null, 2)
+  } catch {
+    return String(value)
+  }
+}

package/src/tsconfig.json

@@ -0,0 +1,48 @@
+{
+  "compilerOptions": {
+    "moduleDetection": "force",
+    "downlevelIteration": true,
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "preserveSymlinks": true,
+    "moduleResolution": "NodeNext",
+    "lib": [
+      "ES2021",
+      "DOM",
+      "DOM.Iterable"
+    ],
+    "sourceMap": true,
+    "strict": true,
+    "noImplicitReturns": false,
+    "noUnusedLocals": true,
+    "noUnusedParameters": false,
+    "noFallthroughCasesInSwitch": true,
+    "noEmitOnError": false,
+    "allowJs": false,
+    "checkJs": false,
+    "forceConsistentCasingInFileNames": true,
+    "stripInternal": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "noUncheckedIndexedAccess": false,
+    "strictNullChecks": true,
+    "target": "ES2021",
+    "module": "NodeNext",
+    "incremental": true,
+    "removeComments": false,
+    "paths": {
+      "@effect/opentelemetry": [
+        "./index.ts"
+      ],
+      "@effect/opentelemetry/*": [
+        "./*.ts"
+      ]
+    }
+  },
+  "include": [
+    "**/*"
+  ]
+}