@effect-app/infra 1.46.2 → 1.46.3
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/CHANGELOG.md
CHANGED
|
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.logJson = exports.jsonLogger = void 0;
|
|
7
7
|
var _effectApp = require("effect-app");
|
|
8
|
+
var _RequestContext = require("../RequestContext.cjs");
|
|
8
9
|
var _shared = require("./shared.cjs");
|
|
9
10
|
const jsonLogger = exports.jsonLogger = _effectApp.Logger.make(({
|
|
10
11
|
annotations,
|
|
@@ -23,7 +24,7 @@ const jsonLogger = exports.jsonLogger = _effectApp.Logger.make(({
|
|
|
23
24
|
level: logLevel.label,
|
|
24
25
|
fiber: _effectApp.FiberId.threadName(fiberId),
|
|
25
26
|
message,
|
|
26
|
-
request,
|
|
27
|
+
request: (0, _RequestContext.spanAttributes)(request),
|
|
27
28
|
cause: cause !== null && cause !== _effectApp.Cause.empty ? _effectApp.Cause.pretty(cause, {
|
|
28
29
|
renderErrorCause: true
|
|
29
30
|
}) : undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonLogger.cjs","names":["_effectApp","require","_shared","jsonLogger","exports","Logger","make","annotations","cause","context","fiberId","logLevel","message","spans","now","Date","nowMillis","getTime","request","getRequestContextFromFiberRefs","data","timestamp","level","label","fiber","FiberId","threadName","Cause","empty","pretty","renderErrorCause","undefined","List","map","_","timing","startTime","pipe","toArray","HashMap","size","reduce","prev","k","v","globalThis","console","log","JSON","stringify","logJson","replace","defaultLogger","withSpanAnnotations"],"sources":["../../src/logger/jsonLogger.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,
|
|
1
|
+
{"version":3,"file":"jsonLogger.cjs","names":["_effectApp","require","_RequestContext","_shared","jsonLogger","exports","Logger","make","annotations","cause","context","fiberId","logLevel","message","spans","now","Date","nowMillis","getTime","request","getRequestContextFromFiberRefs","data","timestamp","level","label","fiber","FiberId","threadName","spanAttributes","Cause","empty","pretty","renderErrorCause","undefined","List","map","_","timing","startTime","pipe","toArray","HashMap","size","reduce","prev","k","v","globalThis","console","log","JSON","stringify","logJson","replace","defaultLogger","withSpanAnnotations"],"sources":["../../src/logger/jsonLogger.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAEO,MAAMG,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAGE,iBAAM,CAACC,IAAI,CACnC,CAAC;EAAEC,WAAW;EAAEC,KAAK;EAAEC,OAAO;EAAEC,OAAO;EAAEC,QAAQ;EAAEC,OAAO;EAAEC;AAAK,CAAE,KAAI;EACrE,MAAMC,GAAG,GAAG,IAAIC,IAAI,EAAE;EACtB,MAAMC,SAAS,GAAGF,GAAG,CAACG,OAAO,EAAE;EAE/B,MAAMC,OAAO,GAAG,IAAAC,sCAA8B,EAACV,OAAO,CAAC;EAEvD,MAAMW,IAAI,GAAG;IACXC,SAAS,EAAEP,GAAG;IACdQ,KAAK,EAAEX,QAAQ,CAACY,KAAK;IACrBC,KAAK,EAAEC,kBAAO,CAACC,UAAU,CAAChB,OAAO,CAAC;IAClCE,OAAO;IACPM,OAAO,EAAE,IAAAS,8BAAc,EAACT,OAAO,CAAC;IAChCV,KAAK,EAAEA,KAAK,KAAK,IAAI,IAAIA,KAAK,KAAKoB,gBAAK,CAACC,KAAK,GAAGD,gBAAK,CAACE,MAAM,CAACtB,KAAK,EAAE;MAAEuB,gBAAgB,EAAE;IAAI,CAAE,CAAC,GAAGC,SAAS;IAC5GnB,KAAK,EAAEoB,eAAI,CAACC,GAAG,CAACrB,KAAK,EAAGsB,CAAC,KAAM;MAAEZ,KAAK,EAAEY,CAAC,CAACZ,KAAK;MAAEa,MAAM,EAAEpB,SAAS,GAAGmB,CAAC,CAACE;IAAS,CAAE,CAAC,CAAC,CAACC,IAAI,CAACL,eAAI,CAACM,OAAO,CAAC;IACvGhC,WAAW,EAAEiC,kBAAO,CAACC,IAAI,CAAClC,WAAW,CAAC,GAAG,CAAC,GACtC,CAAC,GAAGA,WAAW,CAAC,CAACmC,MAAM,CAAC,CAACC,IAAI,EAAE,CAACC,CAAC,EAAEC,CAAC,CAAC,KAAI;MACzCF,IAAI,CAACC,CAAC,CAAC,GAAGC,CAAC;MACX,OAAOF,IAAI;IACb,CAAC,EAAE,EAA6B,CAAC,GAC/BX;GACL;EAEDc,UAAU,CAACC,OAAO,CAACC,GAAG,CAACC,IAAI,CAACC,SAAS,CAAC9B,IAAI,CAAC,CAAC;AAC9C,CAAC,CACF;AAEM,MAAM+B,OAAO,GAAA/C,OAAA,CAAA+C,OAAA,GAAG9C,iBAAM,CAAC+C,OAAO,CAAC/C,iBAAM,CAACgD,aAAa,EAAEhD,iBAAM,CAACiD,mBAAmB,CAACnD,UAAU,CAAC,CAAC","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonLogger.d.ts","sourceRoot":"","sources":["../../src/logger/jsonLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,MAAM,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"jsonLogger.d.ts","sourceRoot":"","sources":["../../src/logger/jsonLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiC,MAAM,EAAE,MAAM,YAAY,CAAA;AAIlE,eAAO,MAAM,UAAU,8BAyBtB,CAAA;AAED,eAAO,MAAM,OAAO,mDAA+E,CAAA"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Cause, FiberId, HashMap, List, Logger } from "effect-app";
|
|
2
|
+
import { spanAttributes } from "../RequestContext.js";
|
|
2
3
|
import { getRequestContextFromFiberRefs } from "./shared.js";
|
|
3
4
|
export const jsonLogger = Logger.make(({ annotations, cause, context, fiberId, logLevel, message, spans }) => {
|
|
4
5
|
const now = new Date();
|
|
@@ -9,7 +10,7 @@ export const jsonLogger = Logger.make(({ annotations, cause, context, fiberId, l
|
|
|
9
10
|
level: logLevel.label,
|
|
10
11
|
fiber: FiberId.threadName(fiberId),
|
|
11
12
|
message,
|
|
12
|
-
request,
|
|
13
|
+
request: spanAttributes(request),
|
|
13
14
|
cause: cause !== null && cause !== Cause.empty ? Cause.pretty(cause, { renderErrorCause: true }) : undefined,
|
|
14
15
|
spans: List.map(spans, (_) => ({ label: _.label, timing: nowMillis - _.startTime })).pipe(List.toArray),
|
|
15
16
|
annotations: HashMap.size(annotations) > 0
|
|
@@ -22,4 +23,4 @@ export const jsonLogger = Logger.make(({ annotations, cause, context, fiberId, l
|
|
|
22
23
|
globalThis.console.log(JSON.stringify(data));
|
|
23
24
|
});
|
|
24
25
|
export const logJson = Logger.replace(Logger.defaultLogger, Logger.withSpanAnnotations(jsonLogger));
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoianNvbkxvZ2dlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9sb2dnZXIvanNvbkxvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUNsRSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDckQsT0FBTyxFQUFFLDhCQUE4QixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBRTVELE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUNuQyxDQUFDLEVBQUUsV0FBVyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRTtJQUNyRSxNQUFNLEdBQUcsR0FBRyxJQUFJLElBQUksRUFBRSxDQUFBO0lBQ3RCLE1BQU0sU0FBUyxHQUFHLEdBQUcsQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUUvQixNQUFNLE9BQU8sR0FBRyw4QkFBOEIsQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUV2RCxNQUFNLElBQUksR0FBRztRQUNYLFNBQVMsRUFBRSxHQUFHO1FBQ2QsS0FBSyxFQUFFLFFBQVEsQ0FBQyxLQUFLO1FBQ3JCLEtBQUssRUFBRSxPQUFPLENBQUMsVUFBVSxDQUFDLE9BQU8sQ0FBQztRQUNsQyxPQUFPO1FBQ1AsT0FBTyxFQUFFLGNBQWMsQ0FBQyxPQUFPLENBQUM7UUFDaEMsS0FBSyxFQUFFLEtBQUssS0FBSyxJQUFJLElBQUksS0FBSyxLQUFLLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLEVBQUUsZ0JBQWdCLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUztRQUM1RyxLQUFLLEVBQUUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsU0FBUyxHQUFHLENBQUMsQ0FBQyxTQUFTLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7UUFDdkcsV0FBVyxFQUFFLE9BQU8sQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQztZQUN4QyxDQUFDLENBQUMsQ0FBQyxHQUFHLFdBQVcsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFO2dCQUN6QyxJQUFJLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFBO2dCQUNYLE9BQU8sSUFBSSxDQUFBO1lBQ2IsQ0FBQyxFQUFFLEVBQTZCLENBQUM7WUFDakMsQ0FBQyxDQUFDLFNBQVM7S0FDZCxDQUFBO0lBRUQsVUFBVSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO0FBQzlDLENBQUMsQ0FDRixDQUFBO0FBRUQsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLGFBQWEsRUFBRSxNQUFNLENBQUMsbUJBQW1CLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQSJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "1.46.
|
|
3
|
+
"version": "1.46.3",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -21,9 +21,9 @@
|
|
|
21
21
|
"pure-rand": "6.1.0",
|
|
22
22
|
"redlock": "^4.2.0",
|
|
23
23
|
"@effect-app/core": "1.17.1",
|
|
24
|
-
"effect-app": "1.30.5",
|
|
25
24
|
"@effect-app/infra-adapters": "1.21.0",
|
|
26
|
-
"@effect-app/schema": "1.19.1"
|
|
25
|
+
"@effect-app/schema": "1.19.1",
|
|
26
|
+
"effect-app": "1.30.5"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@babel/cli": "^7.25.7",
|
package/src/logger/jsonLogger.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Cause, FiberId, HashMap, List, Logger } from "effect-app"
|
|
2
|
+
import { spanAttributes } from "../RequestContext.js"
|
|
2
3
|
import { getRequestContextFromFiberRefs } from "./shared.js"
|
|
3
4
|
|
|
4
5
|
export const jsonLogger = Logger.make<unknown, void>(
|
|
@@ -13,7 +14,7 @@ export const jsonLogger = Logger.make<unknown, void>(
|
|
|
13
14
|
level: logLevel.label,
|
|
14
15
|
fiber: FiberId.threadName(fiberId),
|
|
15
16
|
message,
|
|
16
|
-
request,
|
|
17
|
+
request: spanAttributes(request),
|
|
17
18
|
cause: cause !== null && cause !== Cause.empty ? Cause.pretty(cause, { renderErrorCause: true }) : undefined,
|
|
18
19
|
spans: List.map(spans, (_) => ({ label: _.label, timing: nowMillis - _.startTime })).pipe(List.toArray),
|
|
19
20
|
annotations: HashMap.size(annotations) > 0
|