@effect/opentelemetry 0.42.5 → 0.42.6
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/dist/cjs/Resource.js
CHANGED
|
@@ -10,6 +10,7 @@ var _effect = require("effect");
|
|
|
10
10
|
var Arr = _interopRequireWildcard(require("effect/Array"));
|
|
11
11
|
var _Context = require("effect/Context");
|
|
12
12
|
var Effect = _interopRequireWildcard(require("effect/Effect"));
|
|
13
|
+
var _Function = require("effect/Function");
|
|
13
14
|
var Layer = _interopRequireWildcard(require("effect/Layer"));
|
|
14
15
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
15
16
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
@@ -43,9 +44,9 @@ const layer = config => {
|
|
|
43
44
|
* @category layer
|
|
44
45
|
*/
|
|
45
46
|
exports.layer = layer;
|
|
46
|
-
const layerFromEnv = additionalAttributes => Layer.effect(Resource, Effect.gen(function* (
|
|
47
|
-
const serviceName = yield*
|
|
48
|
-
const attributes = yield*
|
|
47
|
+
const layerFromEnv = additionalAttributes => Layer.effect(Resource, Effect.gen(function* () {
|
|
48
|
+
const serviceName = yield* (0, _Function.pipe)(_effect.Config.string("OTEL_SERVICE_NAME"), _effect.Config.option, Effect.orDie);
|
|
49
|
+
const attributes = yield* (0, _Function.pipe)(_effect.Config.string("OTEL_RESOURCE_ATTRIBUTES"), _effect.Config.withDefault(""), _effect.Config.map(s => {
|
|
49
50
|
const attrs = s.split(",");
|
|
50
51
|
return Arr.reduce(attrs, {}, (acc, attr) => {
|
|
51
52
|
const parts = attr.split("=");
|
package/dist/cjs/Resource.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Resource.js","names":["Resources","_interopRequireWildcard","require","_semanticConventions","_effect","Arr","_Context","Effect","Layer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","Resource","exports","GenericTag","layer","config","attributes","undefined","SEMRESATTRS_SERVICE_NAME","serviceName","SEMRESATTRS_TELEMETRY_SDK_NAME","SEMRESATTRS_TELEMETRY_SDK_LANGUAGE","globalThis","document","TELEMETRYSDKLANGUAGEVALUES_NODEJS","TELEMETRYSDKLANGUAGEVALUES_WEBJS","serviceVersion","SEMRESATTRS_SERVICE_VERSION","succeed","layerFromEnv","additionalAttributes","effect","gen","
|
|
1
|
+
{"version":3,"file":"Resource.js","names":["Resources","_interopRequireWildcard","require","_semanticConventions","_effect","Arr","_Context","Effect","_Function","Layer","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","Resource","exports","GenericTag","layer","config","attributes","undefined","SEMRESATTRS_SERVICE_NAME","serviceName","SEMRESATTRS_TELEMETRY_SDK_NAME","SEMRESATTRS_TELEMETRY_SDK_LANGUAGE","globalThis","document","TELEMETRYSDKLANGUAGEVALUES_NODEJS","TELEMETRYSDKLANGUAGEVALUES_WEBJS","serviceVersion","SEMRESATTRS_SERVICE_VERSION","succeed","layerFromEnv","additionalAttributes","effect","gen","pipe","Config","string","option","orDie","withDefault","map","s","attrs","split","reduce","acc","attr","parts","length","trim","_tag","value","assign","layerEmpty","empty"],"sources":["../../src/Resource.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Resource.d.ts","sourceRoot":"","sources":["../../src/Resource.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAA;
|
|
1
|
+
{"version":3,"file":"Resource.d.ts","sourceRoot":"","sources":["../../src/Resource.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,SAAS,MAAM,0BAA0B,CAAA;AAcrD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC;;;GAGG;AACH,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AAED;;;GAGG;AACH,eAAO,MAAM,QAAQ,4DAA6E,CAAA;AAElG;;;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,SAAS,CAAC,kBAAkB,CAAA;CACnD,wCAgBA,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY,0BAEnB,SAAS,CAAC,kBAAkB,GAC5B,SAAS,KACZ,KAAK,CAAC,KAAK,CAAC,QAAQ,CA6BpB,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,UAAU,qCAGtB,CAAA"}
|
package/dist/esm/Resource.js
CHANGED
|
@@ -7,6 +7,7 @@ import { Config } from "effect";
|
|
|
7
7
|
import * as Arr from "effect/Array";
|
|
8
8
|
import { GenericTag } from "effect/Context";
|
|
9
9
|
import * as Effect from "effect/Effect";
|
|
10
|
+
import { pipe } from "effect/Function";
|
|
10
11
|
import * as Layer from "effect/Layer";
|
|
11
12
|
/**
|
|
12
13
|
* @since 1.0.0
|
|
@@ -33,9 +34,9 @@ export const layer = config => {
|
|
|
33
34
|
* @since 1.0.0
|
|
34
35
|
* @category layer
|
|
35
36
|
*/
|
|
36
|
-
export const layerFromEnv = additionalAttributes => Layer.effect(Resource, Effect.gen(function* (
|
|
37
|
-
const serviceName = yield*
|
|
38
|
-
const attributes = yield*
|
|
37
|
+
export const layerFromEnv = additionalAttributes => Layer.effect(Resource, Effect.gen(function* () {
|
|
38
|
+
const serviceName = yield* pipe(Config.string("OTEL_SERVICE_NAME"), Config.option, Effect.orDie);
|
|
39
|
+
const attributes = yield* pipe(Config.string("OTEL_RESOURCE_ATTRIBUTES"), Config.withDefault(""), Config.map(s => {
|
|
39
40
|
const attrs = s.split(",");
|
|
40
41
|
return Arr.reduce(attrs, {}, (acc, attr) => {
|
|
41
42
|
const parts = attr.split("=");
|
package/dist/esm/Resource.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Resource.js","names":["Resources","SEMRESATTRS_SERVICE_NAME","SEMRESATTRS_SERVICE_VERSION","SEMRESATTRS_TELEMETRY_SDK_LANGUAGE","SEMRESATTRS_TELEMETRY_SDK_NAME","TELEMETRYSDKLANGUAGEVALUES_NODEJS","TELEMETRYSDKLANGUAGEVALUES_WEBJS","Config","Arr","GenericTag","Effect","Layer","Resource","layer","config","attributes","undefined","serviceName","globalThis","document","serviceVersion","succeed","layerFromEnv","additionalAttributes","effect","gen","
|
|
1
|
+
{"version":3,"file":"Resource.js","names":["Resources","SEMRESATTRS_SERVICE_NAME","SEMRESATTRS_SERVICE_VERSION","SEMRESATTRS_TELEMETRY_SDK_LANGUAGE","SEMRESATTRS_TELEMETRY_SDK_NAME","TELEMETRYSDKLANGUAGEVALUES_NODEJS","TELEMETRYSDKLANGUAGEVALUES_WEBJS","Config","Arr","GenericTag","Effect","pipe","Layer","Resource","layer","config","attributes","undefined","serviceName","globalThis","document","serviceVersion","succeed","layerFromEnv","additionalAttributes","effect","gen","string","option","orDie","withDefault","map","s","attrs","split","reduce","acc","attr","parts","length","trim","_tag","value","Object","assign","layerEmpty","empty"],"sources":["../../src/Resource.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect/opentelemetry",
|
|
3
|
-
"version": "0.42.
|
|
3
|
+
"version": "0.42.6",
|
|
4
4
|
"description": "OpenTelemetry integration for Effect",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"@opentelemetry/sdk-trace-node": "^1.22",
|
|
18
18
|
"@opentelemetry/sdk-trace-web": "^1.22",
|
|
19
19
|
"@opentelemetry/semantic-conventions": "^1.24.1",
|
|
20
|
-
"effect": "^3.12.
|
|
20
|
+
"effect": "^3.12.6"
|
|
21
21
|
},
|
|
22
22
|
"peerDependenciesMeta": {
|
|
23
23
|
"@opentelemetry/sdk-metrics": {
|
package/src/Resource.ts
CHANGED
|
@@ -14,6 +14,7 @@ import { Config } from "effect"
|
|
|
14
14
|
import * as Arr from "effect/Array"
|
|
15
15
|
import { GenericTag } from "effect/Context"
|
|
16
16
|
import * as Effect from "effect/Effect"
|
|
17
|
+
import { pipe } from "effect/Function"
|
|
17
18
|
import * as Layer from "effect/Layer"
|
|
18
19
|
|
|
19
20
|
/**
|
|
@@ -67,9 +68,9 @@ export const layerFromEnv = (
|
|
|
67
68
|
): Layer.Layer<Resource> =>
|
|
68
69
|
Layer.effect(
|
|
69
70
|
Resource,
|
|
70
|
-
Effect.gen(function*(
|
|
71
|
-
const serviceName = yield*
|
|
72
|
-
const attributes = yield*
|
|
71
|
+
Effect.gen(function*() {
|
|
72
|
+
const serviceName = yield* pipe(Config.string("OTEL_SERVICE_NAME"), Config.option, Effect.orDie)
|
|
73
|
+
const attributes = yield* pipe(
|
|
73
74
|
Config.string("OTEL_RESOURCE_ATTRIBUTES"),
|
|
74
75
|
Config.withDefault(""),
|
|
75
76
|
Config.map((s) => {
|