@xeonr/upload-pool-sdk 1.4.0 → 1.4.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/job-context.d.ts.map +1 -1
- package/dist/job-context.js +6 -8
- package/dist/job-context.js.map +1 -1
- package/dist/pool.d.ts.map +1 -1
- package/dist/pool.js +23 -6
- package/dist/pool.js.map +1 -1
- package/dist/rpc-clients.d.ts.map +1 -1
- package/dist/rpc-clients.js +6 -23
- package/dist/rpc-clients.js.map +1 -1
- package/dist/tracing.d.ts +30 -9
- package/dist/tracing.d.ts.map +1 -1
- package/dist/tracing.js +44 -23
- package/dist/tracing.js.map +1 -1
- package/package.json +1 -1
- package/src/job-context.ts +7 -9
- package/src/pool.ts +26 -8
- package/src/rpc-clients.ts +6 -24
- package/src/tracing.ts +51 -29
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-context.d.ts","sourceRoot":"","sources":["../src/job-context.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAO1C,OAAO,KAAK,EACX,aAAa,EACb,UAAU,EAKV,MAAM,YAAY,CAAC;AAYpB,MAAM,WAAW,WAAW;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE;QACnB,GAAG,EAAE,MAAM,CAAC;QACZ,aAAa,EAAE,MAAM,CAAC;QACtB,MAAM,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB;
|
|
1
|
+
{"version":3,"file":"job-context.d.ts","sourceRoot":"","sources":["../src/job-context.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAO1C,OAAO,KAAK,EACX,aAAa,EACb,UAAU,EAKV,MAAM,YAAY,CAAC;AAYpB,MAAM,WAAW,WAAW;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE;QACnB,GAAG,EAAE,MAAM,CAAC;QACZ,aAAa,EAAE,MAAM,CAAC;QACtB,MAAM,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB;AAgDD,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,gBAAgB,CAC/B,QAAQ,EAAE,WAAW,EACrB,GAAG,EAAE,UAAU,EACf,MAAM,EAAE,MAAM,EACd,IAAI,GAAE,oBAAyB,GAC7B,UAAU,CA6SZ"}
|
package/dist/job-context.js
CHANGED
|
@@ -29,19 +29,17 @@ const META_TYPE_MAP = {
|
|
|
29
29
|
* No-op when tracing is uninitialised (e.g. in tests): the inner fn runs
|
|
30
30
|
* directly and we lose the span, no exception.
|
|
31
31
|
*/
|
|
32
|
-
function withCtxSpan(name,
|
|
32
|
+
function withCtxSpan(name, _envelope, _workerId, fn, attrs) {
|
|
33
33
|
const handle = getTracingHandle();
|
|
34
34
|
if (!handle) {
|
|
35
35
|
return fn();
|
|
36
36
|
}
|
|
37
37
|
return handle.tracer.startActiveSpan(name, async (span) => {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
workerId,
|
|
44
|
-
});
|
|
38
|
+
// Job-scoped attrs (runId, jobId, ...) pulled from the active
|
|
39
|
+
// OTel context — set once by Pool.handleDispatch via
|
|
40
|
+
// withJobContext. The receiver requires pipeline.run_id or the
|
|
41
|
+
// span is dropped, so this stamp is load-bearing.
|
|
42
|
+
stampJobAttributes(span);
|
|
45
43
|
if (attrs) {
|
|
46
44
|
for (const [k, v] of Object.entries(attrs)) {
|
|
47
45
|
span.setAttribute(k, v);
|
package/dist/job-context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-context.js","sourceRoot":"","sources":["../src/job-context.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"job-context.js","sourceRoot":"","sources":["../src/job-context.ts"],"names":[],"mappings":"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"}
|
package/dist/pool.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAGX,UAAU,EACV,MAAM,YAAY,CAAC;AAEpB,qBAAa,IAAI;IAChB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAa;IACpC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAa;IACjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAY;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IACxC,OAAO,CAAC,QAAQ,CAAK;IACrB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAW;IACxC,OAAO,CAAC,cAAc,CAA8B;IACpD,OAAO,CAAC,cAAc,CAA6B;IACnD,OAAO,CAAC,iBAAiB,CAA+B;gBAE5C,MAAM,EAAE,UAAU;IA0D9B;;;;;;;;;;;;;;;;;;OAkBG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAiBb,cAAc;IAkK5B,OAAO,CAAC,cAAc;YAIR,WAAW;CAwBzB"}
|
package/dist/pool.js
CHANGED
|
@@ -19,7 +19,7 @@ import { SseClient } from "./sse-client.js";
|
|
|
19
19
|
import { createJobContext } from "./job-context.js";
|
|
20
20
|
import { NonRetryableError } from "./errors.js";
|
|
21
21
|
import { JsonLogger } from "./logger.js";
|
|
22
|
-
import { initTracing, shutdownTracing, recordSpanError, stampJobAttributes, } from "./tracing.js";
|
|
22
|
+
import { JOB_ATTRS_KEY, initTracing, shutdownTracing, recordSpanError, stampJobAttributes, } from "./tracing.js";
|
|
23
23
|
export class Pool {
|
|
24
24
|
config;
|
|
25
25
|
rpc;
|
|
@@ -156,10 +156,27 @@ export class Pool {
|
|
|
156
156
|
this.inFlight++;
|
|
157
157
|
// Root the entire job under iq.job, parented to the dispatching
|
|
158
158
|
// activity's span via the traceparent the pipeline-worker stamped
|
|
159
|
-
// onto the envelope.
|
|
160
|
-
//
|
|
161
|
-
//
|
|
162
|
-
|
|
159
|
+
// onto the envelope. We also carry the job's identifiers in the
|
|
160
|
+
// SAME Context value so child spans (interceptors, ctx.* spans)
|
|
161
|
+
// can pull `pipeline.run_id` etc. without a closure / arg.
|
|
162
|
+
//
|
|
163
|
+
// IMPORTANT: passing a `parentCtx` to startActiveSpan replaces
|
|
164
|
+
// the active context for the span's body — anything we want
|
|
165
|
+
// child sites to see has to be on THIS context, not on
|
|
166
|
+
// `context.active()` from the outer scope. (That's the bug from
|
|
167
|
+
// 1.4.1: withJobContext() ran on the outer scope, but
|
|
168
|
+
// startActiveSpan(_, _, parentCtx, fn) ignored that and used
|
|
169
|
+
// parentCtx directly. Merging both into one context here.)
|
|
170
|
+
const jobAttrs = {
|
|
171
|
+
runId: envelope.wfRunId ?? "",
|
|
172
|
+
jobId: envelope.jobId,
|
|
173
|
+
uploadId: envelope.uploadId,
|
|
174
|
+
urn: envelope.contentTypeContext.urn,
|
|
175
|
+
workerId: this.workerId,
|
|
176
|
+
};
|
|
177
|
+
const parentCtx = this.tracing
|
|
178
|
+
.contextFromEnvelope(envelope.traceContext ?? "", envelope.wfRunId ?? "")
|
|
179
|
+
.setValue(JOB_ATTRS_KEY, jobAttrs);
|
|
163
180
|
await this.tracing.tracer.startActiveSpan("iq.job", {
|
|
164
181
|
attributes: {
|
|
165
182
|
"iq.filename": envelope.filename,
|
|
@@ -271,5 +288,5 @@ export class Pool {
|
|
|
271
288
|
}
|
|
272
289
|
}
|
|
273
290
|
}
|
|
274
|
-
const SDK_VERSION = "1.
|
|
291
|
+
const SDK_VERSION = "1.4.2";
|
|
275
292
|
//# sourceMappingURL=pool.js.map
|
package/dist/pool.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-clients.d.ts","sourceRoot":"","sources":["../src/rpc-clients.ts"],"names":[],"mappings":"AA+BA,OAAO,EAEN,KAAK,MAAM,EAIX,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,sDAAsD,CAAC;AAC/F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"rpc-clients.d.ts","sourceRoot":"","sources":["../src/rpc-clients.ts"],"names":[],"mappings":"AA+BA,OAAO,EAEN,KAAK,MAAM,EAIX,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,sDAAsD,CAAC;AAC/F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAU1C,MAAM,WAAW,UAAU;IAC1B,eAAe,EAAE,MAAM,CAAC,OAAO,sBAAsB,CAAC,CAAC;IACvD,gBAAgB,EAAE,MAAM,CAAC,OAAO,uBAAuB,CAAC,CAAC;CACzD;AA8HD,MAAM,WAAW,gBAAgB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;CACf;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,UAAU,CAiBrE"}
|
package/dist/rpc-clients.js
CHANGED
|
@@ -33,7 +33,7 @@ import { createClient, ConnectError, Code, } from "@connectrpc/connect";
|
|
|
33
33
|
import { context as otelContext, SpanStatusCode, trace, } from "@opentelemetry/api";
|
|
34
34
|
import { InternalUploadsService } from "./protocol/uplim/api/v1/uploads_pb.js";
|
|
35
35
|
import { IntegrationQueueService } from "./protocol/uplim/workflow/v1/integration_queue_pb.js";
|
|
36
|
-
import { SPAN_ATTR, getTracingHandle, recordSpanError, sanitizeRpcBody, spanContextToTraceparent, } from "./tracing.js";
|
|
36
|
+
import { SPAN_ATTR, getTracingHandle, recordSpanError, sanitizeRpcBody, spanContextToTraceparent, stampJobAttributes, } from "./tracing.js";
|
|
37
37
|
function tracingLoggingInterceptor(logger, target) {
|
|
38
38
|
return (next) => async (req) => {
|
|
39
39
|
const handle = getTracingHandle();
|
|
@@ -81,28 +81,11 @@ function tracingLoggingInterceptor(logger, target) {
|
|
|
81
81
|
span.setAttribute(SPAN_ATTR.RPC_METHOD, method);
|
|
82
82
|
span.setAttribute(SPAN_ATTR.RPC_SERVICE, req.service.typeName);
|
|
83
83
|
span.setAttribute(SPAN_ATTR.RPC_TARGET, target);
|
|
84
|
-
//
|
|
85
|
-
//
|
|
86
|
-
//
|
|
87
|
-
// the
|
|
88
|
-
|
|
89
|
-
// custom OTel context manager.
|
|
90
|
-
const parent = trace.getActiveSpan();
|
|
91
|
-
const parentAttrs = parent?.attributes;
|
|
92
|
-
if (parentAttrs) {
|
|
93
|
-
for (const key of [
|
|
94
|
-
SPAN_ATTR.RUN_ID,
|
|
95
|
-
SPAN_ATTR.JOB_ID,
|
|
96
|
-
SPAN_ATTR.UPLOAD_ID,
|
|
97
|
-
SPAN_ATTR.URN,
|
|
98
|
-
SPAN_ATTR.WORKER_ID,
|
|
99
|
-
]) {
|
|
100
|
-
const v = parentAttrs[key];
|
|
101
|
-
if (typeof v === "string" && v.length > 0) {
|
|
102
|
-
span.setAttribute(key, v);
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
}
|
|
84
|
+
// Job-scoped attrs (runId, jobId, ...) pulled from the
|
|
85
|
+
// active OTel context — set once by Pool.handleDispatch
|
|
86
|
+
// via withJobContext. The receiver requires pipeline.run_id
|
|
87
|
+
// or the span is dropped, so this stamp is load-bearing.
|
|
88
|
+
stampJobAttributes(span);
|
|
106
89
|
// Body capture: request first, response on success, error
|
|
107
90
|
// payload on failure. Sanitiser truncates to 4 KB and redacts
|
|
108
91
|
// token-shaped keys (see tracing.ts).
|
package/dist/rpc-clients.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-clients.js","sourceRoot":"","sources":["../src/rpc-clients.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EACN,YAAY,EAGZ,YAAY,EACZ,IAAI,GACJ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACN,OAAO,IAAI,WAAW,EACtB,cAAc,EACd,KAAK,GACL,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,sDAAsD,CAAC;AAE/F,OAAO,EACN,SAAS,EACT,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,wBAAwB,
|
|
1
|
+
{"version":3,"file":"rpc-clients.js","sourceRoot":"","sources":["../src/rpc-clients.ts"],"names":[],"mappings":"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"}
|
package/dist/tracing.d.ts
CHANGED
|
@@ -28,6 +28,28 @@
|
|
|
28
28
|
* to MAX_BODY_EVENT_BYTES.
|
|
29
29
|
*/
|
|
30
30
|
import { type Context, type Span, type SpanContext, type Tracer, SpanKind, SpanStatusCode } from "@opentelemetry/api";
|
|
31
|
+
/**
|
|
32
|
+
* OTel context key carrying per-job attributes. Set once at the top of
|
|
33
|
+
* Pool.handleDispatch via `withJobContext()` and read by helpers that
|
|
34
|
+
* create child spans (interceptors, ctx.* spans) so every emitted span
|
|
35
|
+
* carries `pipeline.run_id` + identifiers — without it the trace-store
|
|
36
|
+
* receiver drops the span as orphan.
|
|
37
|
+
*
|
|
38
|
+
* The OTel `Span` API surface deliberately doesn't expose attributes
|
|
39
|
+
* back to read sites (only set/record/event), so we can't inherit them
|
|
40
|
+
* from a parent span at child-creation time. Carrying them in the
|
|
41
|
+
* Context object is the canonical OTel pattern.
|
|
42
|
+
*/
|
|
43
|
+
export declare const JOB_ATTRS_KEY: symbol;
|
|
44
|
+
export interface JobAttrs {
|
|
45
|
+
runId: string;
|
|
46
|
+
jobId: string;
|
|
47
|
+
uploadId: string;
|
|
48
|
+
urn: string;
|
|
49
|
+
workerId: string;
|
|
50
|
+
}
|
|
51
|
+
export declare function getJobAttrs(): JobAttrs | undefined;
|
|
52
|
+
export declare function withJobContext<T>(attrs: JobAttrs, fn: () => T): T;
|
|
31
53
|
export declare const SPAN_ATTR: {
|
|
32
54
|
readonly JOB_ID: "iq.job_id";
|
|
33
55
|
readonly UPLOAD_ID: "iq.upload_id";
|
|
@@ -92,16 +114,15 @@ export declare function sanitizeRpcBody(value: unknown): string;
|
|
|
92
114
|
/**
|
|
93
115
|
* Set common job-scoped attributes on a span. Called by every site that
|
|
94
116
|
* creates a per-job span so RUN_ID / JOB_ID / UPLOAD_ID / URN are
|
|
95
|
-
* consistently present (the
|
|
96
|
-
* span into the right workflow run).
|
|
117
|
+
* consistently present (the trace-store receiver requires
|
|
118
|
+
* `pipeline.run_id` to route the span into the right workflow run).
|
|
119
|
+
*
|
|
120
|
+
* Pulls the attribute values from the active OTel context if not
|
|
121
|
+
* passed explicitly, so RPC / ctx.* spans created mid-handler inherit
|
|
122
|
+
* them without needing to know about the envelope. The Pool root sets
|
|
123
|
+
* the context via `withJobContext` at the start of handleDispatch.
|
|
97
124
|
*/
|
|
98
|
-
export declare function stampJobAttributes(span: Span, attrs:
|
|
99
|
-
runId: string;
|
|
100
|
-
jobId: string;
|
|
101
|
-
uploadId?: string;
|
|
102
|
-
urn?: string;
|
|
103
|
-
workerId?: string;
|
|
104
|
-
}): void;
|
|
125
|
+
export declare function stampJobAttributes(span: Span, attrs?: Partial<JobAttrs>): void;
|
|
105
126
|
export declare function recordSpanError(span: Span, err: unknown): void;
|
|
106
127
|
export { SpanKind, SpanStatusCode };
|
|
107
128
|
//# sourceMappingURL=tracing.d.ts.map
|
package/dist/tracing.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../src/tracing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,OAAO,
|
|
1
|
+
{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../src/tracing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,OAAO,EAIN,KAAK,OAAO,EACZ,KAAK,IAAI,EACT,KAAK,WAAW,EAChB,KAAK,MAAM,EAEX,QAAQ,EACR,cAAc,EACd,MAAM,oBAAoB,CAAC;AAc5B;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,aAAa,QAAsC,CAAC;AAEjE,MAAM,WAAW,QAAQ;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,WAAW,IAAI,QAAQ,GAAG,SAAS,CAElD;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAEjE;AAED,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;CAoBZ,CAAC;AAEX,MAAM,WAAW,iBAAiB;IACjC,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B;;;;OAIG;IACH,mBAAmB,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC;CACrE;AAID,wBAAgB,WAAW,CAAC,GAAG,EAAE,iBAAiB,GAAG,aAAa,CA+EjE;AAED,wBAAgB,gBAAgB,IAAI,aAAa,GAAG,IAAI,CAEvD;AAED,wBAAsB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAKrD;AAID;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAgBlE;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,WAAW,GAAG,MAAM,CAGhE;AASD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAWtD;AAiCD;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CACjC,IAAI,EAAE,IAAI,EACV,KAAK,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,GACvB,IAAI,CAYN;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,GAAG,IAAI,CAO9D;AAED,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC"}
|
package/dist/tracing.js
CHANGED
|
@@ -27,12 +27,31 @@
|
|
|
27
27
|
* |api[_-]?key|signature|sig|cookie)/i are redacted; payloads truncated
|
|
28
28
|
* to MAX_BODY_EVENT_BYTES.
|
|
29
29
|
*/
|
|
30
|
-
import { context, trace, SpanKind, SpanStatusCode, } from "@opentelemetry/api";
|
|
30
|
+
import { context, createContextKey, trace, SpanKind, SpanStatusCode, } from "@opentelemetry/api";
|
|
31
31
|
import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
|
|
32
32
|
import { Resource } from "@opentelemetry/resources";
|
|
33
33
|
import { BatchSpanProcessor, BasicTracerProvider, } from "@opentelemetry/sdk-trace-base";
|
|
34
34
|
import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION, } from "@opentelemetry/semantic-conventions";
|
|
35
35
|
const TRACER_NAME = "@xeonr/upload-pool-sdk";
|
|
36
|
+
/**
|
|
37
|
+
* OTel context key carrying per-job attributes. Set once at the top of
|
|
38
|
+
* Pool.handleDispatch via `withJobContext()` and read by helpers that
|
|
39
|
+
* create child spans (interceptors, ctx.* spans) so every emitted span
|
|
40
|
+
* carries `pipeline.run_id` + identifiers — without it the trace-store
|
|
41
|
+
* receiver drops the span as orphan.
|
|
42
|
+
*
|
|
43
|
+
* The OTel `Span` API surface deliberately doesn't expose attributes
|
|
44
|
+
* back to read sites (only set/record/event), so we can't inherit them
|
|
45
|
+
* from a parent span at child-creation time. Carrying them in the
|
|
46
|
+
* Context object is the canonical OTel pattern.
|
|
47
|
+
*/
|
|
48
|
+
export const JOB_ATTRS_KEY = createContextKey("uplim.job_attrs");
|
|
49
|
+
export function getJobAttrs() {
|
|
50
|
+
return context.active().getValue(JOB_ATTRS_KEY);
|
|
51
|
+
}
|
|
52
|
+
export function withJobContext(attrs, fn) {
|
|
53
|
+
return context.with(context.active().setValue(JOB_ATTRS_KEY, attrs), fn);
|
|
54
|
+
}
|
|
36
55
|
export const SPAN_ATTR = {
|
|
37
56
|
JOB_ID: "iq.job_id",
|
|
38
57
|
UPLOAD_ID: "iq.upload_id",
|
|
@@ -113,10 +132,7 @@ export function initTracing(cfg) {
|
|
|
113
132
|
},
|
|
114
133
|
contextFromEnvelope: (traceparent, runId) => {
|
|
115
134
|
let ctx = context.active();
|
|
116
|
-
|
|
117
|
-
// runId attribute via baggage-like behaviour. We stamp it on
|
|
118
|
-
// each span at creation site instead of relying on baggage
|
|
119
|
-
// because the trace store reads it from span attributes.
|
|
135
|
+
void runId; // surfaced via withJobContext()
|
|
120
136
|
if (!traceparent) {
|
|
121
137
|
return ctx;
|
|
122
138
|
}
|
|
@@ -125,11 +141,6 @@ export function initTracing(cfg) {
|
|
|
125
141
|
return ctx;
|
|
126
142
|
}
|
|
127
143
|
ctx = trace.setSpanContext(ctx, parsed);
|
|
128
|
-
// runId is consumed by the caller and stamped explicitly on
|
|
129
|
-
// each span via stampJobAttributes(); we don't store it in
|
|
130
|
-
// the OTel context because there's no cross-span attribute
|
|
131
|
-
// mechanism in OTel without using a custom propagator.
|
|
132
|
-
void runId;
|
|
133
144
|
return ctx;
|
|
134
145
|
},
|
|
135
146
|
};
|
|
@@ -241,21 +252,31 @@ function redactDeep(value, depth) {
|
|
|
241
252
|
/**
|
|
242
253
|
* Set common job-scoped attributes on a span. Called by every site that
|
|
243
254
|
* creates a per-job span so RUN_ID / JOB_ID / UPLOAD_ID / URN are
|
|
244
|
-
* consistently present (the
|
|
245
|
-
* span into the right workflow run).
|
|
255
|
+
* consistently present (the trace-store receiver requires
|
|
256
|
+
* `pipeline.run_id` to route the span into the right workflow run).
|
|
257
|
+
*
|
|
258
|
+
* Pulls the attribute values from the active OTel context if not
|
|
259
|
+
* passed explicitly, so RPC / ctx.* spans created mid-handler inherit
|
|
260
|
+
* them without needing to know about the envelope. The Pool root sets
|
|
261
|
+
* the context via `withJobContext` at the start of handleDispatch.
|
|
246
262
|
*/
|
|
247
263
|
export function stampJobAttributes(span, attrs) {
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
if (
|
|
257
|
-
span.setAttribute(SPAN_ATTR.
|
|
258
|
-
|
|
264
|
+
const fromCtx = getJobAttrs();
|
|
265
|
+
const runId = attrs?.runId ?? fromCtx?.runId ?? "";
|
|
266
|
+
const jobId = attrs?.jobId ?? fromCtx?.jobId ?? "";
|
|
267
|
+
const uploadId = attrs?.uploadId ?? fromCtx?.uploadId;
|
|
268
|
+
const urn = attrs?.urn ?? fromCtx?.urn;
|
|
269
|
+
const workerId = attrs?.workerId ?? fromCtx?.workerId;
|
|
270
|
+
if (runId)
|
|
271
|
+
span.setAttribute(SPAN_ATTR.RUN_ID, runId);
|
|
272
|
+
if (jobId)
|
|
273
|
+
span.setAttribute(SPAN_ATTR.JOB_ID, jobId);
|
|
274
|
+
if (uploadId)
|
|
275
|
+
span.setAttribute(SPAN_ATTR.UPLOAD_ID, uploadId);
|
|
276
|
+
if (urn)
|
|
277
|
+
span.setAttribute(SPAN_ATTR.URN, urn);
|
|
278
|
+
if (workerId)
|
|
279
|
+
span.setAttribute(SPAN_ATTR.WORKER_ID, workerId);
|
|
259
280
|
}
|
|
260
281
|
export function recordSpanError(span, err) {
|
|
261
282
|
if (err instanceof Error) {
|
package/dist/tracing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../src/tracing.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../src/tracing.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xeonr/upload-pool-sdk",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.2",
|
|
4
4
|
"description": "Self-hosted worker SDK for the upl.im content type pipeline. Implement a handler per content type URN; the SDK handles SSE connection, job acceptance, presigned thumbnail upload, and metadata callbacks.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
package/src/job-context.ts
CHANGED
|
@@ -85,8 +85,8 @@ export interface JobEnvelope {
|
|
|
85
85
|
*/
|
|
86
86
|
function withCtxSpan<T>(
|
|
87
87
|
name: string,
|
|
88
|
-
|
|
89
|
-
|
|
88
|
+
_envelope: JobEnvelope,
|
|
89
|
+
_workerId: string | undefined,
|
|
90
90
|
fn: () => Promise<T>,
|
|
91
91
|
attrs?: Record<string, string | number | boolean>,
|
|
92
92
|
): Promise<T> {
|
|
@@ -95,13 +95,11 @@ function withCtxSpan<T>(
|
|
|
95
95
|
return fn();
|
|
96
96
|
}
|
|
97
97
|
return handle.tracer.startActiveSpan(name, async (span) => {
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
workerId,
|
|
104
|
-
});
|
|
98
|
+
// Job-scoped attrs (runId, jobId, ...) pulled from the active
|
|
99
|
+
// OTel context — set once by Pool.handleDispatch via
|
|
100
|
+
// withJobContext. The receiver requires pipeline.run_id or the
|
|
101
|
+
// span is dropped, so this stamp is load-bearing.
|
|
102
|
+
stampJobAttributes(span);
|
|
105
103
|
if (attrs) {
|
|
106
104
|
for (const [k, v] of Object.entries(attrs)) {
|
|
107
105
|
span.setAttribute(k, v);
|
package/src/pool.ts
CHANGED
|
@@ -24,6 +24,7 @@ import { createJobContext, type JobEnvelope } from "./job-context.js";
|
|
|
24
24
|
import { NonRetryableError } from "./errors.js";
|
|
25
25
|
import { JsonLogger, type Logger } from "./logger.js";
|
|
26
26
|
import {
|
|
27
|
+
JOB_ATTRS_KEY,
|
|
27
28
|
initTracing,
|
|
28
29
|
shutdownTracing,
|
|
29
30
|
recordSpanError,
|
|
@@ -182,13 +183,30 @@ export class Pool {
|
|
|
182
183
|
|
|
183
184
|
// Root the entire job under iq.job, parented to the dispatching
|
|
184
185
|
// activity's span via the traceparent the pipeline-worker stamped
|
|
185
|
-
// onto the envelope.
|
|
186
|
-
//
|
|
187
|
-
//
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
186
|
+
// onto the envelope. We also carry the job's identifiers in the
|
|
187
|
+
// SAME Context value so child spans (interceptors, ctx.* spans)
|
|
188
|
+
// can pull `pipeline.run_id` etc. without a closure / arg.
|
|
189
|
+
//
|
|
190
|
+
// IMPORTANT: passing a `parentCtx` to startActiveSpan replaces
|
|
191
|
+
// the active context for the span's body — anything we want
|
|
192
|
+
// child sites to see has to be on THIS context, not on
|
|
193
|
+
// `context.active()` from the outer scope. (That's the bug from
|
|
194
|
+
// 1.4.1: withJobContext() ran on the outer scope, but
|
|
195
|
+
// startActiveSpan(_, _, parentCtx, fn) ignored that and used
|
|
196
|
+
// parentCtx directly. Merging both into one context here.)
|
|
197
|
+
const jobAttrs = {
|
|
198
|
+
runId: envelope.wfRunId ?? "",
|
|
199
|
+
jobId: envelope.jobId,
|
|
200
|
+
uploadId: envelope.uploadId,
|
|
201
|
+
urn: envelope.contentTypeContext.urn,
|
|
202
|
+
workerId: this.workerId,
|
|
203
|
+
};
|
|
204
|
+
const parentCtx = this.tracing
|
|
205
|
+
.contextFromEnvelope(
|
|
206
|
+
envelope.traceContext ?? "",
|
|
207
|
+
envelope.wfRunId ?? "",
|
|
208
|
+
)
|
|
209
|
+
.setValue(JOB_ATTRS_KEY, jobAttrs);
|
|
192
210
|
|
|
193
211
|
await this.tracing.tracer.startActiveSpan(
|
|
194
212
|
"iq.job",
|
|
@@ -336,4 +354,4 @@ export class Pool {
|
|
|
336
354
|
}
|
|
337
355
|
}
|
|
338
356
|
|
|
339
|
-
const SDK_VERSION = "1.
|
|
357
|
+
const SDK_VERSION = "1.4.2";
|
package/src/rpc-clients.ts
CHANGED
|
@@ -50,6 +50,7 @@ import {
|
|
|
50
50
|
recordSpanError,
|
|
51
51
|
sanitizeRpcBody,
|
|
52
52
|
spanContextToTraceparent,
|
|
53
|
+
stampJobAttributes,
|
|
53
54
|
} from "./tracing.js";
|
|
54
55
|
|
|
55
56
|
export interface RpcClients {
|
|
@@ -119,30 +120,11 @@ function tracingLoggingInterceptor(
|
|
|
119
120
|
span.setAttribute(SPAN_ATTR.RPC_SERVICE, req.service.typeName);
|
|
120
121
|
span.setAttribute(SPAN_ATTR.RPC_TARGET, target);
|
|
121
122
|
|
|
122
|
-
//
|
|
123
|
-
//
|
|
124
|
-
//
|
|
125
|
-
// the
|
|
126
|
-
|
|
127
|
-
// custom OTel context manager.
|
|
128
|
-
const parent = trace.getActiveSpan();
|
|
129
|
-
const parentAttrs = (parent as unknown as {
|
|
130
|
-
attributes?: Record<string, unknown>;
|
|
131
|
-
})?.attributes;
|
|
132
|
-
if (parentAttrs) {
|
|
133
|
-
for (const key of [
|
|
134
|
-
SPAN_ATTR.RUN_ID,
|
|
135
|
-
SPAN_ATTR.JOB_ID,
|
|
136
|
-
SPAN_ATTR.UPLOAD_ID,
|
|
137
|
-
SPAN_ATTR.URN,
|
|
138
|
-
SPAN_ATTR.WORKER_ID,
|
|
139
|
-
]) {
|
|
140
|
-
const v = parentAttrs[key];
|
|
141
|
-
if (typeof v === "string" && v.length > 0) {
|
|
142
|
-
span.setAttribute(key, v);
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
}
|
|
123
|
+
// Job-scoped attrs (runId, jobId, ...) pulled from the
|
|
124
|
+
// active OTel context — set once by Pool.handleDispatch
|
|
125
|
+
// via withJobContext. The receiver requires pipeline.run_id
|
|
126
|
+
// or the span is dropped, so this stamp is load-bearing.
|
|
127
|
+
stampJobAttributes(span);
|
|
146
128
|
|
|
147
129
|
// Body capture: request first, response on success, error
|
|
148
130
|
// payload on failure. Sanitiser truncates to 4 KB and redacts
|
package/src/tracing.ts
CHANGED
|
@@ -29,6 +29,7 @@
|
|
|
29
29
|
*/
|
|
30
30
|
import {
|
|
31
31
|
context,
|
|
32
|
+
createContextKey,
|
|
32
33
|
trace,
|
|
33
34
|
type Context,
|
|
34
35
|
type Span,
|
|
@@ -51,6 +52,36 @@ import {
|
|
|
51
52
|
|
|
52
53
|
const TRACER_NAME = "@xeonr/upload-pool-sdk";
|
|
53
54
|
|
|
55
|
+
/**
|
|
56
|
+
* OTel context key carrying per-job attributes. Set once at the top of
|
|
57
|
+
* Pool.handleDispatch via `withJobContext()` and read by helpers that
|
|
58
|
+
* create child spans (interceptors, ctx.* spans) so every emitted span
|
|
59
|
+
* carries `pipeline.run_id` + identifiers — without it the trace-store
|
|
60
|
+
* receiver drops the span as orphan.
|
|
61
|
+
*
|
|
62
|
+
* The OTel `Span` API surface deliberately doesn't expose attributes
|
|
63
|
+
* back to read sites (only set/record/event), so we can't inherit them
|
|
64
|
+
* from a parent span at child-creation time. Carrying them in the
|
|
65
|
+
* Context object is the canonical OTel pattern.
|
|
66
|
+
*/
|
|
67
|
+
export const JOB_ATTRS_KEY = createContextKey("uplim.job_attrs");
|
|
68
|
+
|
|
69
|
+
export interface JobAttrs {
|
|
70
|
+
runId: string;
|
|
71
|
+
jobId: string;
|
|
72
|
+
uploadId: string;
|
|
73
|
+
urn: string;
|
|
74
|
+
workerId: string;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
export function getJobAttrs(): JobAttrs | undefined {
|
|
78
|
+
return context.active().getValue(JOB_ATTRS_KEY) as JobAttrs | undefined;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
export function withJobContext<T>(attrs: JobAttrs, fn: () => T): T {
|
|
82
|
+
return context.with(context.active().setValue(JOB_ATTRS_KEY, attrs), fn);
|
|
83
|
+
}
|
|
84
|
+
|
|
54
85
|
export const SPAN_ATTR = {
|
|
55
86
|
JOB_ID: "iq.job_id",
|
|
56
87
|
UPLOAD_ID: "iq.upload_id",
|
|
@@ -164,10 +195,7 @@ export function initTracing(cfg: TracingInitConfig): TracingHandle {
|
|
|
164
195
|
},
|
|
165
196
|
contextFromEnvelope: (traceparent: string, runId: string) => {
|
|
166
197
|
let ctx = context.active();
|
|
167
|
-
|
|
168
|
-
// runId attribute via baggage-like behaviour. We stamp it on
|
|
169
|
-
// each span at creation site instead of relying on baggage
|
|
170
|
-
// because the trace store reads it from span attributes.
|
|
198
|
+
void runId; // surfaced via withJobContext()
|
|
171
199
|
if (!traceparent) {
|
|
172
200
|
return ctx;
|
|
173
201
|
}
|
|
@@ -176,11 +204,6 @@ export function initTracing(cfg: TracingInitConfig): TracingHandle {
|
|
|
176
204
|
return ctx;
|
|
177
205
|
}
|
|
178
206
|
ctx = trace.setSpanContext(ctx, parsed);
|
|
179
|
-
// runId is consumed by the caller and stamped explicitly on
|
|
180
|
-
// each span via stampJobAttributes(); we don't store it in
|
|
181
|
-
// the OTel context because there's no cross-span attribute
|
|
182
|
-
// mechanism in OTel without using a custom propagator.
|
|
183
|
-
void runId;
|
|
184
207
|
return ctx;
|
|
185
208
|
},
|
|
186
209
|
};
|
|
@@ -295,30 +318,29 @@ function redactDeep(value: unknown, depth: number): unknown {
|
|
|
295
318
|
/**
|
|
296
319
|
* Set common job-scoped attributes on a span. Called by every site that
|
|
297
320
|
* creates a per-job span so RUN_ID / JOB_ID / UPLOAD_ID / URN are
|
|
298
|
-
* consistently present (the
|
|
299
|
-
* span into the right workflow run).
|
|
321
|
+
* consistently present (the trace-store receiver requires
|
|
322
|
+
* `pipeline.run_id` to route the span into the right workflow run).
|
|
323
|
+
*
|
|
324
|
+
* Pulls the attribute values from the active OTel context if not
|
|
325
|
+
* passed explicitly, so RPC / ctx.* spans created mid-handler inherit
|
|
326
|
+
* them without needing to know about the envelope. The Pool root sets
|
|
327
|
+
* the context via `withJobContext` at the start of handleDispatch.
|
|
300
328
|
*/
|
|
301
329
|
export function stampJobAttributes(
|
|
302
330
|
span: Span,
|
|
303
|
-
attrs
|
|
304
|
-
runId: string;
|
|
305
|
-
jobId: string;
|
|
306
|
-
uploadId?: string;
|
|
307
|
-
urn?: string;
|
|
308
|
-
workerId?: string;
|
|
309
|
-
},
|
|
331
|
+
attrs?: Partial<JobAttrs>,
|
|
310
332
|
): void {
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
if (
|
|
320
|
-
|
|
321
|
-
|
|
333
|
+
const fromCtx = getJobAttrs();
|
|
334
|
+
const runId = attrs?.runId ?? fromCtx?.runId ?? "";
|
|
335
|
+
const jobId = attrs?.jobId ?? fromCtx?.jobId ?? "";
|
|
336
|
+
const uploadId = attrs?.uploadId ?? fromCtx?.uploadId;
|
|
337
|
+
const urn = attrs?.urn ?? fromCtx?.urn;
|
|
338
|
+
const workerId = attrs?.workerId ?? fromCtx?.workerId;
|
|
339
|
+
if (runId) span.setAttribute(SPAN_ATTR.RUN_ID, runId);
|
|
340
|
+
if (jobId) span.setAttribute(SPAN_ATTR.JOB_ID, jobId);
|
|
341
|
+
if (uploadId) span.setAttribute(SPAN_ATTR.UPLOAD_ID, uploadId);
|
|
342
|
+
if (urn) span.setAttribute(SPAN_ATTR.URN, urn);
|
|
343
|
+
if (workerId) span.setAttribute(SPAN_ATTR.WORKER_ID, workerId);
|
|
322
344
|
}
|
|
323
345
|
|
|
324
346
|
export function recordSpanError(span: Span, err: unknown): void {
|