@effect/opentelemetry 0.1.3 → 0.2.0

package/Tracer.d.ts

@@ -1,18 +1,41 @@
 /**
  * @since 1.0.0
  */
+import type { Tag } from "@effect/data/Context";
 import type { Effect } from "@effect/io/Effect";
 import type { Layer } from "@effect/io/Layer";
-import type { Tracer } from "@effect/io/Tracer";
+import type { ExternalSpan, Tracer } from "@effect/io/Tracer";
 import type { Resource } from "@effect/opentelemetry/Resource";
+import type * as Otel from "@opentelemetry/api";
 /**
  * @since 1.0.0
  * @category constructors
  */
 export declare const make: Effect<Resource, never, Tracer>;
+/**
+ * @since 1.0.0
+ * @category constructors
+ */
+export declare const makeExternalSpan: (options: {
+    readonly name: string;
+    readonly traceId: string;
+    readonly spanId: string;
+    readonly traceFlags?: Otel.TraceFlags;
+    readonly traceState?: string;
+}) => ExternalSpan;
 /**
  * @since 1.0.0
  * @category layers
  */
 export declare const layer: Layer<Resource, never, never>;
+/**
+ * @since 1.0.0
+ * @category tags
+ */
+export declare const TraceFlags: Tag<Otel.TraceFlags, Otel.TraceFlags>;
+/**
+ * @since 1.0.0
+ * @category tags
+ */
+export declare const TraceState: Tag<Otel.TraceState, Otel.TraceState>;
 //# sourceMappingURL=Tracer.d.ts.map

package/Tracer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tracer.d.ts","sourceRoot":"","sources":["./src/Tracer.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAA;AAE9D;;;GAGG;AACH,eAAO,MAAM,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAiB,CAAA;AAElE;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAkB,CAAA"}
+{"version":3,"file":"Tracer.d.ts","sourceRoot":"","sources":["./src/Tracer.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAA;AAC9D,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE/C;;;GAGG;AACH,eAAO,MAAM,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAiB,CAAA;AAElE;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,CAC7B,OAAO,EAAE;IACP,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,UAAU,CAAA;IACrC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAC7B,KACE,YAAwC,CAAA;AAE7C;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAkB,CAAA;AAElE;;;GAGG;AACH,eAAO,MAAM,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAA0B,CAAA;AAEvF;;;GAGG;AACH,eAAO,MAAM,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAA0B,CAAA"}

package/Tracer.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.make = exports.layer = void 0;
+exports.makeExternalSpan = exports.make = exports.layer = exports.TraceState = exports.TraceFlags = void 0;
 var internal = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/opentelemetry/internal_effect_untraced/tracer"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -14,9 +14,27 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 const make = internal.make;
 /**
  * @since 1.0.0
- * @category layers
+ * @category constructors
  */
 exports.make = make;
+const makeExternalSpan = internal.makeExternalSpan;
+/**
+ * @since 1.0.0
+ * @category layers
+ */
+exports.makeExternalSpan = makeExternalSpan;
 const layer = internal.layer;
+/**
+ * @since 1.0.0
+ * @category tags
+ */
 exports.layer = layer;
+const TraceFlags = internal.traceFlagsTag;
+/**
+ * @since 1.0.0
+ * @category tags
+ */
+exports.TraceFlags = TraceFlags;
+const TraceState = internal.traceStateTag;
+exports.TraceState = TraceState;
 //# sourceMappingURL=Tracer.js.map

package/Tracer.js.map

@@ -1 +1 @@
-{"version":3,"file":"Tracer.js","names":["internal","_interopRequireWildcard","require","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","make","exports","layer"],"sources":["./src/Tracer.ts"],"sourcesContent":[null],"mappings":";;;;;;AAMA,IAAAA,QAAA,gBAAAC,uBAAA,eAAAC,OAAA;AAAiF,SAAAC,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAH,wBAAAO,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAGjF;;;;AAIO,MAAMW,IAAI,GAAoCzB,QAAQ,CAACyB,IAAI;AAElE;;;;AAAAC,OAAA,CAAAD,IAAA,GAAAA,IAAA;AAIO,MAAME,KAAK,GAAkC3B,QAAQ,CAAC2B,KAAK;AAAAD,OAAA,CAAAC,KAAA,GAAAA,KAAA"}
+{"version":3,"file":"Tracer.js","names":["internal","_interopRequireWildcard","require","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","make","exports","makeExternalSpan","layer","TraceFlags","traceFlagsTag","TraceState","traceStateTag"],"sources":["./src/Tracer.ts"],"sourcesContent":[null],"mappings":";;;;;;AAOA,IAAAA,QAAA,gBAAAC,uBAAA,eAAAC,OAAA;AAAiF,SAAAC,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAH,wBAAAO,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAIjF;;;;AAIO,MAAMW,IAAI,GAAoCzB,QAAQ,CAACyB,IAAI;AAElE;;;;AAAAC,OAAA,CAAAD,IAAA,GAAAA,IAAA;AAIO,MAAME,gBAAgB,GAQT3B,QAAQ,CAAC2B,gBAAgB;AAE7C;;;;AAAAD,OAAA,CAAAC,gBAAA,GAAAA,gBAAA;AAIO,MAAMC,KAAK,GAAkC5B,QAAQ,CAAC4B,KAAK;AAElE;;;;AAAAF,OAAA,CAAAE,KAAA,GAAAA,KAAA;AAIO,MAAMC,UAAU,GAA0C7B,QAAQ,CAAC8B,aAAa;AAEvF;;;;AAAAJ,OAAA,CAAAG,UAAA,GAAAA,UAAA;AAIO,MAAME,UAAU,GAA0C/B,QAAQ,CAACgC,aAAa;AAAAN,OAAA,CAAAK,UAAA,GAAAA,UAAA"}

package/internal_effect_untraced/tracer.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.make = exports.layer = exports.OtelSpan = void 0;
+exports.traceStateTag = exports.traceFlagsTag = exports.makeExternalSpan = exports.make = exports.layer = exports.OtelSpan = void 0;
+var Context = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/data/Context"));
+var Option = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/data/Option"));
 var Cause = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Cause"));
 var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
 var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Layer"));
@@ -14,21 +16,23 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /** @internal */
 class OtelSpan {
-  constructor(traceApi, contextApi, tracer, name, parent, startTime) {
+  constructor(traceApi, contextApi, tracer, name, parent, context, startTime) {
     this.name = name;
     this.parent = parent;
+    this.context = context;
     this._tag = "Span";
     this.attributes = new Map();
     const active = contextApi.active();
     this.span = parent._tag === "Some" ? tracer.startSpan(name, {
-      startTime
+      startTime: nanosToHrTime(startTime)
     }, parent.value instanceof OtelSpan ? traceApi.setSpan(active, parent.value.span) : traceApi.setSpanContext(active, {
       spanId: parent.value.spanId,
       traceId: parent.value.traceId,
       isRemote: parent.value._tag === "ExternalSpan",
-      traceFlags: OtelApi.TraceFlags.SAMPLED
+      traceFlags: Option.getOrElse(extractTraceTag(parent, context, traceFlagsTag), () => OtelApi.TraceFlags.SAMPLED),
+      traceState: Option.getOrUndefined(extractTraceTag(parent, context, traceStateTag))
     })) : tracer.startSpan(name, {
-      startTime
+      startTime: nanosToHrTime(startTime)
     }, active);
     const spanContext = this.span.spanContext();
     this.spanId = spanContext.spanId;
@@ -65,21 +69,53 @@ class OtelSpan {
         });
       }
     }
-    this.span.end(endTime);
+    this.span.end(nanosToHrTime(endTime));
   }
-  event(name, attributes) {
-    this.span.addEvent(name, attributes);
+  event(name, startTime, attributes) {
+    this.span.addEvent(name, attributes, nanosToHrTime(startTime));
   }
 }
 /** @internal */
 exports.OtelSpan = OtelSpan;
 const make = /*#__PURE__*/Effect.map(tracer => Tracer.make({
-  span(name, parent, startTime) {
-    return new OtelSpan(OtelApi.trace, OtelApi.context, tracer, name, parent, startTime);
+  span(name, parent, context, startTime) {
+    return new OtelSpan(OtelApi.trace, OtelApi.context, tracer, name, parent, context, startTime);
   }
 }))( /*#__PURE__*/Effect.flatMap(resource => Effect.sync(() => OtelApi.trace.getTracer(resource.attributes["service.name"], resource.attributes["service.version"])))(_Resource.Resource));
 /** @internal */
 exports.make = make;
 const layer = /*#__PURE__*/Layer.unwrapEffect( /*#__PURE__*/Effect.map(make, Effect.setTracer));
+/** @internal */
 exports.layer = layer;
+const traceFlagsTag = /*#__PURE__*/Context.Tag("@effect/opentelemetry/traceFlags");
+/** @internal */
+exports.traceFlagsTag = traceFlagsTag;
+const traceStateTag = /*#__PURE__*/Context.Tag("@effect/opentelemetry/traceState");
+/** @internal */
+exports.traceStateTag = traceStateTag;
+const makeExternalSpan = options => {
+  let context = Context.empty();
+  if (options.traceFlags) {
+    context = Context.add(context, traceFlagsTag, options.traceFlags);
+  }
+  if (options.traceState) {
+    context = Option.match(createTraceState(options.traceState), () => context, traceState => Context.add(context, traceStateTag, traceState));
+  }
+  return {
+    _tag: "ExternalSpan",
+    name: options.name,
+    traceId: options.traceId,
+    spanId: options.spanId,
+    context
+  };
+};
+exports.makeExternalSpan = makeExternalSpan;
+const oneE9 = 1000000000n;
+const nanosToHrTime = timestamp => {
+  const nanos = timestamp % oneE9;
+  const seconds = Number((timestamp - nanos) / oneE9);
+  return [seconds, Number(nanos)];
+};
+const extractTraceTag = (parent, context, tag) => Option.orElse(Context.getOption(context, tag), () => Option.flatMap(parent, parent => Context.getOption(parent.context, tag)));
+const createTraceState = /*#__PURE__*/Option.liftThrowable(OtelApi.createTraceState);
 //# sourceMappingURL=tracer.js.map

package/internal_effect_untraced/tracer.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracer.js","names":["Cause","_interopRequireWildcard","require","Effect","Layer","Tracer","_Resource","OtelApi","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","OtelSpan","constructor","traceApi","contextApi","tracer","name","parent","startTime","_tag","attributes","Map","active","span","startSpan","value","setSpan","setSpanContext","spanId","traceId","isRemote","traceFlags","TraceFlags","SAMPLED","spanContext","status","attribute","setAttribute","end","endTime","exit","setStatus","code","SpanStatusCode","OK","isInterruptedOnly","cause","ERROR","message","pretty","event","addEvent","exports","make","map","trace","context","flatMap","resource","sync","getTracer","Resource","layer","unwrapEffect","setTracer"],"sources":["../src/internal_effect_untraced/tracer.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"tracer.js","names":["Context","_interopRequireWildcard","require","Option","Cause","Effect","Layer","Tracer","_Resource","OtelApi","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","OtelSpan","constructor","traceApi","contextApi","tracer","name","parent","context","startTime","_tag","attributes","Map","active","span","startSpan","nanosToHrTime","value","setSpan","setSpanContext","spanId","traceId","isRemote","traceFlags","getOrElse","extractTraceTag","traceFlagsTag","TraceFlags","SAMPLED","traceState","getOrUndefined","traceStateTag","spanContext","status","attribute","setAttribute","end","endTime","exit","setStatus","code","SpanStatusCode","OK","isInterruptedOnly","cause","ERROR","message","pretty","event","addEvent","exports","make","map","trace","flatMap","resource","sync","getTracer","Resource","layer","unwrapEffect","setTracer","Tag","makeExternalSpan","options","empty","add","match","createTraceState","oneE9","timestamp","nanos","seconds","Number","tag","orElse","getOption","liftThrowable"],"sources":["../src/internal_effect_untraced/tracer.ts"],"sourcesContent":[null],"mappings":"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"}

package/mjs/Tracer.mjs

@@ -4,9 +4,24 @@ import * as internal from "@effect/opentelemetry/internal_effect_untraced/tracer
  * @category constructors
  */
 export const make = internal.make;
+/**
+ * @since 1.0.0
+ * @category constructors
+ */
+export const makeExternalSpan = internal.makeExternalSpan;
 /**
  * @since 1.0.0
  * @category layers
  */
 export const layer = internal.layer;
+/**
+ * @since 1.0.0
+ * @category tags
+ */
+export const TraceFlags = internal.traceFlagsTag;
+/**
+ * @since 1.0.0
+ * @category tags
+ */
+export const TraceState = internal.traceStateTag;
 //# sourceMappingURL=Tracer.mjs.map

package/mjs/Tracer.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"Tracer.mjs","names":["internal","make","layer"],"sources":["../src/Tracer.ts"],"sourcesContent":[null],"mappings":"AAMA,OAAO,KAAKA,QAAQ,MAAM,uDAAuD;AAGjF;;;;AAIA,OAAO,MAAMC,IAAI,GAAoCD,QAAQ,CAACC,IAAI;AAElE;;;;AAIA,OAAO,MAAMC,KAAK,GAAkCF,QAAQ,CAACE,KAAK"}
+{"version":3,"file":"Tracer.mjs","names":["internal","make","makeExternalSpan","layer","TraceFlags","traceFlagsTag","TraceState","traceStateTag"],"sources":["../src/Tracer.ts"],"sourcesContent":[null],"mappings":"AAOA,OAAO,KAAKA,QAAQ,MAAM,uDAAuD;AAIjF;;;;AAIA,OAAO,MAAMC,IAAI,GAAoCD,QAAQ,CAACC,IAAI;AAElE;;;;AAIA,OAAO,MAAMC,gBAAgB,GAQTF,QAAQ,CAACE,gBAAgB;AAE7C;;;;AAIA,OAAO,MAAMC,KAAK,GAAkCH,QAAQ,CAACG,KAAK;AAElE;;;;AAIA,OAAO,MAAMC,UAAU,GAA0CJ,QAAQ,CAACK,aAAa;AAEvF;;;;AAIA,OAAO,MAAMC,UAAU,GAA0CN,QAAQ,CAACO,aAAa"}

package/mjs/internal_effect_untraced/tracer.mjs

@@ -1,3 +1,5 @@
+import * as Context from "@effect/data/Context";
+import * as Option from "@effect/data/Option";
 import * as Cause from "@effect/io/Cause";
 import * as Effect from "@effect/io/Effect";
 import * as Layer from "@effect/io/Layer";
@@ -6,21 +8,23 @@ import { Resource } from "@effect/opentelemetry/Resource";
 import * as OtelApi from "@opentelemetry/api";
 /** @internal */
 export class OtelSpan {
-  constructor(traceApi, contextApi, tracer, name, parent, startTime) {
+  constructor(traceApi, contextApi, tracer, name, parent, context, startTime) {
     this.name = name;
     this.parent = parent;
+    this.context = context;
     this._tag = "Span";
     this.attributes = new Map();
     const active = contextApi.active();
     this.span = parent._tag === "Some" ? tracer.startSpan(name, {
-      startTime
+      startTime: nanosToHrTime(startTime)
     }, parent.value instanceof OtelSpan ? traceApi.setSpan(active, parent.value.span) : traceApi.setSpanContext(active, {
       spanId: parent.value.spanId,
       traceId: parent.value.traceId,
       isRemote: parent.value._tag === "ExternalSpan",
-      traceFlags: OtelApi.TraceFlags.SAMPLED
+      traceFlags: Option.getOrElse(extractTraceTag(parent, context, traceFlagsTag), () => OtelApi.TraceFlags.SAMPLED),
+      traceState: Option.getOrUndefined(extractTraceTag(parent, context, traceStateTag))
     })) : tracer.startSpan(name, {
-      startTime
+      startTime: nanosToHrTime(startTime)
     }, active);
     const spanContext = this.span.spanContext();
     this.spanId = spanContext.spanId;
@@ -57,18 +61,47 @@ export class OtelSpan {
         });
       }
     }
-    this.span.end(endTime);
+    this.span.end(nanosToHrTime(endTime));
   }
-  event(name, attributes) {
-    this.span.addEvent(name, attributes);
+  event(name, startTime, attributes) {
+    this.span.addEvent(name, attributes, nanosToHrTime(startTime));
   }
 }
 /** @internal */
 export const make = /*#__PURE__*/Effect.map(tracer => Tracer.make({
-  span(name, parent, startTime) {
-    return new OtelSpan(OtelApi.trace, OtelApi.context, tracer, name, parent, startTime);
+  span(name, parent, context, startTime) {
+    return new OtelSpan(OtelApi.trace, OtelApi.context, tracer, name, parent, context, startTime);
   }
 }))( /*#__PURE__*/Effect.flatMap(resource => Effect.sync(() => OtelApi.trace.getTracer(resource.attributes["service.name"], resource.attributes["service.version"])))(Resource));
 /** @internal */
 export const layer = /*#__PURE__*/Layer.unwrapEffect( /*#__PURE__*/Effect.map(make, Effect.setTracer));
+/** @internal */
+export const traceFlagsTag = /*#__PURE__*/Context.Tag("@effect/opentelemetry/traceFlags");
+/** @internal */
+export const traceStateTag = /*#__PURE__*/Context.Tag("@effect/opentelemetry/traceState");
+/** @internal */
+export const makeExternalSpan = options => {
+  let context = Context.empty();
+  if (options.traceFlags) {
+    context = Context.add(context, traceFlagsTag, options.traceFlags);
+  }
+  if (options.traceState) {
+    context = Option.match(createTraceState(options.traceState), () => context, traceState => Context.add(context, traceStateTag, traceState));
+  }
+  return {
+    _tag: "ExternalSpan",
+    name: options.name,
+    traceId: options.traceId,
+    spanId: options.spanId,
+    context
+  };
+};
+const oneE9 = 1000000000n;
+const nanosToHrTime = timestamp => {
+  const nanos = timestamp % oneE9;
+  const seconds = Number((timestamp - nanos) / oneE9);
+  return [seconds, Number(nanos)];
+};
+const extractTraceTag = (parent, context, tag) => Option.orElse(Context.getOption(context, tag), () => Option.flatMap(parent, parent => Context.getOption(parent.context, tag)));
+const createTraceState = /*#__PURE__*/Option.liftThrowable(OtelApi.createTraceState);
 //# sourceMappingURL=tracer.mjs.map

package/mjs/internal_effect_untraced/tracer.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"tracer.mjs","names":["Cause","Effect","Layer","Tracer","Resource","OtelApi","OtelSpan","constructor","traceApi","contextApi","tracer","name","parent","startTime","_tag","attributes","Map","active","span","startSpan","value","setSpan","setSpanContext","spanId","traceId","isRemote","traceFlags","TraceFlags","SAMPLED","spanContext","status","attribute","key","setAttribute","set","end","endTime","exit","setStatus","code","SpanStatusCode","OK","isInterruptedOnly","cause","ERROR","message","pretty","event","addEvent","make","map","trace","context","flatMap","resource","sync","getTracer","layer","unwrapEffect","setTracer"],"sources":["../../src/internal_effect_untraced/tracer.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"tracer.mjs","names":["Context","Option","Cause","Effect","Layer","Tracer","Resource","OtelApi","OtelSpan","constructor","traceApi","contextApi","tracer","name","parent","context","startTime","_tag","attributes","Map","active","span","startSpan","nanosToHrTime","value","setSpan","setSpanContext","spanId","traceId","isRemote","traceFlags","getOrElse","extractTraceTag","traceFlagsTag","TraceFlags","SAMPLED","traceState","getOrUndefined","traceStateTag","spanContext","status","attribute","key","setAttribute","set","end","endTime","exit","setStatus","code","SpanStatusCode","OK","isInterruptedOnly","cause","ERROR","message","pretty","event","addEvent","make","map","trace","flatMap","resource","sync","getTracer","layer","unwrapEffect","setTracer","Tag","makeExternalSpan","options","empty","add","match","createTraceState","oneE9","timestamp","nanos","seconds","Number","tag","orElse","getOption","liftThrowable"],"sources":["../../src/internal_effect_untraced/tracer.ts"],"sourcesContent":[null],"mappings":"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"}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@effect/opentelemetry",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/Effect-TS/opentelemetry.git"
   },
   "dependencies": {
-    "@effect/data": "^0.12.9",
-    "@effect/io": "^0.27.1",
+    "@effect/data": "^0.12.10",
+    "@effect/io": "^0.29.1",
     "@opentelemetry/api": "^1.4.1",
     "@opentelemetry/resources": "^1.14.0",
     "@opentelemetry/semantic-conventions": "^1.14.0"

package/src/Tracer.ts

@@ -1,11 +1,13 @@
 /**
  * @since 1.0.0
  */
+import type { Tag } from "@effect/data/Context"
 import type { Effect } from "@effect/io/Effect"
 import type { Layer } from "@effect/io/Layer"
-import type { Tracer } from "@effect/io/Tracer"
+import type { ExternalSpan, Tracer } from "@effect/io/Tracer"
 import * as internal from "@effect/opentelemetry/internal_effect_untraced/tracer"
 import type { Resource } from "@effect/opentelemetry/Resource"
+import type * as Otel from "@opentelemetry/api"
 
 /**
  * @since 1.0.0
@@ -13,8 +15,34 @@ import type { Resource } from "@effect/opentelemetry/Resource"
  */
 export const make: Effect<Resource, never, Tracer> = internal.make
 
+/**
+ * @since 1.0.0
+ * @category constructors
+ */
+export const makeExternalSpan: (
+  options: {
+    readonly name: string
+    readonly traceId: string
+    readonly spanId: string
+    readonly traceFlags?: Otel.TraceFlags
+    readonly traceState?: string
+  }
+) => ExternalSpan = internal.makeExternalSpan
+
 /**
  * @since 1.0.0
  * @category layers
  */
 export const layer: Layer<Resource, never, never> = internal.layer
+
+/**
+ * @since 1.0.0
+ * @category tags
+ */
+export const TraceFlags: Tag<Otel.TraceFlags, Otel.TraceFlags> = internal.traceFlagsTag
+
+/**
+ * @since 1.0.0
+ * @category tags
+ */
+export const TraceState: Tag<Otel.TraceState, Otel.TraceState> = internal.traceStateTag

package/src/internal_effect_untraced/tracer.ts

@@ -1,5 +1,6 @@
+import * as Context from "@effect/data/Context"
 import { pipe } from "@effect/data/Function"
-import type { Option } from "@effect/data/Option"
+import * as Option from "@effect/data/Option"
 import * as Cause from "@effect/io/Cause"
 import * as Effect from "@effect/io/Effect"
 import type { Exit } from "@effect/io/Exit"
@@ -15,7 +16,7 @@ export class OtelSpan implements Tracer.Span {
   readonly span: OtelApi.Span
   readonly spanId: string
   readonly traceId: string
-  readonly attributes = new Map<string, string>()
+  readonly attributes = new Map<string, Tracer.AttributeValue>()
   status: Tracer.SpanStatus
 
   constructor(
@@ -23,24 +24,29 @@ export class OtelSpan implements Tracer.Span {
     contextApi: OtelApi.ContextAPI,
     tracer: OtelApi.Tracer,
     readonly name: string,
-    readonly parent: Option<Tracer.ParentSpan>,
-    startTime: number
+    readonly parent: Option.Option<Tracer.ParentSpan>,
+    readonly context: Context.Context<never>,
+    startTime: bigint
   ) {
     const active = contextApi.active()
     this.span = parent._tag === "Some"
       ? tracer.startSpan(
         name,
-        { startTime },
+        { startTime: nanosToHrTime(startTime) },
         parent.value instanceof OtelSpan ?
           traceApi.setSpan(active, parent.value.span) :
           traceApi.setSpanContext(active, {
             spanId: parent.value.spanId,
             traceId: parent.value.traceId,
             isRemote: parent.value._tag === "ExternalSpan",
-            traceFlags: OtelApi.TraceFlags.SAMPLED
+            traceFlags: Option.getOrElse(
+              extractTraceTag(parent, context, traceFlagsTag),
+              () => OtelApi.TraceFlags.SAMPLED
+            ),
+            traceState: Option.getOrUndefined(extractTraceTag(parent, context, traceStateTag))
           })
       )
-      : tracer.startSpan(name, { startTime }, active)
+      : tracer.startSpan(name, { startTime: nanosToHrTime(startTime) }, active)
     const spanContext = this.span.spanContext()
 
     this.spanId = spanContext.spanId
@@ -52,12 +58,12 @@ export class OtelSpan implements Tracer.Span {
     }
   }
 
-  attribute(key: string, value: string) {
+  attribute(key: string, value: Tracer.AttributeValue) {
     this.span.setAttribute(key, value)
     this.attributes.set(key, value)
   }
 
-  end(endTime: number, exit: Exit<unknown, unknown>) {
+  end(endTime: bigint, exit: Exit<unknown, unknown>) {
     this.status = {
       _tag: "Ended",
       endTime,
@@ -81,11 +87,11 @@ export class OtelSpan implements Tracer.Span {
         })
       }
     }
-    this.span.end(endTime)
+    this.span.end(nanosToHrTime(endTime))
   }
 
-  event(name: string, attributes?: Record<string, string>) {
-    this.span.addEvent(name, attributes)
+  event(name: string, startTime: bigint, attributes?: Record<string, Tracer.AttributeValue>) {
+    this.span.addEvent(name, attributes, nanosToHrTime(startTime))
   }
 }
 
@@ -102,13 +108,14 @@ export const make = pipe(
   ),
   Effect.map((tracer) =>
     Tracer.make({
-      span(name, parent, startTime) {
+      span(name, parent, context, startTime) {
         return new OtelSpan(
           OtelApi.trace,
           OtelApi.context,
           tracer,
           name,
           parent,
+          context,
           startTime
         )
       }
@@ -120,3 +127,63 @@ export const make = pipe(
 export const layer = Layer.unwrapEffect(
   Effect.map(make, Effect.setTracer)
 )
+
+/** @internal */
+export const traceFlagsTag = Context.Tag<OtelApi.TraceFlags>("@effect/opentelemetry/traceFlags")
+
+/** @internal */
+export const traceStateTag = Context.Tag<OtelApi.TraceState>("@effect/opentelemetry/traceState")
+
+/** @internal */
+export const makeExternalSpan = (options: {
+  readonly name: string
+  readonly traceId: string
+  readonly spanId: string
+  readonly traceFlags?: number
+  readonly traceState?: string
+}): Tracer.ExternalSpan => {
+  let context = Context.empty()
+
+  if (options.traceFlags) {
+    context = Context.add(context, traceFlagsTag, options.traceFlags)
+  }
+
+  if (options.traceState) {
+    context = Option.match(
+      createTraceState(options.traceState),
+      () => context,
+      (traceState) => Context.add(context, traceStateTag, traceState)
+    )
+  }
+
+  return {
+    _tag: "ExternalSpan",
+    name: options.name,
+    traceId: options.traceId,
+    spanId: options.spanId,
+    context
+  }
+}
+
+const oneE9 = 1_000_000_000n
+const nanosToHrTime = (timestamp: bigint): OtelApi.HrTime => {
+  const nanos = timestamp % oneE9
+  const seconds = Number((timestamp - nanos) / oneE9)
+  return [seconds, Number(nanos)]
+}
+
+const extractTraceTag = <I, S>(
+  parent: Option.Option<Tracer.ParentSpan>,
+  context: Context.Context<never>,
+  tag: Context.Tag<I, S>
+) =>
+  Option.orElse(
+    Context.getOption(context, tag),
+    () =>
+      Option.flatMap(
+        parent,
+        (parent) => Context.getOption(parent.context, tag)
+      )
+  )
+
+const createTraceState = Option.liftThrowable(OtelApi.createTraceState)