@effect/opentelemetry 0.56.0 → 0.56.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/dist/cjs/Otlp.js +29 -24
- package/dist/cjs/Otlp.js.map +1 -1
- package/dist/cjs/OtlpTracer.js +4 -3
- package/dist/cjs/OtlpTracer.js.map +1 -1
- package/dist/cjs/internal/otlpExporter.js +17 -16
- package/dist/cjs/internal/otlpExporter.js.map +1 -1
- package/dist/dts/Otlp.d.ts.map +1 -1
- package/dist/dts/OtlpTracer.d.ts.map +1 -1
- package/dist/esm/Otlp.js +29 -24
- package/dist/esm/Otlp.js.map +1 -1
- package/dist/esm/OtlpTracer.js +4 -3
- package/dist/esm/OtlpTracer.js.map +1 -1
- package/dist/esm/internal/otlpExporter.js +17 -16
- package/dist/esm/internal/otlpExporter.js.map +1 -1
- package/package.json +3 -3
- package/src/Otlp.ts +9 -5
- package/src/OtlpTracer.ts +5 -3
- package/src/internal/otlpExporter.ts +16 -17
package/dist/cjs/Otlp.js
CHANGED
|
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.layer = void 0;
|
|
7
|
+
var HttpClientRequest = _interopRequireWildcard(require("@effect/platform/HttpClientRequest"));
|
|
7
8
|
var Layer = _interopRequireWildcard(require("effect/Layer"));
|
|
8
9
|
var OtlpLogger = _interopRequireWildcard(require("./OtlpLogger.js"));
|
|
9
10
|
var OtlpMetrics = _interopRequireWildcard(require("./OtlpMetrics.js"));
|
|
@@ -13,29 +14,33 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
|
|
|
13
14
|
* @since 1.0.0
|
|
14
15
|
* @category Layers
|
|
15
16
|
*/
|
|
16
|
-
const layer = options =>
|
|
17
|
-
|
|
18
|
-
url
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
17
|
+
const layer = options => {
|
|
18
|
+
const baseReq = HttpClientRequest.get(options.baseUrl);
|
|
19
|
+
const url = path => HttpClientRequest.appendUrl(baseReq, path).url;
|
|
20
|
+
return Layer.mergeAll(OtlpLogger.layer({
|
|
21
|
+
replaceLogger: options.replaceLogger,
|
|
22
|
+
url: url("/v1/logs"),
|
|
23
|
+
resource: options.resource,
|
|
24
|
+
headers: options.headers,
|
|
25
|
+
exportInterval: options.loggerExportInterval,
|
|
26
|
+
maxBatchSize: options.maxBatchSize,
|
|
27
|
+
shutdownTimeout: options.shutdownTimeout,
|
|
28
|
+
excludeLogSpans: options.loggerExcludeLogSpans
|
|
29
|
+
}), OtlpMetrics.layer({
|
|
30
|
+
url: url("/v1/metrics"),
|
|
31
|
+
resource: options.resource,
|
|
32
|
+
headers: options.headers,
|
|
33
|
+
exportInterval: options.metricsExportInterval,
|
|
34
|
+
shutdownTimeout: options.shutdownTimeout
|
|
35
|
+
}), OtlpTracer.layer({
|
|
36
|
+
url: url("/v1/traces"),
|
|
37
|
+
resource: options.resource,
|
|
38
|
+
headers: options.headers,
|
|
39
|
+
exportInterval: options.tracerExportInterval,
|
|
40
|
+
maxBatchSize: options.maxBatchSize,
|
|
41
|
+
context: options.tracerContext,
|
|
42
|
+
shutdownTimeout: options.shutdownTimeout
|
|
43
|
+
}));
|
|
44
|
+
};
|
|
40
45
|
exports.layer = layer;
|
|
41
46
|
//# sourceMappingURL=Otlp.js.map
|
package/dist/cjs/Otlp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Otlp.js","names":["
|
|
1
|
+
{"version":3,"file":"Otlp.js","names":["HttpClientRequest","_interopRequireWildcard","require","Layer","OtlpLogger","OtlpMetrics","OtlpTracer","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","layer","options","baseReq","baseUrl","url","path","appendUrl","mergeAll","replaceLogger","resource","headers","exportInterval","loggerExportInterval","maxBatchSize","shutdownTimeout","excludeLogSpans","loggerExcludeLogSpans","metricsExportInterval","tracerExportInterval","context","tracerContext","exports"],"sources":["../../src/Otlp.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/cjs/OtlpTracer.js
CHANGED
|
@@ -44,6 +44,9 @@ const make = exports.make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
|
|
|
44
44
|
},
|
|
45
45
|
shutdownTimeout: options.shutdownTimeout ?? Duration.seconds(3)
|
|
46
46
|
});
|
|
47
|
+
const exportFn = span => {
|
|
48
|
+
exporter.push(makeOtlpSpan(span));
|
|
49
|
+
};
|
|
47
50
|
return Tracer.make({
|
|
48
51
|
span(name, parent, context, links, startTime, kind) {
|
|
49
52
|
return makeSpan({
|
|
@@ -58,9 +61,7 @@ const make = exports.make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
|
|
|
58
61
|
links,
|
|
59
62
|
sampled: true,
|
|
60
63
|
kind,
|
|
61
|
-
export
|
|
62
|
-
exporter.push(makeOtlpSpan(span));
|
|
63
|
-
}
|
|
64
|
+
export: exportFn
|
|
64
65
|
});
|
|
65
66
|
},
|
|
66
67
|
context: options.context ? function (f, fiber) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OtlpTracer.js","names":["OtelSemConv","_interopRequireWildcard","require","Cause","Duration","Effect","Layer","Option","Tracer","Exporter","_OtlpResource","OtlpResource","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","make","exports","fnUntraced","options","otelResource","fromConfig","resource","scope","name","unsafeServiceName","exporter","label","url","headers","exportInterval","seconds","maxBatchSize","body","spans","data","resourceSpans","scopeSpans","shutdownTimeout","span","parent","context","links","startTime","kind","makeSpan","status","_tag","attributes","Map","sampled","export","
|
|
1
|
+
{"version":3,"file":"OtlpTracer.js","names":["OtelSemConv","_interopRequireWildcard","require","Cause","Duration","Effect","Layer","Option","Tracer","Exporter","_OtlpResource","OtlpResource","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","make","exports","fnUntraced","options","otelResource","fromConfig","resource","scope","name","unsafeServiceName","exporter","label","url","headers","exportInterval","seconds","maxBatchSize","body","spans","data","resourceSpans","scopeSpans","shutdownTimeout","exportFn","span","push","makeOtlpSpan","parent","context","links","startTime","kind","makeSpan","status","_tag","attributes","Map","sampled","export","fiber","currentSpan","undefined","defaultContext","layer","unwrapScoped","map","setTracer","_","SpanProto","end","endTime","exit","attribute","key","value","event","events","addLinks","self","assign","create","isSome","traceId","generateId","spanId","len","chars","result","Math","floor","random","length","entriesToAttributes","entries","timeUnixNano","String","droppedAttributesCount","otelStatus","constOtelStatusSuccess","isInterruptedOnly","cause","code","StatusCode","Ok","message","pretty","errors","prettyErrors","firstError","Error","stringValue","boolValue","ATTR_EXCEPTION_TYPE","ATTR_EXCEPTION_MESSAGE","ATTR_EXCEPTION_STACKTRACE","renderErrorCause","parentSpanId","SpanKind","startTimeUnixNano","endTimeUnixNano","droppedEventsCount","link","droppedLinksCount"],"sources":["../../src/OtlpTracer.ts"],"sourcesContent":[null],"mappings":";;;;;;AAKA,IAAAA,WAAA,GAAAC,uBAAA,CAAAC,OAAA;AACA,IAAAC,KAAA,GAAAF,uBAAA,CAAAC,OAAA;AAEA,IAAAE,QAAA,GAAAH,uBAAA,CAAAC,OAAA;AACA,IAAAG,MAAA,GAAAJ,uBAAA,CAAAC,OAAA;AAEA,IAAAI,KAAA,GAAAL,uBAAA,CAAAC,OAAA;AACA,IAAAK,MAAA,GAAAN,uBAAA,CAAAC,OAAA;AAEA,IAAAM,MAAA,GAAAP,uBAAA,CAAAC,OAAA;AAEA,IAAAO,QAAA,GAAAR,uBAAA,CAAAC,OAAA;AAEA,IAAAQ,aAAA,GAAAT,uBAAA,CAAAC,OAAA;AAAuD,IAAAS,YAAA,GAAAD,aAAA;AAAA,SAAAT,wBAAAW,CAAA,EAAAC,CAAA,6BAAAC,OAAA,MAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAb,uBAAA,YAAAA,CAAAW,CAAA,EAAAC,CAAA,SAAAA,CAAA,IAAAD,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,MAAAM,CAAA,EAAAC,CAAA,EAAAC,CAAA,KAAAC,SAAA,QAAAC,OAAA,EAAAV,CAAA,iBAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,SAAAQ,CAAA,MAAAF,CAAA,GAAAL,CAAA,GAAAG,CAAA,GAAAD,CAAA,QAAAG,CAAA,CAAAK,GAAA,CAAAX,CAAA,UAAAM,CAAA,CAAAM,GAAA,CAAAZ,CAAA,GAAAM,CAAA,CAAAO,GAAA,CAAAb,CAAA,EAAAQ,CAAA,gBAAAP,CAAA,IAAAD,CAAA,gBAAAC,CAAA,OAAAa,cAAA,CAAAC,IAAA,CAAAf,CAAA,EAAAC,CAAA,OAAAM,CAAA,IAAAD,CAAA,GAAAU,MAAA,CAAAC,cAAA,KAAAD,MAAA,CAAAE,wBAAA,CAAAlB,CAAA,EAAAC,CAAA,OAAAM,CAAA,CAAAK,GAAA,IAAAL,CAAA,CAAAM,GAAA,IAAAP,CAAA,CAAAE,CAAA,EAAAP,CAAA,EAAAM,CAAA,IAAAC,CAAA,CAAAP,CAAA,IAAAD,CAAA,CAAAC,CAAA,WAAAO,CAAA,KAAAR,CAAA,EAAAC,CAAA;AAGvD;;;;AAIO,MAAMkB,IAAI,GAAAC,OAAA,CAAAD,IAAA,gBAkBb1B,MAAM,CAAC4B,UAAU,CAAC,WAAUC,OAAO;EACrC,MAAMC,YAAY,GAAG,OAAOxB,YAAY,CAACyB,UAAU,CAACF,OAAO,CAACG,QAAQ,CAAC;EACrE,MAAMC,KAAK,GAAU;IACnBC,IAAI,EAAE5B,YAAY,CAAC6B,iBAAiB,CAACL,YAAY;GAClD;EAED,MAAMM,QAAQ,GAAG,OAAOhC,QAAQ,CAACsB,IAAI,CAAC;IACpCW,KAAK,EAAE,YAAY;IACnBC,GAAG,EAAET,OAAO,CAACS,GAAG;IAChBC,OAAO,EAAEV,OAAO,CAACU,OAAO;IACxBC,cAAc,EAAEX,OAAO,CAACW,cAAc,IAAIzC,QAAQ,CAAC0C,OAAO,CAAC,CAAC,CAAC;IAC7DC,YAAY,EAAEb,OAAO,CAACa,YAAY,IAAI,IAAI;IAC1CC,IAAIA,CAACC,KAAK;MACR,MAAMC,IAAI,GAAc;QACtBC,aAAa,EAAE,CAAC;UACdd,QAAQ,EAAEF,YAAY;UACtBiB,UAAU,EAAE,CAAC;YACXd,KAAK;YACLW;WACD;SACF;OACF;MACD,OAAOC,IAAI;IACb,CAAC;IACDG,eAAe,EAAEnB,OAAO,CAACmB,eAAe,IAAIjD,QAAQ,CAAC0C,OAAO,CAAC,CAAC;GAC/D,CAAC;EAEF,MAAMQ,QAAQ,GAAIC,IAAc,IAAI;IAClCd,QAAQ,CAACe,IAAI,CAACC,YAAY,CAACF,IAAI,CAAC,CAAC;EACnC,CAAC;EAED,OAAO/C,MAAM,CAACuB,IAAI,CAAC;IACjBwB,IAAIA,CAAChB,IAAI,EAAEmB,MAAM,EAAEC,OAAO,EAAEC,KAAK,EAAEC,SAAS,EAAEC,IAAI;MAChD,OAAOC,QAAQ,CAAC;QACdxB,IAAI;QACJmB,MAAM;QACNC,OAAO;QACPK,MAAM,EAAE;UACNC,IAAI,EAAE,SAAS;UACfJ;SACD;QACDK,UAAU,EAAE,IAAIC,GAAG,EAAE;QACrBP,KAAK;QACLQ,OAAO,EAAE,IAAI;QACbN,IAAI;QACJO,MAAM,EAAEf;OACT,CAAC;IACJ,CAAC;IACDK,OAAO,EAAEzB,OAAO,CAACyB,OAAO,GACtB,UAASvC,CAAC,EAAEkD,KAAK;MACf,IAAIA,KAAK,CAACC,WAAW,KAAKC,SAAS,EAAE;QACnC,OAAOpD,CAAC,EAAE;MACZ;MACA,OAAOc,OAAO,CAACyB,OAAQ,CAACvC,CAAC,EAAEkD,KAAK,CAACC,WAAW,CAAC;IAC/C,CAAC,GACDE;GACH,CAAC;AACJ,CAAC,CAAC;AAEF;;;;AAIO,MAAMC,KAAK,GAAIxC,OAYrB,IAAuD5B,KAAK,CAACqE,YAAY,CAACtE,MAAM,CAACuE,GAAG,CAAC7C,IAAI,CAACG,OAAO,CAAC,EAAE5B,KAAK,CAACuE,SAAS,CAAC,CAAC;AAEtH;AAAA7C,OAAA,CAAA0C,KAAA,GAAAA,KAAA;AAEA,SAASD,cAAcA,CAAIrD,CAAU,EAAE0D,CAAM;EAC3C,OAAO1D,CAAC,EAAE;AACZ;AAUA,MAAM2D,SAAS,GAAG;EAChBd,IAAI,EAAE,MAAM;EACZe,GAAGA,CAAiBC,OAAe,EAAEC,IAAiC;IACpE,IAAI,CAAClB,MAAM,GAAG;MACZC,IAAI,EAAE,OAAO;MACbJ,SAAS,EAAE,IAAI,CAACG,MAAM,CAACH,SAAS;MAChCoB,OAAO;MACPC;KACD;IACD,IAAI,CAACb,MAAM,CAAC,IAAI,CAAC;EACnB,CAAC;EACDc,SAASA,CAAiBC,GAAW,EAAEC,KAAc;IACnD,IAAI,CAACnB,UAAU,CAACzC,GAAG,CAAC2D,GAAG,EAAEC,KAAK,CAAC;EACjC,CAAC;EACDC,KAAKA,CAAiB/C,IAAY,EAAEsB,SAAiB,EAAEK,UAAoC;IACzF,IAAI,CAACqB,MAAM,CAAC/B,IAAI,CAAC,CAACjB,IAAI,EAAEsB,SAAS,EAAEK,UAAU,CAAC,CAAC;EACjD,CAAC;EACDsB,QAAQA,CAAiB5B,KAAqC;IAC5D;IACA,IAAI,CAACA,KAAK,CAACJ,IAAI,CAAC,GAAGI,KAAK,CAAC;EAC3B;CACD;AAED,MAAMG,QAAQ,GAAI7B,OAUjB,IAAc;EACb,MAAMuD,IAAI,GAAG7D,MAAM,CAAC8D,MAAM,CAAC9D,MAAM,CAAC+D,MAAM,CAACZ,SAAS,CAAC,EAAE7C,OAAO,CAAC;EAC7D,IAAI3B,MAAM,CAACqF,MAAM,CAACH,IAAI,CAAC/B,MAAM,CAAC,EAAE;IAC9B+B,IAAI,CAACI,OAAO,GAAGJ,IAAI,CAAC/B,MAAM,CAAC2B,KAAK,CAACQ,OAAO;EAC1C,CAAC,MAAM;IACLJ,IAAI,CAACI,OAAO,GAAGC,UAAU,CAAC,EAAE,CAAC;EAC/B;EACAL,IAAI,CAACM,MAAM,GAAGD,UAAU,CAAC,EAAE,CAAC;EAC5BL,IAAI,CAACF,MAAM,GAAG,EAAE;EAChB,OAAOE,IAAI;AACb,CAAC;AAED,MAAMK,UAAU,GAAIE,GAAW,IAAY;EACzC,MAAMC,KAAK,GAAG,kBAAkB;EAChC,IAAIC,MAAM,GAAG,EAAE;EACf,KAAK,IAAI/E,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAG6E,GAAG,EAAE7E,CAAC,EAAE,EAAE;IAC5B+E,MAAM,IAAID,KAAK,CAACE,IAAI,CAACC,KAAK,CAACD,IAAI,CAACE,MAAM,EAAE,GAAGJ,KAAK,CAACK,MAAM,CAAC,CAAC;EAC3D;EACA,OAAOJ,MAAM;AACf,CAAC;AAED,MAAMzC,YAAY,GAAIgC,IAAc,IAAc;EAChD,MAAMzB,MAAM,GAAGyB,IAAI,CAACzB,MAAgD;EACpE,MAAME,UAAU,GAAG,IAAAqC,iCAAmB,EAACd,IAAI,CAACvB,UAAU,CAACsC,OAAO,EAAE,CAAC;EACjE,MAAMjB,MAAM,GAAGE,IAAI,CAACF,MAAM,CAACX,GAAG,CAAC,CAAC,CAACrC,IAAI,EAAEsB,SAAS,EAAEK,UAAU,CAAC,MAAM;IACjE3B,IAAI;IACJkE,YAAY,EAAEC,MAAM,CAAC7C,SAAS,CAAC;IAC/BK,UAAU,EAAEA,UAAU,GAClB,IAAAqC,iCAAmB,EAAC3E,MAAM,CAAC4E,OAAO,CAACtC,UAAU,CAAC,CAAC,GAC/C,EAAE;IACNyC,sBAAsB,EAAE;GACzB,CAAC,CAAC;EACH,IAAIC,UAAkB;EAEtB,IAAI5C,MAAM,CAACkB,IAAI,CAACjB,IAAI,KAAK,SAAS,EAAE;IAClC2C,UAAU,GAAGC,sBAAsB;EACrC,CAAC,MAAM,IAAI1G,KAAK,CAAC2G,iBAAiB,CAAC9C,MAAM,CAACkB,IAAI,CAAC6B,KAAK,CAAC,EAAE;IACrDH,UAAU,GAAG;MACXI,IAAI,EAAEC,UAAU,CAACC,EAAE;MACnBC,OAAO,EAAEhH,KAAK,CAACiH,MAAM,CAACpD,MAAM,CAACkB,IAAI,CAAC6B,KAAK;KACxC;EACH,CAAC,MAAM;IACL,MAAMM,MAAM,GAAGlH,KAAK,CAACmH,YAAY,CAACtD,MAAM,CAACkB,IAAI,CAAC6B,KAAK,CAAC;IACpD,MAAMQ,UAAU,GAAGF,MAAM,CAAC,CAAC,CAAC;IAC5BT,UAAU,GAAG;MACXI,IAAI,EAAEC,UAAU,CAACO;KAClB;IACDtD,UAAU,CAACV,IAAI,CAAC;MACd4B,GAAG,EAAE,YAAY;MACjBC,KAAK,EAAE;QAAEoC,WAAW,EAAE;MAAgB;KACvC,EAAE;MACDrC,GAAG,EAAE,oBAAoB;MACzBC,KAAK,EAAE;QAAEqC,SAAS,EAAE;MAAI;KACzB,CAAC;IACF,IAAIH,UAAU,EAAE;MACdX,UAAU,CAACO,OAAO,GAAGI,UAAU,CAACJ,OAAO;MACvC5B,MAAM,CAAC/B,IAAI,CAAC;QACVjB,IAAI,EAAE,WAAW;QACjBkE,YAAY,EAAEC,MAAM,CAAC1C,MAAM,CAACiB,OAAO,CAAC;QACpC0B,sBAAsB,EAAE,CAAC;QACzBzC,UAAU,EAAE,CACV;UACE,KAAK,EAAElE,WAAW,CAAC2H,mBAAmB;UACtC,OAAO,EAAE;YACP,aAAa,EAAEJ,UAAU,CAAChF;;SAE7B,EACD;UACE,KAAK,EAAEvC,WAAW,CAAC4H,sBAAsB;UACzC,OAAO,EAAE;YACP,aAAa,EAAEL,UAAU,CAACJ;;SAE7B,EACD;UACE,KAAK,EAAEnH,WAAW,CAAC6H,yBAAyB;UAC5C,OAAO,EAAE;YACP,aAAa,EAAE1H,KAAK,CAACiH,MAAM,CAACpD,MAAM,CAACkB,IAAI,CAAC6B,KAAK,EAAE;cAAEe,gBAAgB,EAAE;YAAI,CAAE;;SAE5E;OAEJ,CAAC;IACJ;EACF;EAEA,OAAO;IACLjC,OAAO,EAAEJ,IAAI,CAACI,OAAO;IACrBE,MAAM,EAAEN,IAAI,CAACM,MAAM;IACnBgC,YAAY,EAAExH,MAAM,CAACqF,MAAM,CAACH,IAAI,CAAC/B,MAAM,CAAC,GAAG+B,IAAI,CAAC/B,MAAM,CAAC2B,KAAK,CAACU,MAAM,GAAGvB,SAAS;IAC/EjC,IAAI,EAAEkD,IAAI,CAAClD,IAAI;IACfuB,IAAI,EAAEkE,QAAQ,CAACvC,IAAI,CAAC3B,IAAI,CAAC;IACzBmE,iBAAiB,EAAEvB,MAAM,CAAC1C,MAAM,CAACH,SAAS,CAAC;IAC3CqE,eAAe,EAAExB,MAAM,CAAC1C,MAAM,CAACiB,OAAO,CAAC;IACvCf,UAAU;IACVyC,sBAAsB,EAAE,CAAC;IACzBpB,MAAM;IACN4C,kBAAkB,EAAE,CAAC;IACrBnE,MAAM,EAAE4C,UAAU;IAClBhD,KAAK,EAAE6B,IAAI,CAAC7B,KAAK,CAACgB,GAAG,CAAEwD,IAAI,KAAM;MAC/BvC,OAAO,EAAEuC,IAAI,CAAC7E,IAAI,CAACsC,OAAO;MAC1BE,MAAM,EAAEqC,IAAI,CAAC7E,IAAI,CAACwC,MAAM;MACxB7B,UAAU,EAAE,IAAAqC,iCAAmB,EAAC3E,MAAM,CAAC4E,OAAO,CAAC4B,IAAI,CAAClE,UAAU,CAAC,CAAC;MAChEyC,sBAAsB,EAAE;KACzB,CAAC,CAAC;IACH0B,iBAAiB,EAAE;GACpB;AACH,CAAC;AAwDD,IAAWpB,UAIV;AAJD,WAAWA,UAAU;EACnBA,UAAA,CAAAA,UAAA,wBAAS;EACTA,UAAA,CAAAA,UAAA,kBAAM;EACNA,UAAA,CAAAA,UAAA,wBAAS;AACX,CAAC,EAJUA,UAAU,KAAVA,UAAU;AAMrB,IAAKe,QAOJ;AAPD,WAAKA,QAAQ;EACXA,QAAA,CAAAA,QAAA,oCAAe;EACfA,QAAA,CAAAA,QAAA,8BAAY;EACZA,QAAA,CAAAA,QAAA,0BAAU;EACVA,QAAA,CAAAA,QAAA,0BAAU;EACVA,QAAA,CAAAA,QAAA,8BAAY;EACZA,QAAA,CAAAA,QAAA,8BAAY;AACd,CAAC,EAPIA,QAAQ,KAARA,QAAQ;AASb,MAAMnB,sBAAsB,GAAW;EACrCG,IAAI,EAAEC,UAAU,CAACC;CAClB","ignoreList":[]}
|
|
@@ -25,17 +25,13 @@ const policy = /*#__PURE__*/Schedule.forever.pipe(Schedule.passthrough, /*#__PUR
|
|
|
25
25
|
}));
|
|
26
26
|
/** @internal */
|
|
27
27
|
const make = exports.make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
|
|
28
|
+
const clock = yield* Effect.clock;
|
|
28
29
|
const scope = yield* Effect.scope;
|
|
29
30
|
const exportInterval = Duration.decode(options.exportInterval);
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
const retryAfter = error.response.headers["retry-after"];
|
|
35
|
-
const retryAfterSeconds = retryAfter ? parseInt(retryAfter, 10) : 5;
|
|
36
|
-
return Effect.sleep(Duration.seconds(retryAfterSeconds));
|
|
37
|
-
}), HttpClient.retryTransient({
|
|
38
|
-
schedule: policy
|
|
31
|
+
let disabledUntil = undefined;
|
|
32
|
+
const client = HttpClient.filterStatusOk(yield* HttpClient.HttpClient).pipe(HttpClient.retryTransient({
|
|
33
|
+
schedule: policy,
|
|
34
|
+
times: 3
|
|
39
35
|
}));
|
|
40
36
|
let headers = Headers.unsafeFromRecord({
|
|
41
37
|
"user-agent": `effect-opentelemetry-${options.label}/0.0.0`
|
|
@@ -48,6 +44,11 @@ const make = exports.make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
|
|
|
48
44
|
});
|
|
49
45
|
let buffer = [];
|
|
50
46
|
const runExport = Effect.suspend(() => {
|
|
47
|
+
if (disabledUntil !== undefined && clock.unsafeCurrentTimeMillis() < disabledUntil) {
|
|
48
|
+
return Effect.void;
|
|
49
|
+
} else if (disabledUntil !== undefined) {
|
|
50
|
+
disabledUntil = undefined;
|
|
51
|
+
}
|
|
51
52
|
const items = buffer;
|
|
52
53
|
if (options.maxBatchSize !== "disabled") {
|
|
53
54
|
if (buffer.length === 0) {
|
|
@@ -56,20 +57,20 @@ const make = exports.make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
|
|
|
56
57
|
buffer = [];
|
|
57
58
|
}
|
|
58
59
|
return client.execute(HttpClientRequest.bodyUnsafeJson(request, options.body(items))).pipe(Effect.asVoid, Effect.withTracerEnabled(false));
|
|
59
|
-
})
|
|
60
|
+
}).pipe(Effect.catchAllCause(cause => {
|
|
61
|
+
if (disabledUntil !== undefined) return Effect.void;
|
|
62
|
+
disabledUntil = clock.unsafeCurrentTimeMillis() + Duration.toMillis("1 minute");
|
|
63
|
+
return Effect.logDebug(`Disabling ${options.label} for 60 seconds`, cause);
|
|
64
|
+
}));
|
|
60
65
|
yield* Scope.addFinalizer(scope, runExport.pipe(Effect.ignore, Effect.interruptible, Effect.timeoutOption(options.shutdownTimeout)));
|
|
61
|
-
|
|
62
|
-
yield* Effect.sleep(exportInterval).pipe(Effect.zipRight(runExport), Effect.forever, Effect.catchAllCause(cause => {
|
|
63
|
-
disabled = true;
|
|
64
|
-
return Effect.logDebug("Failed to export", cause);
|
|
65
|
-
}), Effect.annotateLogs({
|
|
66
|
+
yield* Effect.sleep(exportInterval).pipe(Effect.zipRight(runExport), Effect.forever, Effect.annotateLogs({
|
|
66
67
|
package: "@effect/opentelemetry",
|
|
67
68
|
module: options.label
|
|
68
69
|
}), Effect.forkIn(scope), Effect.interruptible);
|
|
69
70
|
const runFork = yield* FiberSet.makeRuntime().pipe(Effect.interruptible);
|
|
70
71
|
return {
|
|
71
72
|
push(data) {
|
|
72
|
-
if (
|
|
73
|
+
if (disabledUntil !== undefined) return;
|
|
73
74
|
buffer.push(data);
|
|
74
75
|
if (options.maxBatchSize !== "disabled" && buffer.length >= options.maxBatchSize) {
|
|
75
76
|
runFork(runExport);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otlpExporter.js","names":["Headers","_interopRequireWildcard","require","HttpClient","HttpClientError","HttpClientRequest","Duration","Effect","FiberSet","Num","Option","Schedule","Scope","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","policy","forever","pipe","passthrough","addDelay","error","isHttpClientError","_tag","response","status","retryAfter","fromNullable","headers","flatMap","parse","getOrElse","seconds","make","exports","fnUntraced","options","scope","exportInterval","decode","
|
|
1
|
+
{"version":3,"file":"otlpExporter.js","names":["Headers","_interopRequireWildcard","require","HttpClient","HttpClientError","HttpClientRequest","Duration","Effect","FiberSet","Num","Option","Schedule","Scope","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","policy","forever","pipe","passthrough","addDelay","error","isHttpClientError","_tag","response","status","retryAfter","fromNullable","headers","flatMap","parse","getOrElse","seconds","make","exports","fnUntraced","options","clock","scope","exportInterval","decode","disabledUntil","undefined","client","filterStatusOk","retryTransient","schedule","times","unsafeFromRecord","label","merge","fromInput","request","post","url","buffer","runExport","suspend","unsafeCurrentTimeMillis","void","items","maxBatchSize","length","execute","bodyUnsafeJson","body","asVoid","withTracerEnabled","catchAllCause","cause","toMillis","logDebug","addFinalizer","ignore","interruptible","timeoutOption","shutdownTimeout","sleep","zipRight","annotateLogs","package","module","forkIn","runFork","makeRuntime","push","data"],"sources":["../../../src/internal/otlpExporter.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/dts/Otlp.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Otlp.d.ts","sourceRoot":"","sources":["../../src/Otlp.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,KAAK,OAAO,MAAM,0BAA0B,CAAA;AACxD,OAAO,KAAK,KAAK,UAAU,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"Otlp.d.ts","sourceRoot":"","sources":["../../src/Otlp.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,KAAK,OAAO,MAAM,0BAA0B,CAAA;AACxD,OAAO,KAAK,KAAK,UAAU,MAAM,6BAA6B,CAAA;AAE9D,OAAO,KAAK,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAK5C;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAClB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QACzC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAC5C,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAC9C,CAAA;IACD,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAA;IAC5C,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1C,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS,CAAA;IAC5D,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,KAAK,CAAC,CAAC,GAAG,SAAS,CAAA;IACjF,QAAQ,CAAC,oBAAoB,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;IAClE,QAAQ,CAAC,qBAAqB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACpD,QAAQ,CAAC,qBAAqB,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;IACnE,QAAQ,CAAC,oBAAoB,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;IAClE,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;CAC9D,KAAG,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CA+BlD,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OtlpTracer.d.ts","sourceRoot":"","sources":["../../src/OtlpTracer.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,KAAK,OAAO,MAAM,0BAA0B,CAAA;AACxD,OAAO,KAAK,KAAK,UAAU,MAAM,6BAA6B,CAAA;AAI9D,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAOvC;;;GAGG;AACH,eAAO,MAAM,IAAI,EAAE,CACjB,OAAO,EAAE;IACP,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAClB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QACzC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAC5C,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAC9C,GAAG,SAAS,CAAA;IACb,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAA;IAC5C,QAAQ,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;IAC5D,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1C,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,KAAK,CAAC,CAAC,GAAG,SAAS,CAAA;IAC3E,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;CAC9D,KACE,MAAM,CAAC,MAAM,CAChB,MAAM,CAAC,MAAM,EACb,KAAK,EACL,UAAU,CAAC,UAAU,GAAG,KAAK,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"OtlpTracer.d.ts","sourceRoot":"","sources":["../../src/OtlpTracer.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,KAAK,OAAO,MAAM,0BAA0B,CAAA;AACxD,OAAO,KAAK,KAAK,UAAU,MAAM,6BAA6B,CAAA;AAI9D,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAOvC;;;GAGG;AACH,eAAO,MAAM,IAAI,EAAE,CACjB,OAAO,EAAE;IACP,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAClB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QACzC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAC5C,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAC9C,GAAG,SAAS,CAAA;IACb,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAA;IAC5C,QAAQ,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;IAC5D,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1C,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,KAAK,CAAC,CAAC,GAAG,SAAS,CAAA;IAC3E,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;CAC9D,KACE,MAAM,CAAC,MAAM,CAChB,MAAM,CAAC,MAAM,EACb,KAAK,EACL,UAAU,CAAC,UAAU,GAAG,KAAK,CAAC,KAAK,CA0DnC,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS;IAC7B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAClB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QACzC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAC5C,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAC9C,GAAG,SAAS,CAAA;IACb,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAA;IAC5C,QAAQ,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;IAC5D,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1C,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,KAAK,CAAC,CAAC,GAAG,SAAS,CAAA;IAC3E,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;CAC9D,KAAG,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAAmE,CAAA;AA0KtH,UAAU,KAAK;IACb,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB"}
|
package/dist/esm/Otlp.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as HttpClientRequest from "@effect/platform/HttpClientRequest";
|
|
1
2
|
import * as Layer from "effect/Layer";
|
|
2
3
|
import * as OtlpLogger from "./OtlpLogger.js";
|
|
3
4
|
import * as OtlpMetrics from "./OtlpMetrics.js";
|
|
@@ -6,28 +7,32 @@ import * as OtlpTracer from "./OtlpTracer.js";
|
|
|
6
7
|
* @since 1.0.0
|
|
7
8
|
* @category Layers
|
|
8
9
|
*/
|
|
9
|
-
export const layer = options =>
|
|
10
|
-
|
|
11
|
-
url
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
10
|
+
export const layer = options => {
|
|
11
|
+
const baseReq = HttpClientRequest.get(options.baseUrl);
|
|
12
|
+
const url = path => HttpClientRequest.appendUrl(baseReq, path).url;
|
|
13
|
+
return Layer.mergeAll(OtlpLogger.layer({
|
|
14
|
+
replaceLogger: options.replaceLogger,
|
|
15
|
+
url: url("/v1/logs"),
|
|
16
|
+
resource: options.resource,
|
|
17
|
+
headers: options.headers,
|
|
18
|
+
exportInterval: options.loggerExportInterval,
|
|
19
|
+
maxBatchSize: options.maxBatchSize,
|
|
20
|
+
shutdownTimeout: options.shutdownTimeout,
|
|
21
|
+
excludeLogSpans: options.loggerExcludeLogSpans
|
|
22
|
+
}), OtlpMetrics.layer({
|
|
23
|
+
url: url("/v1/metrics"),
|
|
24
|
+
resource: options.resource,
|
|
25
|
+
headers: options.headers,
|
|
26
|
+
exportInterval: options.metricsExportInterval,
|
|
27
|
+
shutdownTimeout: options.shutdownTimeout
|
|
28
|
+
}), OtlpTracer.layer({
|
|
29
|
+
url: url("/v1/traces"),
|
|
30
|
+
resource: options.resource,
|
|
31
|
+
headers: options.headers,
|
|
32
|
+
exportInterval: options.tracerExportInterval,
|
|
33
|
+
maxBatchSize: options.maxBatchSize,
|
|
34
|
+
context: options.tracerContext,
|
|
35
|
+
shutdownTimeout: options.shutdownTimeout
|
|
36
|
+
}));
|
|
37
|
+
};
|
|
33
38
|
//# sourceMappingURL=Otlp.js.map
|
package/dist/esm/Otlp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Otlp.js","names":["Layer","OtlpLogger","OtlpMetrics","OtlpTracer","layer","options","
|
|
1
|
+
{"version":3,"file":"Otlp.js","names":["HttpClientRequest","Layer","OtlpLogger","OtlpMetrics","OtlpTracer","layer","options","baseReq","get","baseUrl","url","path","appendUrl","mergeAll","replaceLogger","resource","headers","exportInterval","loggerExportInterval","maxBatchSize","shutdownTimeout","excludeLogSpans","loggerExcludeLogSpans","metricsExportInterval","tracerExportInterval","context","tracerContext"],"sources":["../../src/Otlp.ts"],"sourcesContent":[null],"mappings":"AAKA,OAAO,KAAKA,iBAAiB,MAAM,oCAAoC;AAEvE,OAAO,KAAKC,KAAK,MAAM,cAAc;AAGrC,OAAO,KAAKC,UAAU,MAAM,iBAAiB;AAC7C,OAAO,KAAKC,WAAW,MAAM,kBAAkB;AAC/C,OAAO,KAAKC,UAAU,MAAM,iBAAiB;AAE7C;;;;AAIA,OAAO,MAAMC,KAAK,GAAIC,OAgBrB,IAAsD;EACrD,MAAMC,OAAO,GAAGP,iBAAiB,CAACQ,GAAG,CAACF,OAAO,CAACG,OAAO,CAAC;EACtD,MAAMC,GAAG,GAAIC,IAAY,IAAKX,iBAAiB,CAACY,SAAS,CAACL,OAAO,EAAEI,IAAI,CAAC,CAACD,GAAG;EAC5E,OAAOT,KAAK,CAACY,QAAQ,CACnBX,UAAU,CAACG,KAAK,CAAC;IACfS,aAAa,EAAER,OAAO,CAACQ,aAAa;IACpCJ,GAAG,EAAEA,GAAG,CAAC,UAAU,CAAC;IACpBK,QAAQ,EAAET,OAAO,CAACS,QAAQ;IAC1BC,OAAO,EAAEV,OAAO,CAACU,OAAO;IACxBC,cAAc,EAAEX,OAAO,CAACY,oBAAoB;IAC5CC,YAAY,EAAEb,OAAO,CAACa,YAAY;IAClCC,eAAe,EAAEd,OAAO,CAACc,eAAe;IACxCC,eAAe,EAAEf,OAAO,CAACgB;GAC1B,CAAC,EACFnB,WAAW,CAACE,KAAK,CAAC;IAChBK,GAAG,EAAEA,GAAG,CAAC,aAAa,CAAC;IACvBK,QAAQ,EAAET,OAAO,CAACS,QAAQ;IAC1BC,OAAO,EAAEV,OAAO,CAACU,OAAO;IACxBC,cAAc,EAAEX,OAAO,CAACiB,qBAAqB;IAC7CH,eAAe,EAAEd,OAAO,CAACc;GAC1B,CAAC,EACFhB,UAAU,CAACC,KAAK,CAAC;IACfK,GAAG,EAAEA,GAAG,CAAC,YAAY,CAAC;IACtBK,QAAQ,EAAET,OAAO,CAACS,QAAQ;IAC1BC,OAAO,EAAEV,OAAO,CAACU,OAAO;IACxBC,cAAc,EAAEX,OAAO,CAACkB,oBAAoB;IAC5CL,YAAY,EAAEb,OAAO,CAACa,YAAY;IAClCM,OAAO,EAAEnB,OAAO,CAACoB,aAAa;IAC9BN,eAAe,EAAEd,OAAO,CAACc;GAC1B,CAAC,CACH;AACH,CAAC","ignoreList":[]}
|
package/dist/esm/OtlpTracer.js
CHANGED
|
@@ -37,6 +37,9 @@ export const make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
|
|
|
37
37
|
},
|
|
38
38
|
shutdownTimeout: options.shutdownTimeout ?? Duration.seconds(3)
|
|
39
39
|
});
|
|
40
|
+
const exportFn = span => {
|
|
41
|
+
exporter.push(makeOtlpSpan(span));
|
|
42
|
+
};
|
|
40
43
|
return Tracer.make({
|
|
41
44
|
span(name, parent, context, links, startTime, kind) {
|
|
42
45
|
return makeSpan({
|
|
@@ -51,9 +54,7 @@ export const make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
|
|
|
51
54
|
links,
|
|
52
55
|
sampled: true,
|
|
53
56
|
kind,
|
|
54
|
-
export
|
|
55
|
-
exporter.push(makeOtlpSpan(span));
|
|
56
|
-
}
|
|
57
|
+
export: exportFn
|
|
57
58
|
});
|
|
58
59
|
},
|
|
59
60
|
context: options.context ? function (f, fiber) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OtlpTracer.js","names":["OtelSemConv","Cause","Duration","Effect","Layer","Option","Tracer","Exporter","entriesToAttributes","OtlpResource","make","fnUntraced","options","otelResource","fromConfig","resource","scope","name","unsafeServiceName","exporter","label","url","headers","exportInterval","seconds","maxBatchSize","body","spans","data","resourceSpans","scopeSpans","shutdownTimeout","span","parent","context","links","startTime","kind","makeSpan","status","_tag","attributes","Map","sampled","export","
|
|
1
|
+
{"version":3,"file":"OtlpTracer.js","names":["OtelSemConv","Cause","Duration","Effect","Layer","Option","Tracer","Exporter","entriesToAttributes","OtlpResource","make","fnUntraced","options","otelResource","fromConfig","resource","scope","name","unsafeServiceName","exporter","label","url","headers","exportInterval","seconds","maxBatchSize","body","spans","data","resourceSpans","scopeSpans","shutdownTimeout","exportFn","span","push","makeOtlpSpan","parent","context","links","startTime","kind","makeSpan","status","_tag","attributes","Map","sampled","export","f","fiber","currentSpan","undefined","defaultContext","layer","unwrapScoped","map","setTracer","_","SpanProto","end","endTime","exit","attribute","key","value","set","event","events","addLinks","self","Object","assign","create","isSome","traceId","generateId","spanId","len","chars","result","i","Math","floor","random","length","entries","timeUnixNano","String","droppedAttributesCount","otelStatus","constOtelStatusSuccess","isInterruptedOnly","cause","code","StatusCode","Ok","message","pretty","errors","prettyErrors","firstError","Error","stringValue","boolValue","ATTR_EXCEPTION_TYPE","ATTR_EXCEPTION_MESSAGE","ATTR_EXCEPTION_STACKTRACE","renderErrorCause","parentSpanId","SpanKind","startTimeUnixNano","endTimeUnixNano","droppedEventsCount","link","droppedLinksCount"],"sources":["../../src/OtlpTracer.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -18,17 +18,13 @@ const policy = /*#__PURE__*/Schedule.forever.pipe(Schedule.passthrough, /*#__PUR
|
|
|
18
18
|
}));
|
|
19
19
|
/** @internal */
|
|
20
20
|
export const make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
|
|
21
|
+
const clock = yield* Effect.clock;
|
|
21
22
|
const scope = yield* Effect.scope;
|
|
22
23
|
const exportInterval = Duration.decode(options.exportInterval);
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
const retryAfter = error.response.headers["retry-after"];
|
|
28
|
-
const retryAfterSeconds = retryAfter ? parseInt(retryAfter, 10) : 5;
|
|
29
|
-
return Effect.sleep(Duration.seconds(retryAfterSeconds));
|
|
30
|
-
}), HttpClient.retryTransient({
|
|
31
|
-
schedule: policy
|
|
24
|
+
let disabledUntil = undefined;
|
|
25
|
+
const client = HttpClient.filterStatusOk(yield* HttpClient.HttpClient).pipe(HttpClient.retryTransient({
|
|
26
|
+
schedule: policy,
|
|
27
|
+
times: 3
|
|
32
28
|
}));
|
|
33
29
|
let headers = Headers.unsafeFromRecord({
|
|
34
30
|
"user-agent": `effect-opentelemetry-${options.label}/0.0.0`
|
|
@@ -41,6 +37,11 @@ export const make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
|
|
|
41
37
|
});
|
|
42
38
|
let buffer = [];
|
|
43
39
|
const runExport = Effect.suspend(() => {
|
|
40
|
+
if (disabledUntil !== undefined && clock.unsafeCurrentTimeMillis() < disabledUntil) {
|
|
41
|
+
return Effect.void;
|
|
42
|
+
} else if (disabledUntil !== undefined) {
|
|
43
|
+
disabledUntil = undefined;
|
|
44
|
+
}
|
|
44
45
|
const items = buffer;
|
|
45
46
|
if (options.maxBatchSize !== "disabled") {
|
|
46
47
|
if (buffer.length === 0) {
|
|
@@ -49,20 +50,20 @@ export const make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
|
|
|
49
50
|
buffer = [];
|
|
50
51
|
}
|
|
51
52
|
return client.execute(HttpClientRequest.bodyUnsafeJson(request, options.body(items))).pipe(Effect.asVoid, Effect.withTracerEnabled(false));
|
|
52
|
-
})
|
|
53
|
+
}).pipe(Effect.catchAllCause(cause => {
|
|
54
|
+
if (disabledUntil !== undefined) return Effect.void;
|
|
55
|
+
disabledUntil = clock.unsafeCurrentTimeMillis() + Duration.toMillis("1 minute");
|
|
56
|
+
return Effect.logDebug(`Disabling ${options.label} for 60 seconds`, cause);
|
|
57
|
+
}));
|
|
53
58
|
yield* Scope.addFinalizer(scope, runExport.pipe(Effect.ignore, Effect.interruptible, Effect.timeoutOption(options.shutdownTimeout)));
|
|
54
|
-
|
|
55
|
-
yield* Effect.sleep(exportInterval).pipe(Effect.zipRight(runExport), Effect.forever, Effect.catchAllCause(cause => {
|
|
56
|
-
disabled = true;
|
|
57
|
-
return Effect.logDebug("Failed to export", cause);
|
|
58
|
-
}), Effect.annotateLogs({
|
|
59
|
+
yield* Effect.sleep(exportInterval).pipe(Effect.zipRight(runExport), Effect.forever, Effect.annotateLogs({
|
|
59
60
|
package: "@effect/opentelemetry",
|
|
60
61
|
module: options.label
|
|
61
62
|
}), Effect.forkIn(scope), Effect.interruptible);
|
|
62
63
|
const runFork = yield* FiberSet.makeRuntime().pipe(Effect.interruptible);
|
|
63
64
|
return {
|
|
64
65
|
push(data) {
|
|
65
|
-
if (
|
|
66
|
+
if (disabledUntil !== undefined) return;
|
|
66
67
|
buffer.push(data);
|
|
67
68
|
if (options.maxBatchSize !== "disabled" && buffer.length >= options.maxBatchSize) {
|
|
68
69
|
runFork(runExport);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otlpExporter.js","names":["Headers","HttpClient","HttpClientError","HttpClientRequest","Duration","Effect","FiberSet","Num","Option","Schedule","Scope","policy","forever","pipe","passthrough","addDelay","error","isHttpClientError","_tag","response","status","retryAfter","fromNullable","headers","flatMap","parse","getOrElse","seconds","make","fnUntraced","options","scope","exportInterval","decode","
|
|
1
|
+
{"version":3,"file":"otlpExporter.js","names":["Headers","HttpClient","HttpClientError","HttpClientRequest","Duration","Effect","FiberSet","Num","Option","Schedule","Scope","policy","forever","pipe","passthrough","addDelay","error","isHttpClientError","_tag","response","status","retryAfter","fromNullable","headers","flatMap","parse","getOrElse","seconds","make","fnUntraced","options","clock","scope","exportInterval","decode","disabledUntil","undefined","client","filterStatusOk","retryTransient","schedule","times","unsafeFromRecord","label","merge","fromInput","request","post","url","buffer","runExport","suspend","unsafeCurrentTimeMillis","void","items","maxBatchSize","length","execute","bodyUnsafeJson","body","asVoid","withTracerEnabled","catchAllCause","cause","toMillis","logDebug","addFinalizer","ignore","interruptible","timeoutOption","shutdownTimeout","sleep","zipRight","annotateLogs","package","module","forkIn","runFork","makeRuntime","push","data"],"sources":["../../../src/internal/otlpExporter.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.56.
|
|
3
|
+
"version": "0.56.2",
|
|
4
4
|
"description": "OpenTelemetry integration for Effect",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -19,8 +19,8 @@
|
|
|
19
19
|
"@opentelemetry/sdk-trace-web": "^2.0.0",
|
|
20
20
|
"@opentelemetry/sdk-logs": "^0.203.0",
|
|
21
21
|
"@opentelemetry/semantic-conventions": "^1.33.0",
|
|
22
|
-
"@effect/platform": "^0.90.
|
|
23
|
-
"effect": "^3.17.
|
|
22
|
+
"@effect/platform": "^0.90.2",
|
|
23
|
+
"effect": "^3.17.7"
|
|
24
24
|
},
|
|
25
25
|
"peerDependenciesMeta": {
|
|
26
26
|
"@opentelemetry/api": {
|
package/src/Otlp.ts
CHANGED
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import type * as Headers from "@effect/platform/Headers"
|
|
5
5
|
import type * as HttpClient from "@effect/platform/HttpClient"
|
|
6
|
+
import * as HttpClientRequest from "@effect/platform/HttpClientRequest"
|
|
6
7
|
import type * as Duration from "effect/Duration"
|
|
7
8
|
import * as Layer from "effect/Layer"
|
|
8
9
|
import type * as Logger from "effect/Logger"
|
|
@@ -31,11 +32,13 @@ export const layer = (options: {
|
|
|
31
32
|
readonly metricsExportInterval?: Duration.DurationInput | undefined
|
|
32
33
|
readonly tracerExportInterval?: Duration.DurationInput | undefined
|
|
33
34
|
readonly shutdownTimeout?: Duration.DurationInput | undefined
|
|
34
|
-
}): Layer.Layer<never, never, HttpClient.HttpClient> =>
|
|
35
|
-
|
|
35
|
+
}): Layer.Layer<never, never, HttpClient.HttpClient> => {
|
|
36
|
+
const baseReq = HttpClientRequest.get(options.baseUrl)
|
|
37
|
+
const url = (path: string) => HttpClientRequest.appendUrl(baseReq, path).url
|
|
38
|
+
return Layer.mergeAll(
|
|
36
39
|
OtlpLogger.layer({
|
|
37
40
|
replaceLogger: options.replaceLogger,
|
|
38
|
-
url:
|
|
41
|
+
url: url("/v1/logs"),
|
|
39
42
|
resource: options.resource,
|
|
40
43
|
headers: options.headers,
|
|
41
44
|
exportInterval: options.loggerExportInterval,
|
|
@@ -44,14 +47,14 @@ export const layer = (options: {
|
|
|
44
47
|
excludeLogSpans: options.loggerExcludeLogSpans
|
|
45
48
|
}),
|
|
46
49
|
OtlpMetrics.layer({
|
|
47
|
-
url:
|
|
50
|
+
url: url("/v1/metrics"),
|
|
48
51
|
resource: options.resource,
|
|
49
52
|
headers: options.headers,
|
|
50
53
|
exportInterval: options.metricsExportInterval,
|
|
51
54
|
shutdownTimeout: options.shutdownTimeout
|
|
52
55
|
}),
|
|
53
56
|
OtlpTracer.layer({
|
|
54
|
-
url:
|
|
57
|
+
url: url("/v1/traces"),
|
|
55
58
|
resource: options.resource,
|
|
56
59
|
headers: options.headers,
|
|
57
60
|
exportInterval: options.tracerExportInterval,
|
|
@@ -60,3 +63,4 @@ export const layer = (options: {
|
|
|
60
63
|
shutdownTimeout: options.shutdownTimeout
|
|
61
64
|
})
|
|
62
65
|
)
|
|
66
|
+
}
|
package/src/OtlpTracer.ts
CHANGED
|
@@ -68,6 +68,10 @@ export const make: (
|
|
|
68
68
|
shutdownTimeout: options.shutdownTimeout ?? Duration.seconds(3)
|
|
69
69
|
})
|
|
70
70
|
|
|
71
|
+
const exportFn = (span: SpanImpl) => {
|
|
72
|
+
exporter.push(makeOtlpSpan(span))
|
|
73
|
+
}
|
|
74
|
+
|
|
71
75
|
return Tracer.make({
|
|
72
76
|
span(name, parent, context, links, startTime, kind) {
|
|
73
77
|
return makeSpan({
|
|
@@ -82,9 +86,7 @@ export const make: (
|
|
|
82
86
|
links,
|
|
83
87
|
sampled: true,
|
|
84
88
|
kind,
|
|
85
|
-
export
|
|
86
|
-
exporter.push(makeOtlpSpan(span))
|
|
87
|
-
}
|
|
89
|
+
export: exportFn
|
|
88
90
|
})
|
|
89
91
|
},
|
|
90
92
|
context: options.context ?
|
|
@@ -44,19 +44,13 @@ export const make: (
|
|
|
44
44
|
never,
|
|
45
45
|
HttpClient.HttpClient | Scope.Scope
|
|
46
46
|
> = Effect.fnUntraced(function*(options) {
|
|
47
|
+
const clock = yield* Effect.clock
|
|
47
48
|
const scope = yield* Effect.scope
|
|
48
49
|
const exportInterval = Duration.decode(options.exportInterval)
|
|
50
|
+
let disabledUntil: number | undefined = undefined
|
|
49
51
|
|
|
50
52
|
const client = HttpClient.filterStatusOk(yield* HttpClient.HttpClient).pipe(
|
|
51
|
-
HttpClient.
|
|
52
|
-
if (error._tag !== "ResponseError" || error.response.status !== 429) {
|
|
53
|
-
return Effect.void
|
|
54
|
-
}
|
|
55
|
-
const retryAfter = error.response.headers["retry-after"]
|
|
56
|
-
const retryAfterSeconds = retryAfter ? parseInt(retryAfter, 10) : 5
|
|
57
|
-
return Effect.sleep(Duration.seconds(retryAfterSeconds))
|
|
58
|
-
}),
|
|
59
|
-
HttpClient.retryTransient({ schedule: policy })
|
|
53
|
+
HttpClient.retryTransient({ schedule: policy, times: 3 })
|
|
60
54
|
)
|
|
61
55
|
|
|
62
56
|
let headers = Headers.unsafeFromRecord({
|
|
@@ -69,6 +63,11 @@ export const make: (
|
|
|
69
63
|
const request = HttpClientRequest.post(options.url, { headers })
|
|
70
64
|
let buffer: Array<any> = []
|
|
71
65
|
const runExport = Effect.suspend(() => {
|
|
66
|
+
if (disabledUntil !== undefined && clock.unsafeCurrentTimeMillis() < disabledUntil) {
|
|
67
|
+
return Effect.void
|
|
68
|
+
} else if (disabledUntil !== undefined) {
|
|
69
|
+
disabledUntil = undefined
|
|
70
|
+
}
|
|
72
71
|
const items = buffer
|
|
73
72
|
if (options.maxBatchSize !== "disabled") {
|
|
74
73
|
if (buffer.length === 0) {
|
|
@@ -82,7 +81,13 @@ export const make: (
|
|
|
82
81
|
Effect.asVoid,
|
|
83
82
|
Effect.withTracerEnabled(false)
|
|
84
83
|
)
|
|
85
|
-
})
|
|
84
|
+
}).pipe(
|
|
85
|
+
Effect.catchAllCause((cause) => {
|
|
86
|
+
if (disabledUntil !== undefined) return Effect.void
|
|
87
|
+
disabledUntil = clock.unsafeCurrentTimeMillis() + Duration.toMillis("1 minute")
|
|
88
|
+
return Effect.logDebug(`Disabling ${options.label} for 60 seconds`, cause)
|
|
89
|
+
})
|
|
90
|
+
)
|
|
86
91
|
|
|
87
92
|
yield* Scope.addFinalizer(
|
|
88
93
|
scope,
|
|
@@ -93,15 +98,9 @@ export const make: (
|
|
|
93
98
|
)
|
|
94
99
|
)
|
|
95
100
|
|
|
96
|
-
let disabled = false
|
|
97
|
-
|
|
98
101
|
yield* Effect.sleep(exportInterval).pipe(
|
|
99
102
|
Effect.zipRight(runExport),
|
|
100
103
|
Effect.forever,
|
|
101
|
-
Effect.catchAllCause((cause) => {
|
|
102
|
-
disabled = true
|
|
103
|
-
return Effect.logDebug("Failed to export", cause)
|
|
104
|
-
}),
|
|
105
104
|
Effect.annotateLogs({
|
|
106
105
|
package: "@effect/opentelemetry",
|
|
107
106
|
module: options.label
|
|
@@ -115,7 +114,7 @@ export const make: (
|
|
|
115
114
|
)
|
|
116
115
|
return {
|
|
117
116
|
push(data) {
|
|
118
|
-
if (
|
|
117
|
+
if (disabledUntil !== undefined) return
|
|
119
118
|
buffer.push(data)
|
|
120
119
|
if (options.maxBatchSize !== "disabled" && buffer.length >= options.maxBatchSize) {
|
|
121
120
|
runFork(runExport)
|