@xeonr/upload-pool-sdk 1.4.1 → 1.4.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/dist/pool.d.ts.map +1 -1
- package/dist/pool.js +18 -13
- package/dist/pool.js.map +1 -1
- package/dist/tracing.d.ts.map +1 -1
- package/dist/tracing.js +11 -11
- package/dist/tracing.js.map +1 -1
- package/package.json +1 -1
- package/src/pool.ts +20 -18
- package/src/tracing.ts +11 -14
package/dist/pool.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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;
|
|
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,
|
|
22
|
+
import { JOB_ATTRS_KEY, initTracing, shutdownTracing, recordSpanError, stampJobAttributes, } from "./tracing.js";
|
|
23
23
|
export class Pool {
|
|
24
24
|
config;
|
|
25
25
|
rpc;
|
|
@@ -156,15 +156,17 @@ 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
|
-
|
|
163
|
-
//
|
|
164
|
-
//
|
|
165
|
-
//
|
|
166
|
-
//
|
|
167
|
-
//
|
|
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.)
|
|
168
170
|
const jobAttrs = {
|
|
169
171
|
runId: envelope.wfRunId ?? "",
|
|
170
172
|
jobId: envelope.jobId,
|
|
@@ -172,7 +174,10 @@ export class Pool {
|
|
|
172
174
|
urn: envelope.contentTypeContext.urn,
|
|
173
175
|
workerId: this.workerId,
|
|
174
176
|
};
|
|
175
|
-
|
|
177
|
+
const parentCtx = this.tracing
|
|
178
|
+
.contextFromEnvelope(envelope.traceContext ?? "", envelope.wfRunId ?? "")
|
|
179
|
+
.setValue(JOB_ATTRS_KEY, jobAttrs);
|
|
180
|
+
await this.tracing.tracer.startActiveSpan("iq.job", {
|
|
176
181
|
attributes: {
|
|
177
182
|
"iq.filename": envelope.filename,
|
|
178
183
|
"iq.mime_type": envelope.mimeType,
|
|
@@ -259,7 +264,7 @@ export class Pool {
|
|
|
259
264
|
rootSpan.end();
|
|
260
265
|
this.inFlight--;
|
|
261
266
|
}
|
|
262
|
-
})
|
|
267
|
+
});
|
|
263
268
|
}
|
|
264
269
|
resolveHandler(urn) {
|
|
265
270
|
return this.config.handlers[urn] ?? this.config.onUnhandled;
|
|
@@ -283,5 +288,5 @@ export class Pool {
|
|
|
283
288
|
}
|
|
284
289
|
}
|
|
285
290
|
}
|
|
286
|
-
const SDK_VERSION = "1.4.
|
|
291
|
+
const SDK_VERSION = "1.4.3";
|
|
287
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":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EACN,sBAAsB,EACtB,wBAAwB,EACxB,wBAAwB,GACxB,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAmB,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAoB,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,UAAU,EAAe,MAAM,aAAa,CAAC;AACtD,OAAO,EACN,WAAW,EACX,eAAe,EACf,eAAe,EACf,kBAAkB,
|
|
1
|
+
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EACN,sBAAsB,EACtB,wBAAwB,EACxB,wBAAwB,GACxB,MAAM,sDAAsD,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAmB,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAoB,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,UAAU,EAAe,MAAM,aAAa,CAAC;AACtD,OAAO,EACN,aAAa,EACb,WAAW,EACX,eAAe,EACf,eAAe,EACf,kBAAkB,GAElB,MAAM,cAAc,CAAC;AAOtB,MAAM,OAAO,IAAI;IACC,MAAM,CAAa;IACnB,GAAG,CAAa;IAChB,GAAG,CAAY;IACf,MAAM,CAAS;IACf,OAAO,CAAgB;IAChC,QAAQ,GAAG,CAAC,CAAC;IACJ,QAAQ,CAAS;IACjB,YAAY,CAAW;IAChC,cAAc,GAAyB,IAAI,CAAC;IAC5C,cAAc,GAAwB,IAAI,CAAC;IAC3C,iBAAiB,GAA0B,IAAI,CAAC;IAExD,YAAY,MAAkB;QAC7B,IAAI,CAAC,MAAM,GAAG;YACb,WAAW,EAAE,CAAC;YACd,GAAG,MAAM;SACT,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,GAAG,QAAQ,EAAE,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACrF,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC;YACvD,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACvB,CAAC,CAAC;QAEH,gEAAgE;QAChE,mEAAmE;QACnE,iEAAiE;QACjE,gEAAgE;QAChE,IAAI,CAAC,OAAO,GAAG,WAAW,CAAC;YAC1B,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,SAAS,EAAE,MAAM,CAAC,KAAK;YACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,WAAW;YACvB,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO;SAChC,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,GAAG,gBAAgB,CAAC;YAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,MAAM,EAAE,IAAI,CAAC,MAAM;SACnB,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,GAAG,IAAI,SAAS,CAAC;YACxB,QAAQ,EAAE,MAAM,CAAC,gBAAgB;YACjC,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;YAC/C,WAAW,EAAE,GAAG,EAAE;gBACjB,qEAAqE;YACtE,CAAC;YACD,cAAc,EAAE,GAAG,EAAE;gBACpB,8BAA8B;YAC/B,CAAC;YACD,aAAa,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,OAAsB,CAAC;SACvE,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE;YAC5B,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;YACpC,OAAO,EAAE,WAAW;SACpB,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE;gBACxC,IAAI,EAAE,2DAA2D;aACjE,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,KAAK,CAAC,KAAK;QACV,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;YAC9C,OAAO,IAAI,CAAC,cAAc,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACjB,IAAI,CAAC,cAAc,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YACnD,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,iEAAiE;QACjE,4BAA4B;QAC5B,IAAI,CAAC,iBAAiB,GAAG,WAAW,CAAC,GAAG,EAAE;YACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjE,CAAC,EAAE,MAAM,CAAC,CAAC;QACX,OAAO,IAAI,CAAC,cAAc,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,IAAI;QACT,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QAChB,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC5B,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACtC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC/B,CAAC;QACD,iEAAiE;QACjE,gDAAgD;QAChD,MAAM,eAAe,EAAE,CAAC;QACxB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;IAC5B,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,QAAqB;QACjD,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YACnC,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,GAAG,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAAG;SACpC,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,CAAC,EAAE,CAAC;YACrD,gEAAgE;YAChE,0DAA0D;YAC1D,0DAA0D;YAC1D,SAAS,CAAC,IAAI,CAAC,oCAAoC,EAAE;gBACpD,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;aACpC,CAAC,CAAC;YACH,OAAO;QACR,CAAC;QACD,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEhB,gEAAgE;QAChE,kEAAkE;QAClE,gEAAgE;QAChE,gEAAgE;QAChE,2DAA2D;QAC3D,EAAE;QACF,+DAA+D;QAC/D,4DAA4D;QAC5D,uDAAuD;QACvD,gEAAgE;QAChE,sDAAsD;QACtD,6DAA6D;QAC7D,2DAA2D;QAC3D,MAAM,QAAQ,GAAG;YAChB,KAAK,EAAE,QAAQ,CAAC,OAAO,IAAI,EAAE;YAC7B,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,GAAG,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAAG;YACpC,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACvB,CAAC;QACF,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO;aAC5B,mBAAmB,CACnB,QAAQ,CAAC,YAAY,IAAI,EAAE,EAC3B,QAAQ,CAAC,OAAO,IAAI,EAAE,CACtB;aACA,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAEpC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CACxC,QAAQ,EACR;YACC,UAAU,EAAE;gBACX,aAAa,EAAE,QAAQ,CAAC,QAAQ;gBAChC,cAAc,EAAE,QAAQ,CAAC,QAAQ;aACjC;SACD,EACD,SAAS,EACT,KAAK,EAAE,QAAQ,EAAE,EAAE;YAClB,kBAAkB,CAAC,QAAQ,EAAE;gBAC5B,KAAK,EAAE,QAAQ,CAAC,OAAO,IAAI,EAAE;gBAC7B,KAAK,EAAE,QAAQ,CAAC,KAAK;gBACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,GAAG,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAAG;gBACpC,QAAQ,EAAE,IAAI,CAAC,QAAQ;aACvB,CAAC,CAAC;YAEH,SAAS,CAAC,IAAI,CAAC,gBAAgB,EAAE;gBAChC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;aACvB,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;YACrE,MAAM,GAAG,GAAG,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE;gBAC3D,QAAQ,EAAE,IAAI,CAAC,QAAQ;aACvB,CAAC,CAAC;YACH,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE7B,IAAI,CAAC;gBACJ,oDAAoD;gBACpD,MAAM,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,SAAS,CACxC,MAAM,CAAC,sBAAsB,EAAE;oBAC9B,KAAK,EAAE,QAAQ,CAAC,KAAK;oBACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;iBAC7B,CAAC,CACF,CAAC;gBACF,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBAE/B,IAAI,CAAC,OAAO,EAAE,CAAC;oBACd,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE;wBAC/B,iBAAiB,EAAE,IAAI,CAAC,YAAY;qBACpC,CAAC,CAAC;oBACH,MAAM,IAAI,CAAC,WAAW,CACrB,QAAQ,CAAC,KAAK,EACd,GAAG,EACH,SAAS,EACT,IAAI,iBAAiB,CACpB,sBAAsB,QAAQ,CAAC,kBAAkB,CAAC,GAAG,EAAE,CACvD,CACD,CAAC;oBACF,QAAQ,CAAC,SAAS,CAAC;wBAClB,IAAI,EAAE,cAAc,CAAC,KAAK;wBAC1B,OAAO,EAAE,YAAY;qBACrB,CAAC,CAAC;oBACH,OAAO;gBACR,CAAC;gBAED,0DAA0D;gBAC1D,wDAAwD;gBACxD,qDAAqD;gBACrD,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CACxC,YAAY,EACZ,KAAK,EAAE,WAAW,EAAE,EAAE;oBACrB,kBAAkB,CAAC,WAAW,EAAE;wBAC/B,KAAK,EAAE,QAAQ,CAAC,OAAO,IAAI,EAAE;wBAC7B,KAAK,EAAE,QAAQ,CAAC,KAAK;wBACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;wBAC3B,GAAG,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAAG;wBACpC,QAAQ,EAAE,IAAI,CAAC,QAAQ;qBACvB,CAAC,CAAC;oBACH,IAAI,CAAC;wBACJ,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;wBACnB,WAAW,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC;oBACpD,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACd,eAAe,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;wBAClC,MAAM,GAAG,CAAC;oBACX,CAAC;4BAAS,CAAC;wBACV,WAAW,CAAC,GAAG,EAAE,CAAC;oBACnB,CAAC;gBACF,CAAC,CACD,CAAC;gBAEF,MAAM,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,WAAW,CAC1C,MAAM,CAAC,wBAAwB,EAAE;oBAChC,KAAK,EAAE,QAAQ,CAAC,KAAK;oBACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;iBAC7B,CAAC,CACF,CAAC;gBACF,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE;oBAC/B,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;iBAClC,CAAC,CAAC;gBACH,QAAQ,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC;YACjD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,SAAS,CAAC,KAAK,CAAC,YAAY,EAAE;oBAC7B,GAAG;oBACH,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;iBAClC,CAAC,CAAC;gBACH,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;gBAC/B,MAAM,IAAI,CAAC,WAAW,CACrB,QAAQ,CAAC,KAAK,EACd,GAAG,EACH,SAAS,EACT,GAAY,CACZ,CAAC;YACH,CAAC;oBAAS,CAAC;gBACV,QAAQ,CAAC,GAAG,EAAE,CAAC;gBACf,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjB,CAAC;QACF,CAAC,CACD,CAAC;IACH,CAAC;IAEO,cAAc,CAAC,GAAW;QACjC,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;IAC7D,CAAC;IAEO,KAAK,CAAC,WAAW,CACxB,KAAa,EACb,GAAe,EACf,SAAiB,EACjB,GAAU;QAEV,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,YAAY,iBAAiB,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAChC,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,WAAW,CAC1C,MAAM,CAAC,wBAAwB,EAAE;gBAChC,KAAK;gBACL,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;gBAC7B,KAAK,EAAE,GAAG,CAAC,OAAO;gBAClB,KAAK;aACL,CAAC,CACF,CAAC;YACF,SAAS,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QACjD,CAAC;QAAC,OAAO,MAAM,EAAE,CAAC;YACjB,SAAS,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;YAC5D,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,MAAe,EAAE,GAAG,CAAC,CAAC;QAC7C,CAAC;IACF,CAAC;CACD;AAED,MAAM,WAAW,GAAG,OAAO,CAAC"}
|
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,EAIN,KAAK,OAAO,EACZ,KAAK,IAAI,EACT,KAAK,WAAW,EAChB,KAAK,MAAM,EAEX,QAAQ,EACR,cAAc,EACd,MAAM,oBAAoB,CAAC;
|
|
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;AAY5B;;;;;;;;;;;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,CAsFjE;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
|
@@ -30,7 +30,8 @@
|
|
|
30
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
|
-
import { BatchSpanProcessor
|
|
33
|
+
import { BatchSpanProcessor } from "@opentelemetry/sdk-trace-base";
|
|
34
|
+
import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
|
|
34
35
|
import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION, } from "@opentelemetry/semantic-conventions";
|
|
35
36
|
const TRACER_NAME = "@xeonr/upload-pool-sdk";
|
|
36
37
|
/**
|
|
@@ -115,10 +116,17 @@ export function initTracing(cfg) {
|
|
|
115
116
|
maxQueueSize: 1024,
|
|
116
117
|
maxExportBatchSize: 128,
|
|
117
118
|
});
|
|
118
|
-
|
|
119
|
+
// NodeTracerProvider (not BasicTracerProvider) — it auto-registers an
|
|
120
|
+
// AsyncHooksContextManager so `context.with(ctx, fn)` propagates ctx
|
|
121
|
+
// through async boundaries. Without that, child spans created inside
|
|
122
|
+
// startActiveSpan's body see ROOT_CONTEXT and miss the JOB_ATTRS_KEY
|
|
123
|
+
// we set on the parent context, dropping every nested span at the
|
|
124
|
+
// trace-store receiver. Confirmed on stage with 1.4.0 / 1.4.1.
|
|
125
|
+
const provider = new NodeTracerProvider({
|
|
119
126
|
resource,
|
|
120
127
|
spanProcessors: [processor],
|
|
121
128
|
});
|
|
129
|
+
provider.register();
|
|
122
130
|
const tracer = provider.getTracer(TRACER_NAME, cfg.sdkVersion);
|
|
123
131
|
const handle = {
|
|
124
132
|
tracer,
|
|
@@ -132,10 +140,7 @@ export function initTracing(cfg) {
|
|
|
132
140
|
},
|
|
133
141
|
contextFromEnvelope: (traceparent, runId) => {
|
|
134
142
|
let ctx = context.active();
|
|
135
|
-
|
|
136
|
-
// runId attribute via baggage-like behaviour. We stamp it on
|
|
137
|
-
// each span at creation site instead of relying on baggage
|
|
138
|
-
// because the trace store reads it from span attributes.
|
|
143
|
+
void runId; // surfaced via withJobContext()
|
|
139
144
|
if (!traceparent) {
|
|
140
145
|
return ctx;
|
|
141
146
|
}
|
|
@@ -144,11 +149,6 @@ export function initTracing(cfg) {
|
|
|
144
149
|
return ctx;
|
|
145
150
|
}
|
|
146
151
|
ctx = trace.setSpanContext(ctx, parsed);
|
|
147
|
-
// runId is consumed by the caller and stamped explicitly on
|
|
148
|
-
// each span via stampJobAttributes(); we don't store it in
|
|
149
|
-
// the OTel context because there's no cross-span attribute
|
|
150
|
-
// mechanism in OTel without using a custom propagator.
|
|
151
|
-
void runId;
|
|
152
152
|
return ctx;
|
|
153
153
|
},
|
|
154
154
|
};
|
package/dist/tracing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../src/tracing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,OAAO,EACN,OAAO,EACP,gBAAgB,EAChB,KAAK,EAML,QAAQ,EACR,cAAc,GACd,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,
|
|
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.3",
|
|
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/pool.ts
CHANGED
|
@@ -24,11 +24,11 @@ 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,
|
|
30
31
|
stampJobAttributes,
|
|
31
|
-
withJobContext,
|
|
32
32
|
type TracingHandle,
|
|
33
33
|
} from "./tracing.js";
|
|
34
34
|
import type {
|
|
@@ -183,19 +183,17 @@ export class Pool {
|
|
|
183
183
|
|
|
184
184
|
// Root the entire job under iq.job, parented to the dispatching
|
|
185
185
|
// activity's span via the traceparent the pipeline-worker stamped
|
|
186
|
-
// onto the envelope.
|
|
187
|
-
//
|
|
188
|
-
//
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
//
|
|
195
|
-
//
|
|
196
|
-
//
|
|
197
|
-
// parent-span attributes back to child-creation sites — context
|
|
198
|
-
// values are the canonical cross-span carrier.
|
|
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.)
|
|
199
197
|
const jobAttrs = {
|
|
200
198
|
runId: envelope.wfRunId ?? "",
|
|
201
199
|
jobId: envelope.jobId,
|
|
@@ -203,9 +201,14 @@ export class Pool {
|
|
|
203
201
|
urn: envelope.contentTypeContext.urn,
|
|
204
202
|
workerId: this.workerId,
|
|
205
203
|
};
|
|
204
|
+
const parentCtx = this.tracing
|
|
205
|
+
.contextFromEnvelope(
|
|
206
|
+
envelope.traceContext ?? "",
|
|
207
|
+
envelope.wfRunId ?? "",
|
|
208
|
+
)
|
|
209
|
+
.setValue(JOB_ATTRS_KEY, jobAttrs);
|
|
206
210
|
|
|
207
|
-
await
|
|
208
|
-
this.tracing.tracer.startActiveSpan(
|
|
211
|
+
await this.tracing.tracer.startActiveSpan(
|
|
209
212
|
"iq.job",
|
|
210
213
|
{
|
|
211
214
|
attributes: {
|
|
@@ -318,7 +321,6 @@ export class Pool {
|
|
|
318
321
|
this.inFlight--;
|
|
319
322
|
}
|
|
320
323
|
},
|
|
321
|
-
),
|
|
322
324
|
);
|
|
323
325
|
}
|
|
324
326
|
|
|
@@ -352,4 +354,4 @@ export class Pool {
|
|
|
352
354
|
}
|
|
353
355
|
}
|
|
354
356
|
|
|
355
|
-
const SDK_VERSION = "1.4.
|
|
357
|
+
const SDK_VERSION = "1.4.3";
|
package/src/tracing.ts
CHANGED
|
@@ -41,10 +41,8 @@ import {
|
|
|
41
41
|
} from "@opentelemetry/api";
|
|
42
42
|
import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
|
|
43
43
|
import { Resource } from "@opentelemetry/resources";
|
|
44
|
-
import {
|
|
45
|
-
|
|
46
|
-
BasicTracerProvider,
|
|
47
|
-
} from "@opentelemetry/sdk-trace-base";
|
|
44
|
+
import { BatchSpanProcessor } from "@opentelemetry/sdk-trace-base";
|
|
45
|
+
import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
|
|
48
46
|
import {
|
|
49
47
|
ATTR_SERVICE_NAME,
|
|
50
48
|
ATTR_SERVICE_VERSION,
|
|
@@ -177,10 +175,17 @@ export function initTracing(cfg: TracingInitConfig): TracingHandle {
|
|
|
177
175
|
maxExportBatchSize: 128,
|
|
178
176
|
});
|
|
179
177
|
|
|
180
|
-
|
|
178
|
+
// NodeTracerProvider (not BasicTracerProvider) — it auto-registers an
|
|
179
|
+
// AsyncHooksContextManager so `context.with(ctx, fn)` propagates ctx
|
|
180
|
+
// through async boundaries. Without that, child spans created inside
|
|
181
|
+
// startActiveSpan's body see ROOT_CONTEXT and miss the JOB_ATTRS_KEY
|
|
182
|
+
// we set on the parent context, dropping every nested span at the
|
|
183
|
+
// trace-store receiver. Confirmed on stage with 1.4.0 / 1.4.1.
|
|
184
|
+
const provider = new NodeTracerProvider({
|
|
181
185
|
resource,
|
|
182
186
|
spanProcessors: [processor],
|
|
183
187
|
});
|
|
188
|
+
provider.register();
|
|
184
189
|
|
|
185
190
|
const tracer = provider.getTracer(TRACER_NAME, cfg.sdkVersion);
|
|
186
191
|
|
|
@@ -195,10 +200,7 @@ export function initTracing(cfg: TracingInitConfig): TracingHandle {
|
|
|
195
200
|
},
|
|
196
201
|
contextFromEnvelope: (traceparent: string, runId: string) => {
|
|
197
202
|
let ctx = context.active();
|
|
198
|
-
|
|
199
|
-
// runId attribute via baggage-like behaviour. We stamp it on
|
|
200
|
-
// each span at creation site instead of relying on baggage
|
|
201
|
-
// because the trace store reads it from span attributes.
|
|
203
|
+
void runId; // surfaced via withJobContext()
|
|
202
204
|
if (!traceparent) {
|
|
203
205
|
return ctx;
|
|
204
206
|
}
|
|
@@ -207,11 +209,6 @@ export function initTracing(cfg: TracingInitConfig): TracingHandle {
|
|
|
207
209
|
return ctx;
|
|
208
210
|
}
|
|
209
211
|
ctx = trace.setSpanContext(ctx, parsed);
|
|
210
|
-
// runId is consumed by the caller and stamped explicitly on
|
|
211
|
-
// each span via stampJobAttributes(); we don't store it in
|
|
212
|
-
// the OTel context because there's no cross-span attribute
|
|
213
|
-
// mechanism in OTel without using a custom propagator.
|
|
214
|
-
void runId;
|
|
215
212
|
return ctx;
|
|
216
213
|
},
|
|
217
214
|
};
|