@trunkrs/common 1.6.12 → 1.6.13

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trunkrs/common",
3
- "version": "1.6.12",
3
+ "version": "1.6.13",
4
4
  "description": "Common standards library for development in Trunkrs",
5
5
  "types": "./index.d.ts",
6
6
  "repository": "https://github.com/Trunkrs/common.git",
@@ -1,13 +1,13 @@
1
- import { Segment, Subsegment } from 'aws-xray-sdk';
1
+ import { Subsegment, SegmentLike } from 'aws-xray-sdk';
2
2
  import { MiddlewareLayer } from './handlers/HttpHandlerBuilder/types';
3
3
  declare class SegmentStack {
4
4
  private readonly stack;
5
- get current(): Segment | Subsegment | undefined;
5
+ get current(): SegmentLike | undefined;
6
6
  prepare(): void;
7
- addSegment(segment: Segment | Subsegment): void;
7
+ addSegment(name: string, parent?: SegmentLike): Subsegment;
8
8
  closeSegment(error?: unknown): void;
9
- tracePromise<TResult>(name: string, promise: Promise<TResult>, parent?: Segment | Subsegment): Promise<TResult>;
10
- traceAsyncFunction<TArgs extends any[], TResult = never>(methodName: string, fn: (...args: TArgs) => Promise<TResult>, parent?: Segment | Subsegment): (...args: TArgs) => Promise<TResult>;
9
+ tracePromise<TResult>(name: string, promise: Promise<TResult>, parent?: SegmentLike): Promise<TResult>;
10
+ traceAsyncFunction<TArgs extends any[], TResult = never>(methodName: string, fn: (...args: TArgs) => Promise<TResult>, parent?: SegmentLike): (...args: TArgs) => Promise<TResult>;
11
11
  middleWare: MiddlewareLayer;
12
12
  }
13
13
  declare const Tracing: SegmentStack;
package/utils/tracing.js CHANGED
@@ -28,31 +28,31 @@ class SegmentStack {
28
28
  console.warn(`[Tracing]: ${error.message}`);
29
29
  }
30
30
  }
31
- addSegment(segment) {
32
- this.stack.push(segment);
31
+ addSegment(name, parent) {
32
+ var _a;
33
+ const subSeg = (_a = (parent !== null && parent !== void 0 ? parent : this.current)) === null || _a === void 0 ? void 0 : _a.addNewSubsegment(name);
34
+ this.stack.push(subSeg);
35
+ return subSeg;
33
36
  }
34
37
  closeSegment(error) {
35
38
  const segment = this.stack.pop();
36
39
  segment === null || segment === void 0 ? void 0 : segment.close(error);
37
40
  }
38
41
  tracePromise(name, promise, parent) {
39
- return aws_xray_sdk_1.default.captureAsyncFunc(name, (segment) => {
40
- if (segment)
41
- this.addSegment(segment);
42
- return promise
43
- .then((result) => {
44
- this.closeSegment();
45
- return result;
46
- })
47
- .catch((error) => {
48
- this.closeSegment(error);
49
- throw error;
50
- });
51
- }, parent !== null && parent !== void 0 ? parent : this.current);
42
+ this.addSegment(name, parent);
43
+ return promise
44
+ .then((result) => {
45
+ this.closeSegment();
46
+ return result;
47
+ })
48
+ .catch((error) => {
49
+ this.closeSegment(error);
50
+ throw error;
51
+ });
52
52
  }
53
53
  traceAsyncFunction(methodName, fn, parent) {
54
54
  return (...args) => {
55
- return this.tracePromise(methodName, fn(...args), parent !== null && parent !== void 0 ? parent : this.current);
55
+ return this.tracePromise(methodName, fn(...args), parent);
56
56
  };
57
57
  }
58
58
  }
@@ -1 +1 @@
1
- {"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../utils/tracing.ts"],"names":[],"mappings":";;;;;AACA,gEAAwD;AAGxD,MAAM,YAAY;IAAlB;QACmB,UAAK,GAAgC,EAAE,CAAA;QAiEjD,eAAU,GAAoB,GAAG,EAAE;YACxC,IAAI,CAAC,OAAO,EAAE,CAAA;QAChB,CAAC,CAAA;IACH,CAAC;IAlEC,IAAW,OAAO;QAChB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACtB,OAAO,sBAAI,CAAC,UAAU,EAAE,CAAA;SACzB;QAED,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAC1C,CAAC;IAEM,OAAO;QACZ,IAAI;YACF,sBAAI,CAAC,yBAAyB,CAAC,WAAW,CAAC,CAAA;YAE3C,sBAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;YACxC,sBAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;YACzC,sBAAI,CAAC,cAAc,EAAE,CAAA;SACtB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,IAAI,CAAC,cAAe,KAAe,CAAC,OAAO,EAAE,CAAC,CAAA;SACvD;IACH,CAAC;IAEM,UAAU,CAAC,OAA6B;QAC7C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC1B,CAAC;IAEM,YAAY,CAAC,KAAe;QACjC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAA;QAChC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC,KAA0B,CAAC,CAAA;IAC5C,CAAC;IAEM,YAAY,CACjB,IAAY,EACZ,OAAyB,EACzB,MAA6B;QAE7B,OAAO,sBAAI,CAAC,gBAAgB,CAC1B,IAAI,EACJ,CAAC,OAAO,EAAE,EAAE;YACV,IAAI,OAAO;gBAAE,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;YAErC,OAAO,OAAO;iBACX,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;gBACf,IAAI,CAAC,YAAY,EAAE,CAAA;gBACnB,OAAO,MAAM,CAAA;YACf,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;gBACxB,MAAM,KAAK,CAAA;YACb,CAAC,CAAC,CAAA;QACN,CAAC,EACD,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,CAAC,OAAO,CACvB,CAAA;IACH,CAAC;IAEM,kBAAkB,CACvB,UAAkB,EAClB,EAAwC,EACxC,MAA6B;QAE7B,OAAO,CAAC,GAAG,IAAW,EAAE,EAAE;YACxB,OAAO,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,CAAC,OAAO,CAAC,CAAA;QAC3E,CAAC,CAAA;IACH,CAAC;CAKF;AAED,MAAM,OAAO,GAAG,IAAI,YAAY,EAAE,CAAA;AAElC,kBAAe,OAAO,CAAA"}
1
+ {"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../utils/tracing.ts"],"names":[],"mappings":";;;;;AACA,gEAA4D;AAG5D,MAAM,YAAY;IAAlB;QACmB,UAAK,GAAuB,EAAE,CAAA;QAgExC,eAAU,GAAoB,GAAG,EAAE;YACxC,IAAI,CAAC,OAAO,EAAE,CAAA;QAChB,CAAC,CAAA;IACH,CAAC;IAjEC,IAAW,OAAO;QAChB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YACtB,OAAO,sBAAI,CAAC,UAAU,EAAE,CAAA;SACzB;QAED,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAC1C,CAAC;IAEM,OAAO;QACZ,IAAI;YACF,sBAAI,CAAC,yBAAyB,CAAC,WAAW,CAAC,CAAA;YAE3C,sBAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;YACxC,sBAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;YACzC,sBAAI,CAAC,cAAc,EAAE,CAAA;SACtB;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,IAAI,CAAC,cAAe,KAAe,CAAC,OAAO,EAAE,CAAC,CAAA;SACvD;IACH,CAAC;IAEM,UAAU,CAAC,IAAY,EAAE,MAAoB;;QAClD,MAAM,MAAM,GAAG,MAAA,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAK,IAAI,CAAC,OAAuB,CAAC,0CAAE,gBAAgB,CACxE,IAAI,CACL,CAAA;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAEvB,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,YAAY,CAAC,KAAe;QACjC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAA;QAChC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC,KAA0B,CAAC,CAAA;IAC5C,CAAC;IAEM,YAAY,CACjB,IAAY,EACZ,OAAyB,EACzB,MAAoB;QAEpB,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAE7B,OAAO,OAAO;aACX,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;YACf,IAAI,CAAC,YAAY,EAAE,CAAA;YACnB,OAAO,MAAM,CAAA;QACf,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;YACxB,MAAM,KAAK,CAAA;QACb,CAAC,CAAC,CAAA;IACN,CAAC;IAEM,kBAAkB,CACvB,UAAkB,EAClB,EAAwC,EACxC,MAAoB;QAEpB,OAAO,CAAC,GAAG,IAAW,EAAE,EAAE;YACxB,OAAO,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,MAAM,CAAC,CAAA;QAC3D,CAAC,CAAA;IACH,CAAC;CAKF;AAED,MAAM,OAAO,GAAG,IAAI,YAAY,EAAE,CAAA;AAElC,kBAAe,OAAO,CAAA"}