@hatchet-dev/typescript-sdk 1.19.0 → 1.19.1

package/clients/event/event-client.js

@@ -14,6 +14,7 @@ const events_1 = require("../../protoc/events/events");
 const hatchet_error_1 = require("../../util/errors/hatchet-error");
 const retrier_1 = require("../../util/retrier");
 const apply_namespace_1 = require("../../util/apply-namespace");
+const parent_run_context_vars_1 = require("../../v1/parent-run-context-vars");
 var LogLevel;
 (function (LogLevel) {
     LogLevel["INFO"] = "INFO";
@@ -21,6 +22,13 @@ var LogLevel;
     LogLevel["ERROR"] = "ERROR";
     LogLevel["DEBUG"] = "DEBUG";
 })(LogLevel || (exports.LogLevel = LogLevel = {}));
+function injectSourceInfo(metadata) {
+    const ctx = parent_run_context_vars_1.parentRunContextManager.getContext();
+    if (!(ctx === null || ctx === void 0 ? void 0 : ctx.parentId) || !(ctx === null || ctx === void 0 ? void 0 : ctx.parentTaskRunExternalId)) {
+        return metadata;
+    }
+    return Object.assign(Object.assign({}, metadata), { hatchet__source_workflow_run_id: ctx.parentId, hatchet__source_step_run_id: ctx.parentTaskRunExternalId });
+}
 class EventClient {
     constructor(config, channel, factory, api) {
         this.config = config;
@@ -35,14 +43,14 @@ class EventClient {
      * Keep the signature in sync with the instrumentor wrapper.
      */
     push(type, input, options = {}) {
+        var _a;
         const namespacedType = (0, apply_namespace_1.applyNamespace)(type, this.config.namespace);
+        const enhancedMetadata = injectSourceInfo((_a = options.additionalMetadata) !== null && _a !== void 0 ? _a : {});
         const req = {
             key: namespacedType,
             payload: JSON.stringify(input),
             eventTimestamp: new Date(),
-            additionalMetadata: options.additionalMetadata
-                ? JSON.stringify(options.additionalMetadata)
-                : undefined,
+            additionalMetadata: Object.keys(enhancedMetadata).length > 0 ? JSON.stringify(enhancedMetadata) : undefined,
             priority: options.priority,
             scope: options.scope,
         };
@@ -62,19 +70,14 @@ class EventClient {
     bulkPush(type, inputs, options = {}) {
         const namespacedType = (0, apply_namespace_1.applyNamespace)(type, this.config.namespace);
         const events = inputs.map((input) => {
+            var _a, _b;
+            const baseMeta = (_b = (_a = input.additionalMetadata) !== null && _a !== void 0 ? _a : options.additionalMetadata) !== null && _b !== void 0 ? _b : {};
+            const enhanced = injectSourceInfo(baseMeta);
             return {
                 key: namespacedType,
                 payload: JSON.stringify(input.payload),
                 eventTimestamp: new Date(),
-                additionalMetadata: (() => {
-                    if (input.additionalMetadata) {
-                        return JSON.stringify(input.additionalMetadata);
-                    }
-                    if (options.additionalMetadata) {
-                        return JSON.stringify(options.additionalMetadata);
-                    }
-                    return undefined;
-                })(),
+                additionalMetadata: Object.keys(enhanced).length > 0 ? JSON.stringify(enhanced) : undefined,
                 priority: input.priority,
                 scope: input.scope,
             };

package/opentelemetry/hatchet-exporter.js

@@ -96,9 +96,19 @@ class HatchetExporterWrapper {
  */
 class HatchetAttributeSpanProcessor extends BatchSpanProcessor {
     onStart(span) {
+        var _a;
         const attrs = hatchet_span_context_1.hatchetSpanAttributes.getStore();
         if (attrs) {
-            span.setAttributes(attrs);
+            const existing = (_a = span.attributes) !== null && _a !== void 0 ? _a : {};
+            const filtered = {};
+            for (const [key, value] of Object.entries(attrs)) {
+                if (!(key in existing)) {
+                    filtered[key] = value;
+                }
+            }
+            if (Object.keys(filtered).length > 0) {
+                span.setAttributes(filtered);
+            }
         }
         super.onStart(span, undefined);
     }
@@ -108,10 +118,14 @@ class HatchetAttributeSpanProcessor extends BatchSpanProcessor {
 }
 function createHatchetExporter(config) {
     const insecure = config.tls_config.tls_strategy === 'none';
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    const grpc = require('@grpc/grpc-js');
+    const metadata = new grpc.Metadata();
+    metadata.set('authorization', `Bearer ${config.token}`);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const opts = {
         url: `${insecure ? 'http' : 'https'}://${config.host_port}`,
-        metadata: { authorization: `Bearer ${config.token}` },
+        metadata,
     };
     if (!insecure && config.tls_config.ca_file) {
         try {

package/opentelemetry/instrumentor.js

@@ -46,6 +46,17 @@ function extractContext(carrier) {
 function injectContext(carrier) {
     propagation.inject(context.active(), carrier);
 }
+function injectSourceInfo(carrier) {
+    const store = hatchet_span_context_1.hatchetSpanAttributes.getStore();
+    if (!store)
+        return;
+    const wfRunId = store['hatchet.workflow_run_id'];
+    const stepRunId = store['hatchet.step_run_id'];
+    if (typeof wfRunId === 'string' && typeof stepRunId === 'string') {
+        carrier['hatchet__source_workflow_run_id'] = wfRunId;
+        carrier['hatchet__source_step_run_id'] = stepRunId;
+    }
+}
 function getActionOtelAttributes(action, excludedAttributes = [], workerId) {
     const attributes = {
         [opentelemetry_1.OTelAttribute.TENANT_ID]: action.tenantId,
@@ -215,6 +226,7 @@ class HatchetInstrumentor extends InstrumentationBase {
                     var _a;
                     const enhancedMetadata = Object.assign({}, ((_a = options.additionalMetadata) !== null && _a !== void 0 ? _a : {}));
                     injectContext(enhancedMetadata);
+                    injectSourceInfo(enhancedMetadata);
                     const enhancedOptions = Object.assign(Object.assign({}, options), { additionalMetadata: enhancedMetadata });
                     const result = original.call(this, type, input, enhancedOptions);
                     return result.finally(() => {
@@ -247,6 +259,7 @@ class HatchetInstrumentor extends InstrumentationBase {
                         var _a;
                         const enhancedMetadata = Object.assign({}, ((_a = input.additionalMetadata) !== null && _a !== void 0 ? _a : {}));
                         injectContext(enhancedMetadata);
+                        injectSourceInfo(enhancedMetadata);
                         return Object.assign(Object.assign({}, input), { additionalMetadata: enhancedMetadata });
                     });
                     const result = original.call(this, type, enhancedInputs, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hatchet-dev/typescript-sdk",
-  "version": "1.19.0",
+  "version": "1.19.1",
   "description": "Background task orchestration & visibility for developers",
   "types": "dist/index.d.ts",
   "files": [
@@ -61,6 +61,7 @@
     "zod-to-json-schema": "^3.24.1"
   },
   "optionalDependencies": {
+    "@grpc/grpc-js": "^1.14.3",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^2.0.0",
     "@opentelemetry/exporter-trace-otlp-grpc": "^0.208.0",

package/version.d.ts

@@ -1 +1 @@
-export declare const HATCHET_VERSION = "1.19.0";
+export declare const HATCHET_VERSION = "1.19.1";

package/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HATCHET_VERSION = void 0;
-exports.HATCHET_VERSION = '1.19.0';
+exports.HATCHET_VERSION = '1.19.1';