@effect/opentelemetry 0.56.4 → 0.56.5

package/dist/cjs/Logger.js

@@ -9,8 +9,11 @@ var Arr = _interopRequireWildcard(require("effect/Array"));
 var Context = _interopRequireWildcard(require("effect/Context"));
 var Effect = _interopRequireWildcard(require("effect/Effect"));
 var FiberId = _interopRequireWildcard(require("effect/FiberId"));
+var FiberRef = _interopRequireWildcard(require("effect/FiberRef"));
+var FiberRefs = _interopRequireWildcard(require("effect/FiberRefs"));
 var Layer = _interopRequireWildcard(require("effect/Layer"));
 var Logger = _interopRequireWildcard(require("effect/Logger"));
+var Tracer = _interopRequireWildcard(require("effect/Tracer"));
 var _utils = require("./internal/utils.js");
 var _Resource = require("./Resource.js");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
@@ -37,6 +40,11 @@ const make = exports.make = /*#__PURE__*/Effect.gen(function* () {
     const attributes = {
       fiberId: FiberId.threadName(options.fiberId)
     };
+    const maybeSpan = Context.getOption(FiberRefs.getOrDefault(options.context, FiberRef.currentContext), Tracer.ParentSpan);
+    if (maybeSpan._tag === "Some") {
+      attributes.spanId = maybeSpan.value.spanId;
+      attributes.traceId = maybeSpan.value.traceId;
+    }
     for (const [key, value] of options.annotations) {
       attributes[key] = (0, _utils.unknownToAttributeValue)(value);
     }

package/dist/cjs/Logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"Logger.js","names":["Otel","_interopRequireWildcard","require","Arr","Context","Effect","FiberId","Layer","Logger","_utils","_Resource","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","OtelLoggerProvider","Tag","exports","make","gen","loggerProvider","clock","otelLogger","getLogger","options","now","date","getTime","attributes","fiberId","threadName","key","value","annotations","unknownToAttributeValue","span","spans","label","startTime","message","ensure","map","emit","body","length","severityText","logLevel","severityNumber","ordinal","timestamp","observedTimestamp","unsafeCurrentTimeMillis","layerLoggerAdd","addEffect","layerLoggerReplace","replaceEffect","defaultLogger","layerLoggerProvider","processor","config","scoped","flatMap","Resource","resource","acquireRelease","sync","LoggerProvider","undefined","processors","provider","promise","forceFlush","then","shutdown","pipe","ignoreLogged","interruptible","timeoutOption","shutdownTimeout"],"sources":["../../src/Logger.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Logger.js","names":["Otel","_interopRequireWildcard","require","Arr","Context","Effect","FiberId","FiberRef","FiberRefs","Layer","Logger","Tracer","_utils","_Resource","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","OtelLoggerProvider","Tag","exports","make","gen","loggerProvider","clock","otelLogger","getLogger","options","now","date","getTime","attributes","fiberId","threadName","maybeSpan","getOption","getOrDefault","context","currentContext","ParentSpan","_tag","spanId","value","traceId","key","annotations","unknownToAttributeValue","span","spans","label","startTime","message","ensure","map","emit","body","length","severityText","logLevel","severityNumber","ordinal","timestamp","observedTimestamp","unsafeCurrentTimeMillis","layerLoggerAdd","addEffect","layerLoggerReplace","replaceEffect","defaultLogger","layerLoggerProvider","processor","config","scoped","flatMap","Resource","resource","acquireRelease","sync","LoggerProvider","undefined","processors","provider","promise","forceFlush","then","shutdown","pipe","ignoreLogged","interruptible","timeoutOption","shutdownTimeout"],"sources":["../../src/Logger.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/dts/Logger.d.ts.map

@@ -1 +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;AAEzD,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;;AAExC;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,uBAGrC;CAAG;AAEN;;;GAGG;AACH,eAAO,MAAM,IAAI,EAAE,MAAM,CAAC,MAAM,CAC9B,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,EAC5B,KAAK,EACL,kBAAkB,CA6BlB,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,KAAK,CACtC,KAAK,EACL,KAAK,EACL,kBAAkB,CACM,CAAA;AAE1B;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,KAAK,CAC1C,KAAK,EACL,KAAK,EACL,kBAAkB,CACgC,CAAA;AAEpD;;;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"}
+{"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;AAEzD,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAIvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;;AAExC;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,uBAGrC;CAAG;AAEN;;;GAGG;AACH,eAAO,MAAM,IAAI,EAAE,MAAM,CAAC,MAAM,CAC9B,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,EAC5B,KAAK,EACL,kBAAkB,CAwClB,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,KAAK,CACtC,KAAK,EACL,KAAK,EACL,kBAAkB,CACM,CAAA;AAE1B;;;GAGG;AACH,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,KAAK,CAC1C,KAAK,EACL,KAAK,EACL,kBAAkB,CACgC,CAAA;AAEpD;;;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/esm/Logger.js

@@ -6,8 +6,11 @@ import * as Arr from "effect/Array";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as FiberId from "effect/FiberId";
+import * as FiberRef from "effect/FiberRef";
+import * as FiberRefs from "effect/FiberRefs";
 import * as Layer from "effect/Layer";
 import * as Logger from "effect/Logger";
+import * as Tracer from "effect/Tracer";
 import { unknownToAttributeValue } from "./internal/utils.js";
 import { Resource } from "./Resource.js";
 /**
@@ -28,6 +31,11 @@ export const make = /*#__PURE__*/Effect.gen(function* () {
     const attributes = {
       fiberId: FiberId.threadName(options.fiberId)
     };
+    const maybeSpan = Context.getOption(FiberRefs.getOrDefault(options.context, FiberRef.currentContext), Tracer.ParentSpan);
+    if (maybeSpan._tag === "Some") {
+      attributes.spanId = maybeSpan.value.spanId;
+      attributes.traceId = maybeSpan.value.traceId;
+    }
     for (const [key, value] of options.annotations) {
       attributes[key] = unknownToAttributeValue(value);
     }

package/dist/esm/Logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"Logger.js","names":["Otel","Arr","Context","Effect","FiberId","Layer","Logger","unknownToAttributeValue","Resource","OtelLoggerProvider","Tag","make","gen","loggerProvider","clock","otelLogger","getLogger","options","now","date","getTime","attributes","fiberId","threadName","key","value","annotations","span","spans","label","startTime","message","ensure","map","emit","body","length","severityText","logLevel","severityNumber","ordinal","timestamp","observedTimestamp","unsafeCurrentTimeMillis","layerLoggerAdd","addEffect","layerLoggerReplace","replaceEffect","defaultLogger","layerLoggerProvider","processor","config","scoped","flatMap","resource","acquireRelease","sync","LoggerProvider","undefined","processors","provider","promise","forceFlush","then","shutdown","pipe","ignoreLogged","interruptible","timeoutOption","shutdownTimeout"],"sources":["../../src/Logger.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Logger.js","names":["Otel","Arr","Context","Effect","FiberId","FiberRef","FiberRefs","Layer","Logger","Tracer","unknownToAttributeValue","Resource","OtelLoggerProvider","Tag","make","gen","loggerProvider","clock","otelLogger","getLogger","options","now","date","getTime","attributes","fiberId","threadName","maybeSpan","getOption","getOrDefault","context","currentContext","ParentSpan","_tag","spanId","value","traceId","key","annotations","span","spans","label","startTime","message","ensure","map","emit","body","length","severityText","logLevel","severityNumber","ordinal","timestamp","observedTimestamp","unsafeCurrentTimeMillis","layerLoggerAdd","addEffect","layerLoggerReplace","replaceEffect","defaultLogger","layerLoggerProvider","processor","config","scoped","flatMap","resource","acquireRelease","sync","LoggerProvider","undefined","processors","provider","promise","forceFlush","then","shutdown","pipe","ignoreLogged","interruptible","timeoutOption","shutdownTimeout"],"sources":["../../src/Logger.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect/opentelemetry",
-  "version": "0.56.4",
+  "version": "0.56.5",
   "description": "OpenTelemetry integration for Effect",
   "license": "MIT",
   "repository": {
@@ -19,8 +19,8 @@
     "@opentelemetry/sdk-trace-web": "^2.0.0",
     "@opentelemetry/sdk-logs": "^0.203.0",
     "@opentelemetry/semantic-conventions": "^1.33.0",
-    "@effect/platform": "^0.90.5",
-    "effect": "^3.17.8"
+    "@effect/platform": "^0.90.6",
+    "effect": "^3.17.10"
   },
   "peerDependenciesMeta": {
     "@opentelemetry/api": {

package/src/Logger.ts

@@ -8,8 +8,11 @@ import * as Context from "effect/Context"
 import type { DurationInput } from "effect/Duration"
 import * as Effect from "effect/Effect"
 import * as FiberId from "effect/FiberId"
+import * as FiberRef from "effect/FiberRef"
+import * as FiberRefs from "effect/FiberRefs"
 import * as Layer from "effect/Layer"
 import * as Logger from "effect/Logger"
+import * as Tracer from "effect/Tracer"
 import { unknownToAttributeValue } from "./internal/utils.js"
 import { Resource } from "./Resource.js"
 
@@ -41,6 +44,17 @@ export const make: Effect.Effect<
     const attributes: Record<string, any> = {
       fiberId: FiberId.threadName(options.fiberId)
     }
+
+    const maybeSpan = Context.getOption(
+      FiberRefs.getOrDefault(options.context, FiberRef.currentContext),
+      Tracer.ParentSpan
+    )
+
+    if (maybeSpan._tag === "Some") {
+      attributes.spanId = maybeSpan.value.spanId
+      attributes.traceId = maybeSpan.value.traceId
+    }
+
     for (const [key, value] of options.annotations) {
       attributes[key] = unknownToAttributeValue(value)
     }