@superblocksteam/shared 0.9121.0 → 0.9123.0
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/tracing/methodTracing.d.ts.map +1 -1
- package/dist/tracing/methodTracing.js +7 -4
- package/dist/tracing/methodTracing.js.map +1 -1
- package/dist-esm/tracing/methodTracing.d.ts.map +1 -1
- package/dist-esm/tracing/methodTracing.js +7 -4
- package/dist-esm/tracing/methodTracing.js.map +1 -1
- package/package.json +1 -1
- package/src/tracing/methodTracing.ts +7 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"methodTracing.d.ts","sourceRoot":"","sources":["../../src/tracing/methodTracing.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"methodTracing.d.ts","sourceRoot":"","sources":["../../src/tracing/methodTracing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,IAAI,EAAS,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE3E;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,GAAG,kBAAkB,CA8CrI;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAmBxH;AAiBD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,QASpF"}
|
|
@@ -15,12 +15,15 @@ function traceMethod(className, methodName, descriptor, tracer) {
|
|
|
15
15
|
descriptor.value = function (...args) {
|
|
16
16
|
// Potentially, we can pass this from tracing middleware to req and then to ActionHandler
|
|
17
17
|
const parentSpan = api_1.trace.getActiveSpan();
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
18
|
+
let ctx;
|
|
19
|
+
if (parentSpan) {
|
|
20
|
+
ctx = api_1.trace.setSpan(api_1.context.active(), parentSpan);
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
ctx = api_1.context.active();
|
|
21
24
|
}
|
|
22
25
|
// Use `startActiveSpan` to start and manage the span lifecycle
|
|
23
|
-
return api_1.context.with(
|
|
26
|
+
return api_1.context.with(ctx, () => {
|
|
24
27
|
return tracer.startActiveSpan(`${className}.${methodName}`, {}, async (span) => {
|
|
25
28
|
try {
|
|
26
29
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"methodTracing.js","sourceRoot":"","sources":["../../src/tracing/methodTracing.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"methodTracing.js","sourceRoot":"","sources":["../../src/tracing/methodTracing.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"methodTracing.d.ts","sourceRoot":"","sources":["../../src/tracing/methodTracing.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"methodTracing.d.ts","sourceRoot":"","sources":["../../src/tracing/methodTracing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,IAAI,EAAS,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE3E;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,GAAG,kBAAkB,CA8CrI;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAmBxH;AAiBD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,QASpF"}
|
|
@@ -12,12 +12,15 @@ export function traceMethod(className, methodName, descriptor, tracer) {
|
|
|
12
12
|
descriptor.value = function (...args) {
|
|
13
13
|
// Potentially, we can pass this from tracing middleware to req and then to ActionHandler
|
|
14
14
|
const parentSpan = trace.getActiveSpan();
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
let ctx;
|
|
16
|
+
if (parentSpan) {
|
|
17
|
+
ctx = trace.setSpan(context.active(), parentSpan);
|
|
18
|
+
}
|
|
19
|
+
else {
|
|
20
|
+
ctx = context.active();
|
|
18
21
|
}
|
|
19
22
|
// Use `startActiveSpan` to start and manage the span lifecycle
|
|
20
|
-
return context.with(
|
|
23
|
+
return context.with(ctx, () => {
|
|
21
24
|
return tracer.startActiveSpan(`${className}.${methodName}`, {}, async (span) => {
|
|
22
25
|
try {
|
|
23
26
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"methodTracing.js","sourceRoot":"","sources":["../../src/tracing/methodTracing.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"methodTracing.js","sourceRoot":"","sources":["../../src/tracing/methodTracing.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { context, Span, trace, Tracer } from '@opentelemetry/api';
|
|
1
|
+
import { Context, context, Span, trace, Tracer } from '@opentelemetry/api';
|
|
2
2
|
|
|
3
3
|
/**
|
|
4
4
|
* helper function to wrap a class method with tracing
|
|
@@ -14,13 +14,15 @@ export function traceMethod(className: string, methodName: string, descriptor: P
|
|
|
14
14
|
descriptor.value = function (...args: any[]) {
|
|
15
15
|
// Potentially, we can pass this from tracing middleware to req and then to ActionHandler
|
|
16
16
|
const parentSpan = trace.getActiveSpan() as Span | undefined;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
let ctx: Context;
|
|
18
|
+
if (parentSpan) {
|
|
19
|
+
ctx = trace.setSpan(context.active(), parentSpan);
|
|
20
|
+
} else {
|
|
21
|
+
ctx = context.active();
|
|
20
22
|
}
|
|
21
23
|
|
|
22
24
|
// Use `startActiveSpan` to start and manage the span lifecycle
|
|
23
|
-
return context.with(
|
|
25
|
+
return context.with(ctx, () => {
|
|
24
26
|
return tracer.startActiveSpan(`${className}.${methodName}`, {}, async (span) => {
|
|
25
27
|
try {
|
|
26
28
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|