@effect/opentelemetry 0.1.0 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/NodeSdk.d.ts CHANGED
@@ -1,8 +1,13 @@
1
+ /**
2
+ * @since 1.0.0
3
+ */
4
+ import * as Effect from "@effect/io/Effect";
1
5
  import * as Layer from "@effect/io/Layer";
6
+ import { Resource } from "@effect/opentelemetry/Resource";
2
7
  import type { NodeSDKConfiguration } from "@opentelemetry/sdk-node";
3
8
  /**
4
9
  * @since 1.0.0
5
10
  * @category layer
6
11
  */
7
- export declare const layer: (config: Partial<NodeSDKConfiguration>) => Layer.Layer<never, never, never>;
12
+ export declare const layer: <R, E>(config: Effect.Effect<R, E, Partial<Omit<NodeSDKConfiguration, "resource" | "serviceName">>>) => Layer.Layer<Resource | Exclude<R, import("@effect/io/Scope").Scope>, E, never>;
8
13
  //# sourceMappingURL=NodeSdk.d.ts.map
package/NodeSdk.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"NodeSdk.d.ts","sourceRoot":"","sources":["./src/NodeSdk.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAGnE;;;GAGG;AACH,eAAO,MAAM,KAAK,WAAY,QAAQ,oBAAoB,CAAC,qCAOvD,CAAA"}
1
+ {"version":3,"file":"NodeSdk.d.ts","sourceRoot":"","sources":["./src/NodeSdk.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAA;AACzD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAGnE;;;GAGG;AACH,eAAO,MAAM,KAAK,wLAcd,CAAA"}
package/NodeSdk.js CHANGED
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.layer = void 0;
7
7
  var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
8
8
  var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Layer"));
9
+ var _Resource = /*#__PURE__*/require("@effect/opentelemetry/Resource");
9
10
  var _sdkNode = /*#__PURE__*/require("@opentelemetry/sdk-node");
10
11
  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); }
11
12
  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; }
@@ -17,6 +18,13 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
17
18
  * @since 1.0.0
18
19
  * @category layer
19
20
  */
20
- const layer = config => Layer.scopedDiscard(Effect.acquireRelease(Effect.tap(Effect.sync(() => new _sdkNode.NodeSDK(config)), sdk => Effect.sync(() => sdk.start())), sdk => Effect.promise(() => sdk.shutdown())));
21
+ const layer = config => Layer.scopedDiscard(Effect.acquireRelease(Effect.flatMap(Effect.all(config, _Resource.Resource), ([config, resource]) => Effect.sync(() => {
22
+ const sdk = new _sdkNode.NodeSDK({
23
+ ...config,
24
+ resource
25
+ });
26
+ sdk.start();
27
+ return sdk;
28
+ })), sdk => Effect.promise(() => sdk.shutdown())));
21
29
  exports.layer = layer;
22
30
  //# sourceMappingURL=NodeSdk.js.map
package/NodeSdk.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"NodeSdk.js","names":["Effect","_interopRequireWildcard","require","Layer","_sdkNode","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","layer","config","scopedDiscard","acquireRelease","tap","sync","NodeSDK","sdk","start","promise","shutdown","exports"],"sources":["./src/NodeSdk.ts"],"sourcesContent":[null],"mappings":";;;;;;AAGA,IAAAA,MAAA,gBAAAC,uBAAA,eAAAC,OAAA;AACA,IAAAC,KAAA,gBAAAF,uBAAA,eAAAC,OAAA;AAEA,IAAAE,QAAA,gBAAAF,OAAA;AAAiD,SAAAG,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,SAAAL,wBAAAS,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;AANjD;;;;AAQA;;;;AAIO,MAAMW,KAAK,GAAIC,MAAqC,IACzDzB,KAAK,CAAC0B,aAAa,CAAC7B,MAAM,CAAC8B,cAAc,CACvC9B,MAAM,CAAC+B,GAAG,CACR/B,MAAM,CAACgC,IAAI,CAAC,MAAM,IAAIC,gBAAO,CAACL,MAAM,CAAC,CAAC,EACrCM,GAAG,IAAKlC,MAAM,CAACgC,IAAI,CAAC,MAAME,GAAG,CAACC,KAAK,EAAE,CAAC,CACxC,EACAD,GAAG,IAAKlC,MAAM,CAACoC,OAAO,CAAC,MAAMF,GAAG,CAACG,QAAQ,EAAE,CAAC,CAC9C,CAAC;AAAAC,OAAA,CAAAX,KAAA,GAAAA,KAAA"}
1
+ {"version":3,"file":"NodeSdk.js","names":["Effect","_interopRequireWildcard","require","Layer","_Resource","_sdkNode","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","layer","config","scopedDiscard","acquireRelease","flatMap","all","Resource","resource","sync","sdk","NodeSDK","start","promise","shutdown","exports"],"sources":["./src/NodeSdk.ts"],"sourcesContent":[null],"mappings":";;;;;;AAGA,IAAAA,MAAA,gBAAAC,uBAAA,eAAAC,OAAA;AACA,IAAAC,KAAA,gBAAAF,uBAAA,eAAAC,OAAA;AACA,IAAAE,SAAA,gBAAAF,OAAA;AAEA,IAAAG,QAAA,gBAAAH,OAAA;AAAiD,SAAAI,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,SAAAN,wBAAAU,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;AAPjD;;;;AASA;;;;AAIO,MAAMW,KAAK,GAChBC,MAA4F,IAE5F1B,KAAK,CAAC2B,aAAa,CAAC9B,MAAM,CAAC+B,cAAc,CACvC/B,MAAM,CAACgC,OAAO,CACZhC,MAAM,CAACiC,GAAG,CAACJ,MAAM,EAAEK,kBAAQ,CAAC,EAC5B,CAAC,CAACL,MAAM,EAAEM,QAAQ,CAAC,KACjBnC,MAAM,CAACoC,IAAI,CAAC,MAAK;EACf,MAAMC,GAAG,GAAG,IAAIC,gBAAO,CAAC;IAAE,GAAGT,MAAM;IAAEM;EAAQ,CAAE,CAAC;EAChDE,GAAG,CAACE,KAAK,EAAE;EACX,OAAOF,GAAG;AACZ,CAAC,CAAC,CACL,EACAA,GAAG,IAAKrC,MAAM,CAACwC,OAAO,CAAC,MAAMH,GAAG,CAACI,QAAQ,EAAE,CAAC,CAC9C,CAAC;AAAAC,OAAA,CAAAd,KAAA,GAAAA,KAAA"}
package/Resource.d.ts ADDED
@@ -0,0 +1,28 @@
1
+ /**
2
+ * @since 1.0.0
3
+ */
4
+ import { Tag } from "@effect/data/Context";
5
+ import * as Layer from "@effect/io/Layer";
6
+ import * as Resources from "@opentelemetry/resources";
7
+ /**
8
+ * @since 1.0.0
9
+ * @category identifier
10
+ */
11
+ export interface Resource {
12
+ readonly _: unique symbol;
13
+ }
14
+ /**
15
+ * @since 1.0.0
16
+ * @category tag
17
+ */
18
+ export declare const Resource: Tag<Resource, Resources.Resource>;
19
+ /**
20
+ * @since 1.0.0
21
+ * @category layer
22
+ */
23
+ export declare const layer: (config: {
24
+ readonly serviceName: string;
25
+ readonly serviceVersion?: string;
26
+ readonly attributes?: Resources.ResourceAttributes;
27
+ }) => Layer.Layer<never, never, Resource>;
28
+ //# sourceMappingURL=Resource.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Resource.d.ts","sourceRoot":"","sources":["./src/Resource.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC1C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAA;AAGrD;;;GAGG;AACH,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,mCAAsE,CAAA;AAE3F;;;GAGG;AACH,eAAO,MAAM,KAAK,WAAY;IAC5B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAChC,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,kBAAkB,CAAA;CACnD,wCAgBA,CAAA"}
package/Resource.js ADDED
@@ -0,0 +1,40 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.layer = exports.Resource = void 0;
7
+ var _Context = /*#__PURE__*/require("@effect/data/Context");
8
+ var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Layer"));
9
+ var Resources = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@opentelemetry/resources"));
10
+ var _semanticConventions = /*#__PURE__*/require("@opentelemetry/semantic-conventions");
11
+ 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); }
12
+ 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; }
13
+ /**
14
+ * @since 1.0.0
15
+ */
16
+
17
+ /**
18
+ * @since 1.0.0
19
+ * @category tag
20
+ */
21
+ const Resource = /*#__PURE__*/(0, _Context.Tag)("@effect/opentelemetry/Resource");
22
+ /**
23
+ * @since 1.0.0
24
+ * @category layer
25
+ */
26
+ exports.Resource = Resource;
27
+ const layer = config => {
28
+ const attributes = {
29
+ ...(config.attributes ?? {}),
30
+ [_semanticConventions.SemanticResourceAttributes.SERVICE_NAME]: config.serviceName,
31
+ [_semanticConventions.SemanticResourceAttributes.TELEMETRY_SDK_NAME]: "@effect/opentelemetry",
32
+ [_semanticConventions.SemanticResourceAttributes.TELEMETRY_SDK_LANGUAGE]: typeof globalThis.document === "undefined" ? _semanticConventions.TelemetrySdkLanguageValues.NODEJS : _semanticConventions.TelemetrySdkLanguageValues.WEBJS
33
+ };
34
+ if (config.serviceVersion) {
35
+ attributes[_semanticConventions.SemanticResourceAttributes.SERVICE_VERSION] = config.serviceVersion;
36
+ }
37
+ return Layer.succeed(Resource, new Resources.Resource(attributes));
38
+ };
39
+ exports.layer = layer;
40
+ //# sourceMappingURL=Resource.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Resource.js","names":["_Context","require","Layer","_interopRequireWildcard","Resources","_semanticConventions","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","Resource","Tag","exports","layer","config","attributes","SemanticResourceAttributes","SERVICE_NAME","serviceName","TELEMETRY_SDK_NAME","TELEMETRY_SDK_LANGUAGE","globalThis","document","TelemetrySdkLanguageValues","NODEJS","WEBJS","serviceVersion","SERVICE_VERSION","succeed"],"sources":["./src/Resource.ts"],"sourcesContent":[null],"mappings":";;;;;;AAGA,IAAAA,QAAA,gBAAAC,OAAA;AACA,IAAAC,KAAA,gBAAAC,uBAAA,eAAAF,OAAA;AACA,IAAAG,SAAA,gBAAAD,uBAAA,eAAAF,OAAA;AACA,IAAAI,oBAAA,gBAAAJ,OAAA;AAA4G,SAAAK,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,SAAAJ,wBAAAQ,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;AAN5G;;;;AAgBA;;;;AAIO,MAAMW,QAAQ,gBAAG,IAAAC,YAAG,EAA+B,gCAAgC,CAAC;AAE3F;;;;AAAAC,OAAA,CAAAF,QAAA,GAAAA,QAAA;AAIO,MAAMG,KAAK,GAAIC,MAIrB,IAAI;EACH,MAAMC,UAAU,GAAG;IACjB,IAAID,MAAM,CAACC,UAAU,IAAI,EAAE,CAAC;IAC5B,CAACC,+CAA0B,CAACC,YAAY,GAAGH,MAAM,CAACI,WAAW;IAC7D,CAACF,+CAA0B,CAACG,kBAAkB,GAAG,uBAAuB;IACxE,CAACH,+CAA0B,CAACI,sBAAsB,GAAG,OAAQC,UAAkB,CAACC,QAAQ,KAAK,WAAW,GACtGC,+CAA0B,CAACC,MAAM,GACjCD,+CAA0B,CAACE;GAC9B;EACD,IAAIX,MAAM,CAACY,cAAc,EAAE;IACzBX,UAAU,CAACC,+CAA0B,CAACW,eAAe,CAAC,GAAGb,MAAM,CAACY,cAAc;;EAEhF,OAAO1C,KAAK,CAAC4C,OAAO,CAClBlB,QAAQ,EACR,IAAIxB,SAAS,CAACwB,QAAQ,CAACK,UAAU,CAAC,CACnC;AACH,CAAC;AAAAH,OAAA,CAAAC,KAAA,GAAAA,KAAA"}
package/Tracer.d.ts CHANGED
@@ -4,22 +4,15 @@
4
4
  import type { Effect } from "@effect/io/Effect";
5
5
  import type { Layer } from "@effect/io/Layer";
6
6
  import type { Tracer } from "@effect/io/Tracer";
7
- /**
8
- * @since 1.0.0
9
- * @category models
10
- */
11
- export interface TracerOptions {
12
- readonly name: string;
13
- readonly version?: string;
14
- }
7
+ import type { Resource } from "@effect/opentelemetry/Resource";
15
8
  /**
16
9
  * @since 1.0.0
17
10
  * @category constructors
18
11
  */
19
- export declare const make: (options: TracerOptions) => Effect<never, never, Tracer>;
12
+ export declare const make: Effect<Resource, never, Tracer>;
20
13
  /**
21
14
  * @since 1.0.0
22
15
  * @category layers
23
16
  */
24
- export declare const layer: (options: TracerOptions) => Layer<never, never, never>;
17
+ export declare const layer: Layer<Resource, never, never>;
25
18
  //# sourceMappingURL=Tracer.d.ts.map
package/Tracer.d.ts.map CHANGED
@@ -1 +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;AAG/C;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAC1B;AAED;;;GAGG;AACH,eAAO,MAAM,IAAI,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAiB,CAAA;AAE3F;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAkB,CAAA"}
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"}
package/Tracer.js.map CHANGED
@@ -1 +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;AAWjF;;;;AAIO,MAAMW,IAAI,GAA6DzB,QAAQ,CAACyB,IAAI;AAE3F;;;;AAAAC,OAAA,CAAAD,IAAA,GAAAA,IAAA;AAIO,MAAME,KAAK,GAA2D3B,QAAQ,CAAC2B,KAAK;AAAAD,OAAA,CAAAC,KAAA,GAAAA,KAAA"}
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"}
@@ -8,6 +8,7 @@ var Cause = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/
8
8
  var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
9
9
  var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Layer"));
10
10
  var Tracer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Tracer"));
11
+ var _Resource = /*#__PURE__*/require("@effect/opentelemetry/Resource");
11
12
  var OtelApi = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@opentelemetry/api"));
12
13
  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); }
13
14
  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; }
@@ -72,13 +73,13 @@ class OtelSpan {
72
73
  }
73
74
  /** @internal */
74
75
  exports.OtelSpan = OtelSpan;
75
- const make = options => Effect.map(Effect.sync(() => OtelApi.trace.getTracer(options.name, options.version)), tracer => Tracer.make({
76
+ const make = /*#__PURE__*/Effect.map(tracer => Tracer.make({
76
77
  span(name, parent, startTime) {
77
78
  return new OtelSpan(OtelApi.trace, OtelApi.context, tracer, name, parent, startTime);
78
79
  }
79
- }));
80
+ }))( /*#__PURE__*/Effect.flatMap(resource => Effect.sync(() => OtelApi.trace.getTracer(resource.attributes["service.name"], resource.attributes["service.version"])))(_Resource.Resource));
80
81
  /** @internal */
81
82
  exports.make = make;
82
- const layer = options => Layer.unwrapEffect(Effect.map(make(options), Effect.setTracer));
83
+ const layer = /*#__PURE__*/Layer.unwrapEffect( /*#__PURE__*/Effect.map(make, Effect.setTracer));
83
84
  exports.layer = layer;
84
85
  //# sourceMappingURL=tracer.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"tracer.js","names":["Cause","_interopRequireWildcard","require","Effect","Layer","Tracer","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","options","map","sync","trace","getTracer","version","context","layer","unwrapEffect","setTracer"],"sources":["../src/internal_effect_untraced/tracer.ts"],"sourcesContent":[null],"mappings":"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"}
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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"}
package/mjs/NodeSdk.mjs CHANGED
@@ -3,10 +3,18 @@
3
3
  */
4
4
  import * as Effect from "@effect/io/Effect";
5
5
  import * as Layer from "@effect/io/Layer";
6
+ import { Resource } from "@effect/opentelemetry/Resource";
6
7
  import { NodeSDK } from "@opentelemetry/sdk-node";
7
8
  /**
8
9
  * @since 1.0.0
9
10
  * @category layer
10
11
  */
11
- export const layer = config => Layer.scopedDiscard(Effect.acquireRelease(Effect.tap(Effect.sync(() => new NodeSDK(config)), sdk => Effect.sync(() => sdk.start())), sdk => Effect.promise(() => sdk.shutdown())));
12
+ export const layer = config => Layer.scopedDiscard(Effect.acquireRelease(Effect.flatMap(Effect.all(config, Resource), ([config, resource]) => Effect.sync(() => {
13
+ const sdk = new NodeSDK({
14
+ ...config,
15
+ resource
16
+ });
17
+ sdk.start();
18
+ return sdk;
19
+ })), sdk => Effect.promise(() => sdk.shutdown())));
12
20
  //# sourceMappingURL=NodeSdk.mjs.map
@@ -1 +1 @@
1
- {"version":3,"file":"NodeSdk.mjs","names":["Effect","Layer","NodeSDK","layer","config","scopedDiscard","acquireRelease","tap","sync","sdk","start","promise","shutdown"],"sources":["../src/NodeSdk.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,MAAM,MAAM,mBAAmB;AAC3C,OAAO,KAAKC,KAAK,MAAM,kBAAkB;AAEzC,SAASC,OAAO,QAAQ,yBAAyB;AAEjD;;;;AAIA,OAAO,MAAMC,KAAK,GAAIC,MAAqC,IACzDH,KAAK,CAACI,aAAa,CAACL,MAAM,CAACM,cAAc,CACvCN,MAAM,CAACO,GAAG,CACRP,MAAM,CAACQ,IAAI,CAAC,MAAM,IAAIN,OAAO,CAACE,MAAM,CAAC,CAAC,EACrCK,GAAG,IAAKT,MAAM,CAACQ,IAAI,CAAC,MAAMC,GAAG,CAACC,KAAK,EAAE,CAAC,CACxC,EACAD,GAAG,IAAKT,MAAM,CAACW,OAAO,CAAC,MAAMF,GAAG,CAACG,QAAQ,EAAE,CAAC,CAC9C,CAAC"}
1
+ {"version":3,"file":"NodeSdk.mjs","names":["Effect","Layer","Resource","NodeSDK","layer","config","scopedDiscard","acquireRelease","flatMap","all","resource","sync","sdk","start","promise","shutdown"],"sources":["../src/NodeSdk.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,MAAM,MAAM,mBAAmB;AAC3C,OAAO,KAAKC,KAAK,MAAM,kBAAkB;AACzC,SAASC,QAAQ,QAAQ,gCAAgC;AAEzD,SAASC,OAAO,QAAQ,yBAAyB;AAEjD;;;;AAIA,OAAO,MAAMC,KAAK,GAChBC,MAA4F,IAE5FJ,KAAK,CAACK,aAAa,CAACN,MAAM,CAACO,cAAc,CACvCP,MAAM,CAACQ,OAAO,CACZR,MAAM,CAACS,GAAG,CAACJ,MAAM,EAAEH,QAAQ,CAAC,EAC5B,CAAC,CAACG,MAAM,EAAEK,QAAQ,CAAC,KACjBV,MAAM,CAACW,IAAI,CAAC,MAAK;EACf,MAAMC,GAAG,GAAG,IAAIT,OAAO,CAAC;IAAE,GAAGE,MAAM;IAAEK;EAAQ,CAAE,CAAC;EAChDE,GAAG,CAACC,KAAK,EAAE;EACX,OAAOD,GAAG;AACZ,CAAC,CAAC,CACL,EACAA,GAAG,IAAKZ,MAAM,CAACc,OAAO,CAAC,MAAMF,GAAG,CAACG,QAAQ,EAAE,CAAC,CAC9C,CAAC"}
@@ -0,0 +1,29 @@
1
+ /**
2
+ * @since 1.0.0
3
+ */
4
+ import { Tag } from "@effect/data/Context";
5
+ import * as Layer from "@effect/io/Layer";
6
+ import * as Resources from "@opentelemetry/resources";
7
+ import { SemanticResourceAttributes, TelemetrySdkLanguageValues } from "@opentelemetry/semantic-conventions";
8
+ /**
9
+ * @since 1.0.0
10
+ * @category tag
11
+ */
12
+ export const Resource = /*#__PURE__*/Tag("@effect/opentelemetry/Resource");
13
+ /**
14
+ * @since 1.0.0
15
+ * @category layer
16
+ */
17
+ export const layer = config => {
18
+ const attributes = {
19
+ ...(config.attributes ?? {}),
20
+ [SemanticResourceAttributes.SERVICE_NAME]: config.serviceName,
21
+ [SemanticResourceAttributes.TELEMETRY_SDK_NAME]: "@effect/opentelemetry",
22
+ [SemanticResourceAttributes.TELEMETRY_SDK_LANGUAGE]: typeof globalThis.document === "undefined" ? TelemetrySdkLanguageValues.NODEJS : TelemetrySdkLanguageValues.WEBJS
23
+ };
24
+ if (config.serviceVersion) {
25
+ attributes[SemanticResourceAttributes.SERVICE_VERSION] = config.serviceVersion;
26
+ }
27
+ return Layer.succeed(Resource, new Resources.Resource(attributes));
28
+ };
29
+ //# sourceMappingURL=Resource.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Resource.mjs","names":["Tag","Layer","Resources","SemanticResourceAttributes","TelemetrySdkLanguageValues","Resource","layer","config","attributes","SERVICE_NAME","serviceName","TELEMETRY_SDK_NAME","TELEMETRY_SDK_LANGUAGE","globalThis","document","NODEJS","WEBJS","serviceVersion","SERVICE_VERSION","succeed"],"sources":["../src/Resource.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,SAASA,GAAG,QAAQ,sBAAsB;AAC1C,OAAO,KAAKC,KAAK,MAAM,kBAAkB;AACzC,OAAO,KAAKC,SAAS,MAAM,0BAA0B;AACrD,SAASC,0BAA0B,EAAEC,0BAA0B,QAAQ,qCAAqC;AAU5G;;;;AAIA,OAAO,MAAMC,QAAQ,gBAAGL,GAAG,CAA+B,gCAAgC,CAAC;AAE3F;;;;AAIA,OAAO,MAAMM,KAAK,GAAIC,MAIrB,IAAI;EACH,MAAMC,UAAU,GAAG;IACjB,IAAID,MAAM,CAACC,UAAU,IAAI,EAAE,CAAC;IAC5B,CAACL,0BAA0B,CAACM,YAAY,GAAGF,MAAM,CAACG,WAAW;IAC7D,CAACP,0BAA0B,CAACQ,kBAAkB,GAAG,uBAAuB;IACxE,CAACR,0BAA0B,CAACS,sBAAsB,GAAG,OAAQC,UAAkB,CAACC,QAAQ,KAAK,WAAW,GACtGV,0BAA0B,CAACW,MAAM,GACjCX,0BAA0B,CAACY;GAC9B;EACD,IAAIT,MAAM,CAACU,cAAc,EAAE;IACzBT,UAAU,CAACL,0BAA0B,CAACe,eAAe,CAAC,GAAGX,MAAM,CAACU,cAAc;;EAEhF,OAAOhB,KAAK,CAACkB,OAAO,CAClBd,QAAQ,EACR,IAAIH,SAAS,CAACG,QAAQ,CAACG,UAAU,CAAC,CACnC;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"Tracer.mjs","names":["internal","make","layer"],"sources":["../src/Tracer.ts"],"sourcesContent":[null],"mappings":"AAMA,OAAO,KAAKA,QAAQ,MAAM,uDAAuD;AAWjF;;;;AAIA,OAAO,MAAMC,IAAI,GAA6DD,QAAQ,CAACC,IAAI;AAE3F;;;;AAIA,OAAO,MAAMC,KAAK,GAA2DF,QAAQ,CAACE,KAAK"}
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"}
@@ -2,6 +2,7 @@ import * as Cause from "@effect/io/Cause";
2
2
  import * as Effect from "@effect/io/Effect";
3
3
  import * as Layer from "@effect/io/Layer";
4
4
  import * as Tracer from "@effect/io/Tracer";
5
+ import { Resource } from "@effect/opentelemetry/Resource";
5
6
  import * as OtelApi from "@opentelemetry/api";
6
7
  /** @internal */
7
8
  export class OtelSpan {
@@ -63,11 +64,11 @@ export class OtelSpan {
63
64
  }
64
65
  }
65
66
  /** @internal */
66
- export const make = options => Effect.map(Effect.sync(() => OtelApi.trace.getTracer(options.name, options.version)), tracer => Tracer.make({
67
+ export const make = /*#__PURE__*/Effect.map(tracer => Tracer.make({
67
68
  span(name, parent, startTime) {
68
69
  return new OtelSpan(OtelApi.trace, OtelApi.context, tracer, name, parent, startTime);
69
70
  }
70
- }));
71
+ }))( /*#__PURE__*/Effect.flatMap(resource => Effect.sync(() => OtelApi.trace.getTracer(resource.attributes["service.name"], resource.attributes["service.version"])))(Resource));
71
72
  /** @internal */
72
- export const layer = options => Layer.unwrapEffect(Effect.map(make(options), Effect.setTracer));
73
+ export const layer = /*#__PURE__*/Layer.unwrapEffect( /*#__PURE__*/Effect.map(make, Effect.setTracer));
73
74
  //# sourceMappingURL=tracer.mjs.map
@@ -1 +1 @@
1
- {"version":3,"file":"tracer.mjs","names":["Cause","Effect","Layer","Tracer","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","options","map","sync","trace","getTracer","version","context","layer","unwrapEffect","setTracer"],"sources":["../../src/internal_effect_untraced/tracer.ts"],"sourcesContent":[null],"mappings":"AACA,OAAO,KAAKA,KAAK,MAAM,kBAAkB;AACzC,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAE3C,OAAO,KAAKC,KAAK,MAAM,kBAAkB;AACzC,OAAO,KAAKC,MAAM,MAAM,mBAAmB;AAE3C,OAAO,KAAKC,OAAO,MAAM,oBAAoB;AAE7C;AACA,OAAM,MAAOC,QAAQ;EASnBC,YACEC,QAA0B,EAC1BC,UAA8B,EAC9BC,MAAsB,EACbC,IAAY,EACZC,MAAiC,EAC1CC,SAAiB;IAFR,KAAAF,IAAI,GAAJA,IAAI;IACJ,KAAAC,MAAM,GAANA,MAAM;IAbR,KAAAE,IAAI,GAAG,MAAM;IAKb,KAAAC,UAAU,GAAG,IAAIC,GAAG,EAAkB;IAW7C,MAAMC,MAAM,GAAGR,UAAU,CAACQ,MAAM,EAAE;IAClC,IAAI,CAACC,IAAI,GAAGN,MAAM,CAACE,IAAI,KAAK,MAAM,GAC9BJ,MAAM,CAACS,SAAS,CAChBR,IAAI,EACJ;MAAEE;IAAS,CAAE,EACbD,MAAM,CAACQ,KAAK,YAAYd,QAAQ,GAC9BE,QAAQ,CAACa,OAAO,CAACJ,MAAM,EAAEL,MAAM,CAACQ,KAAK,CAACF,IAAI,CAAC,GAC3CV,QAAQ,CAACc,cAAc,CAACL,MAAM,EAAE;MAC9BM,MAAM,EAAEX,MAAM,CAACQ,KAAK,CAACG,MAAM;MAC3BC,OAAO,EAAEZ,MAAM,CAACQ,KAAK,CAACI,OAAO;MAC7BC,QAAQ,EAAEb,MAAM,CAACQ,KAAK,CAACN,IAAI,KAAK,cAAc;MAC9CY,UAAU,EAAErB,OAAO,CAACsB,UAAU,CAACC;KAChC,CAAC,CACL,GACClB,MAAM,CAACS,SAAS,CAACR,IAAI,EAAE;MAAEE;IAAS,CAAE,EAAEI,MAAM,CAAC;IACjD,MAAMY,WAAW,GAAG,IAAI,CAACX,IAAI,CAACW,WAAW,EAAE;IAE3C,IAAI,CAACN,MAAM,GAAGM,WAAW,CAACN,MAAM;IAChC,IAAI,CAACC,OAAO,GAAGK,WAAW,CAACL,OAAO;IAElC,IAAI,CAACM,MAAM,GAAG;MACZhB,IAAI,EAAE,SAAS;MACfD;KACD;EACH;EAEAkB,SAASA,CAACC,GAAW,EAAEZ,KAAa;IAClC,IAAI,CAACF,IAAI,CAACe,YAAY,CAACD,GAAG,EAAEZ,KAAK,CAAC;IAClC,IAAI,CAACL,UAAU,CAACmB,GAAG,CAACF,GAAG,EAAEZ,KAAK,CAAC;EACjC;EAEAe,GAAGA,CAACC,OAAe,EAAEC,IAA4B;IAC/C,IAAI,CAACP,MAAM,GAAG;MACZhB,IAAI,EAAE,OAAO;MACbsB,OAAO;MACPC,IAAI;MACJxB,SAAS,EAAE,IAAI,CAACiB,MAAM,CAACjB;KACxB;IAED,IAAIwB,IAAI,CAACvB,IAAI,KAAK,SAAS,EAAE;MAC3B,IAAI,CAACI,IAAI,CAACoB,SAAS,CAAC;QAClBC,IAAI,EAAElC,OAAO,CAACmC,cAAc,CAACC;OAC9B,CAAC;KACH,MAAM;MACL,IAAIxC,KAAK,CAACyC,iBAAiB,CAACL,IAAI,CAACM,KAAK,CAAC,EAAE;QACvC,IAAI,CAACzB,IAAI,CAACoB,SAAS,CAAC;UAClBC,IAAI,EAAElC,OAAO,CAACmC,cAAc,CAACC;SAC9B,CAAC;OACH,MAAM;QACL,IAAI,CAACvB,IAAI,CAACoB,SAAS,CAAC;UAClBC,IAAI,EAAElC,OAAO,CAACmC,cAAc,CAACI,KAAK;UAClCC,OAAO,EAAE5C,KAAK,CAAC6C,MAAM,CAACT,IAAI,CAACM,KAAK;SACjC,CAAC;;;IAGN,IAAI,CAACzB,IAAI,CAACiB,GAAG,CAACC,OAAO,CAAC;EACxB;EAEAW,KAAKA,CAACpC,IAAY,EAAEI,UAAmC;IACrD,IAAI,CAACG,IAAI,CAAC8B,QAAQ,CAACrC,IAAI,EAAEI,UAAU,CAAC;EACtC;;AAGF;AACA,OAAO,MAAMkC,IAAI,GAAIC,OAAsB,IACzChD,MAAM,CAACiD,GAAG,CACRjD,MAAM,CAACkD,IAAI,CAAC,MAAM/C,OAAO,CAACgD,KAAK,CAACC,SAAS,CAACJ,OAAO,CAACvC,IAAI,EAAEuC,OAAO,CAACK,OAAO,CAAC,CAAC,EACxE7C,MAAM,IACLN,MAAM,CAAC6C,IAAI,CAAC;EACV/B,IAAIA,CAACP,IAAI,EAAEC,MAAM,EAAEC,SAAS;IAC1B,OAAO,IAAIP,QAAQ,CACjBD,OAAO,CAACgD,KAAK,EACbhD,OAAO,CAACmD,OAAO,EACf9C,MAAM,EACNC,IAAI,EACJC,MAAM,EACNC,SAAS,CACV;EACH;CACD,CAAC,CACL;AAEH;AACA,OAAO,MAAM4C,KAAK,GAAIP,OAAsB,IAC1C/C,KAAK,CAACuD,YAAY,CAChBxD,MAAM,CAACiD,GAAG,CAACF,IAAI,CAACC,OAAO,CAAC,EAAEhD,MAAM,CAACyD,SAAS,CAAC,CAC5C"}
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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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect/opentelemetry",
3
- "version": "0.1.0",
3
+ "version": "0.1.2",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",
@@ -9,7 +9,9 @@
9
9
  "dependencies": {
10
10
  "@effect/data": "^0.12.9",
11
11
  "@effect/io": "^0.27.1",
12
- "@opentelemetry/api": "^1.4.1"
12
+ "@opentelemetry/api": "^1.4.1",
13
+ "@opentelemetry/resources": "^1.14.0",
14
+ "@opentelemetry/semantic-conventions": "^1.14.0"
13
15
  },
14
16
  "publishConfig": {
15
17
  "access": "public"
package/src/NodeSdk.ts CHANGED
@@ -3,6 +3,7 @@
3
3
  */
4
4
  import * as Effect from "@effect/io/Effect"
5
5
  import * as Layer from "@effect/io/Layer"
6
+ import { Resource } from "@effect/opentelemetry/Resource"
6
7
  import type { NodeSDKConfiguration } from "@opentelemetry/sdk-node"
7
8
  import { NodeSDK } from "@opentelemetry/sdk-node"
8
9
 
@@ -10,11 +11,18 @@ import { NodeSDK } from "@opentelemetry/sdk-node"
10
11
  * @since 1.0.0
11
12
  * @category layer
12
13
  */
13
- export const layer = (config: Partial<NodeSDKConfiguration>) =>
14
+ export const layer = <R, E>(
15
+ config: Effect.Effect<R, E, Partial<Omit<NodeSDKConfiguration, "resource" | "serviceName">>>
16
+ ) =>
14
17
  Layer.scopedDiscard(Effect.acquireRelease(
15
- Effect.tap(
16
- Effect.sync(() => new NodeSDK(config)),
17
- (sdk) => Effect.sync(() => sdk.start())
18
+ Effect.flatMap(
19
+ Effect.all(config, Resource),
20
+ ([config, resource]) =>
21
+ Effect.sync(() => {
22
+ const sdk = new NodeSDK({ ...config, resource })
23
+ sdk.start()
24
+ return sdk
25
+ })
18
26
  ),
19
27
  (sdk) => Effect.promise(() => sdk.shutdown())
20
28
  ))
@@ -0,0 +1,47 @@
1
+ /**
2
+ * @since 1.0.0
3
+ */
4
+ import { Tag } from "@effect/data/Context"
5
+ import * as Layer from "@effect/io/Layer"
6
+ import * as Resources from "@opentelemetry/resources"
7
+ import { SemanticResourceAttributes, TelemetrySdkLanguageValues } from "@opentelemetry/semantic-conventions"
8
+
9
+ /**
10
+ * @since 1.0.0
11
+ * @category identifier
12
+ */
13
+ export interface Resource {
14
+ readonly _: unique symbol
15
+ }
16
+
17
+ /**
18
+ * @since 1.0.0
19
+ * @category tag
20
+ */
21
+ export const Resource = Tag<Resource, Resources.Resource>("@effect/opentelemetry/Resource")
22
+
23
+ /**
24
+ * @since 1.0.0
25
+ * @category layer
26
+ */
27
+ export const layer = (config: {
28
+ readonly serviceName: string
29
+ readonly serviceVersion?: string
30
+ readonly attributes?: Resources.ResourceAttributes
31
+ }) => {
32
+ const attributes = {
33
+ ...(config.attributes ?? {}),
34
+ [SemanticResourceAttributes.SERVICE_NAME]: config.serviceName,
35
+ [SemanticResourceAttributes.TELEMETRY_SDK_NAME]: "@effect/opentelemetry",
36
+ [SemanticResourceAttributes.TELEMETRY_SDK_LANGUAGE]: typeof (globalThis as any).document === "undefined" ?
37
+ TelemetrySdkLanguageValues.NODEJS :
38
+ TelemetrySdkLanguageValues.WEBJS
39
+ }
40
+ if (config.serviceVersion) {
41
+ attributes[SemanticResourceAttributes.SERVICE_VERSION] = config.serviceVersion
42
+ }
43
+ return Layer.succeed(
44
+ Resource,
45
+ new Resources.Resource(attributes)
46
+ )
47
+ }
package/src/Tracer.ts CHANGED
@@ -5,24 +5,16 @@ import type { Effect } from "@effect/io/Effect"
5
5
  import type { Layer } from "@effect/io/Layer"
6
6
  import type { Tracer } from "@effect/io/Tracer"
7
7
  import * as internal from "@effect/opentelemetry/internal_effect_untraced/tracer"
8
-
9
- /**
10
- * @since 1.0.0
11
- * @category models
12
- */
13
- export interface TracerOptions {
14
- readonly name: string
15
- readonly version?: string
16
- }
8
+ import type { Resource } from "@effect/opentelemetry/Resource"
17
9
 
18
10
  /**
19
11
  * @since 1.0.0
20
12
  * @category constructors
21
13
  */
22
- export const make: (options: TracerOptions) => Effect<never, never, Tracer> = internal.make
14
+ export const make: Effect<Resource, never, Tracer> = internal.make
23
15
 
24
16
  /**
25
17
  * @since 1.0.0
26
18
  * @category layers
27
19
  */
28
- export const layer: (options: TracerOptions) => Layer<never, never, never> = internal.layer
20
+ export const layer: Layer<Resource, never, never> = internal.layer
@@ -1,10 +1,11 @@
1
+ import { pipe } from "@effect/data/Function"
1
2
  import type { Option } from "@effect/data/Option"
2
3
  import * as Cause from "@effect/io/Cause"
3
4
  import * as Effect from "@effect/io/Effect"
4
5
  import type { Exit } from "@effect/io/Exit"
5
6
  import * as Layer from "@effect/io/Layer"
6
7
  import * as Tracer from "@effect/io/Tracer"
7
- import type { TracerOptions } from "@effect/opentelemetry/Tracer"
8
+ import { Resource } from "@effect/opentelemetry/Resource"
8
9
  import * as OtelApi from "@opentelemetry/api"
9
10
 
10
11
  /** @internal */
@@ -89,26 +90,33 @@ export class OtelSpan implements Tracer.Span {
89
90
  }
90
91
 
91
92
  /** @internal */
92
- export const make = (options: TracerOptions) =>
93
- Effect.map(
94
- Effect.sync(() => OtelApi.trace.getTracer(options.name, options.version)),
95
- (tracer) =>
96
- Tracer.make({
97
- span(name, parent, startTime) {
98
- return new OtelSpan(
99
- OtelApi.trace,
100
- OtelApi.context,
101
- tracer,
102
- name,
103
- parent,
104
- startTime
105
- )
106
- }
107
- })
93
+ export const make = pipe(
94
+ Resource,
95
+ Effect.flatMap((resource) =>
96
+ Effect.sync(() =>
97
+ OtelApi.trace.getTracer(
98
+ resource.attributes["service.name"] as string,
99
+ resource.attributes["service.version"] as string
100
+ )
101
+ )
102
+ ),
103
+ Effect.map((tracer) =>
104
+ Tracer.make({
105
+ span(name, parent, startTime) {
106
+ return new OtelSpan(
107
+ OtelApi.trace,
108
+ OtelApi.context,
109
+ tracer,
110
+ name,
111
+ parent,
112
+ startTime
113
+ )
114
+ }
115
+ })
108
116
  )
117
+ )
109
118
 
110
119
  /** @internal */
111
- export const layer = (options: TracerOptions) =>
112
- Layer.unwrapEffect(
113
- Effect.map(make(options), Effect.setTracer)
114
- )
120
+ export const layer = Layer.unwrapEffect(
121
+ Effect.map(make, Effect.setTracer)
122
+ )