agent-inspect 6.31.21 → 6.31.22

package/packages/core/dist/exporters.cjs

@@ -1217,6 +1217,17 @@ function exportOpenInference(tree, options) {
     warnings
   };
 }
+
+// packages/core/src/persisted/delivery-identity.ts
+var DELIVERY_CONFLICT_ATTR = "agent_inspect.delivery_conflict";
+var IDENTITY_CONFLICT_ATTR = {
+  operationId: "agent_inspect.identity_conflict.operation_id",
+  attemptId: "agent_inspect.identity_conflict.attempt_id",
+  retryOf: "agent_inspect.identity_conflict.retry_of",
+  attemptNumber: "agent_inspect.identity_conflict.attempt_number"
+};
+
+// packages/core/src/exporters/otlp-json-exporter.ts
 var OTLP_STATUS_CODE_UNSET = 0;
 var OTLP_STATUS_CODE_OK = 1;
 var OTLP_STATUS_CODE_ERROR = 2;
@@ -1266,43 +1277,81 @@ var STRUCTURAL_IDENTITY_KEYS = [
   "attemptNumber",
   "attempt"
 ];
-function pickBoundedIdentityString(bag, key, maxLen) {
+function nestedBag(bag) {
   if (!bag || typeof bag !== "object") return void 0;
-  const direct = bag[key];
-  if (typeof direct === "string" && direct.trim() !== "") {
-    return direct.trim().slice(0, maxLen);
-  }
-  const nested = bag.metadata && typeof bag.metadata === "object" ? bag.metadata[key] : void 0;
-  if (typeof nested === "string" && nested.trim() !== "") {
-    return nested.trim().slice(0, maxLen);
-  }
-  return void 0;
+  const nested = bag.metadata;
+  if (!nested || typeof nested !== "object" || Array.isArray(nested)) return void 0;
+  return nested;
+}
+function pickBoundedIdentityString(bag, key, maxLen) {
+  if (!bag || typeof bag !== "object") return {};
+  const directRaw = bag[key];
+  const nestedRaw = nestedBag(bag)?.[key];
+  const direct = typeof directRaw === "string" && directRaw.trim() !== "" ? directRaw.trim().slice(0, maxLen) : void 0;
+  const nested = typeof nestedRaw === "string" && nestedRaw.trim() !== "" ? nestedRaw.trim().slice(0, maxLen) : void 0;
+  if (direct !== void 0 && nested !== void 0 && direct !== nested) {
+    return { value: direct, conflictAlternate: nested };
+  }
+  if (direct !== void 0) return { value: direct };
+  if (nested !== void 0) return { value: nested };
+  return {};
 }
 function pickBoundedIdentityNumber(bag, key) {
-  if (!bag || typeof bag !== "object") return void 0;
-  const direct = bag[key];
-  if (typeof direct === "number" && Number.isFinite(direct)) return direct;
-  const nested = bag.metadata && typeof bag.metadata === "object" ? bag.metadata[key] : void 0;
-  if (typeof nested === "number" && Number.isFinite(nested)) return nested;
-  return void 0;
+  if (!bag || typeof bag !== "object") return {};
+  const directRaw = bag[key];
+  const nestedRaw = nestedBag(bag)?.[key];
+  const direct = typeof directRaw === "number" && Number.isFinite(directRaw) ? directRaw : void 0;
+  const nested = typeof nestedRaw === "number" && Number.isFinite(nestedRaw) ? nestedRaw : void 0;
+  if (direct !== void 0 && nested !== void 0 && direct !== nested) {
+    return { value: direct, conflictAlternate: nested };
+  }
+  if (direct !== void 0) return { value: direct };
+  if (nested !== void 0) return { value: nested };
+  return {};
 }
 function appendStructuralIdentityAttrs(attrs, meta, maxLen) {
+  const conflicts = [];
   const operationId = pickBoundedIdentityString(meta, "operationId", maxLen);
-  if (operationId !== void 0) {
-    attrs.push(stringAttr("agent_inspect.operation_id", operationId));
+  if (operationId.value !== void 0) {
+    attrs.push(stringAttr("agent_inspect.operation_id", operationId.value));
+  }
+  if (operationId.conflictAlternate !== void 0) {
+    attrs.push(
+      stringAttr(IDENTITY_CONFLICT_ATTR.operationId, operationId.conflictAlternate)
+    );
+    conflicts.push("operationId");
   }
   const attemptId = pickBoundedIdentityString(meta, "attemptId", maxLen);
-  if (attemptId !== void 0) {
-    attrs.push(stringAttr("agent_inspect.attempt_id", attemptId));
+  if (attemptId.value !== void 0) {
+    attrs.push(stringAttr("agent_inspect.attempt_id", attemptId.value));
+  }
+  if (attemptId.conflictAlternate !== void 0) {
+    attrs.push(stringAttr(IDENTITY_CONFLICT_ATTR.attemptId, attemptId.conflictAlternate));
+    conflicts.push("attemptId");
   }
   const retryOf = pickBoundedIdentityString(meta, "retryOf", maxLen);
-  if (retryOf !== void 0) {
-    attrs.push(stringAttr("agent_inspect.retry_of", retryOf));
+  if (retryOf.value !== void 0) {
+    attrs.push(stringAttr("agent_inspect.retry_of", retryOf.value));
+  }
+  if (retryOf.conflictAlternate !== void 0) {
+    attrs.push(stringAttr(IDENTITY_CONFLICT_ATTR.retryOf, retryOf.conflictAlternate));
+    conflicts.push("retryOf");
+  }
+  const attemptNumberPrimary = pickBoundedIdentityNumber(meta, "attemptNumber");
+  const attemptNumber = attemptNumberPrimary.value !== void 0 || attemptNumberPrimary.conflictAlternate !== void 0 ? attemptNumberPrimary : pickBoundedIdentityNumber(meta, "attempt");
+  if (attemptNumber.value !== void 0) {
+    attrs.push(intAttr("agent_inspect.attempt_number", attemptNumber.value));
   }
-  const attemptNumber = pickBoundedIdentityNumber(meta, "attemptNumber") ?? pickBoundedIdentityNumber(meta, "attempt");
-  if (attemptNumber !== void 0) {
-    attrs.push(intAttr("agent_inspect.attempt_number", attemptNumber));
+  if (attemptNumber.conflictAlternate !== void 0) {
+    attrs.push(
+      intAttr(IDENTITY_CONFLICT_ATTR.attemptNumber, attemptNumber.conflictAlternate)
+    );
+    conflicts.push("attemptNumber");
+  }
+  if (meta?.[DELIVERY_CONFLICT_ATTR] === true) {
+    attrs.push(boolAttr(DELIVERY_CONFLICT_ATTR, true));
   }
+  return conflicts;
 }
 function resolveSpanTimes(ev) {
   const startedAtMs = typeof ev.attributes?.startedAtMs === "number" && Number.isFinite(ev.attributes.startedAtMs) ? ev.attributes.startedAtMs : void 0;
@@ -1325,7 +1374,8 @@ function exportOtlpJson(tree, options) {
     "OTLP JSON export uses OTel GenAI-aligned attributes where applicable; experimental until verified against specific collectors.",
     "Not OTLP gRPC/protobuf \u2014 JSON mapping only. Generated locally; no network upload.",
     "Status and span kind use OTLP numeric enums (StatusCode 0/1/2, SpanKind INTERNAL=1).",
-    "When present on source events, operationId/attemptId/retryOf/attemptNumber are emitted as bounded agent_inspect.* identity attributes (not a broad attribute dump)."
+    "When present on source events, operationId/attemptId/retryOf/attemptNumber are emitted as bounded agent_inspect.* identity attributes (not a broad attribute dump).",
+    "When direct and nested identity disagree, export prefers direct for non-strict consumers and emits agent_inspect.identity_conflict.* for the nested alternate; this does not certify conflicting identity."
   ];
   const traceId = hexFrom2(`trace:${tree.runId}`, 16);
   const includeAttributes = options?.includeAttributes ?? false;
@@ -1373,11 +1423,16 @@ function exportOtlpJson(tree, options) {
       if (typeof inp === "number") attrs.push(intAttr("gen_ai.usage.input_tokens", inp));
       if (typeof outp === "number") attrs.push(intAttr("gen_ai.usage.output_tokens", outp));
     }
-    appendStructuralIdentityAttrs(
+    const identityConflicts = appendStructuralIdentityAttrs(
       attrs,
       meta && typeof meta === "object" ? meta : void 0,
       maxLen
     );
+    if (identityConflicts.length > 0) {
+      warnings.push(
+        `Identity representation conflict on event ${ev.eventId}: ${identityConflicts.join(", ")} (direct preferred; nested retained on agent_inspect.identity_conflict.*).`
+      );
+    }
     if (includeAttributes && meta && typeof meta === "object") {
       const skipKeys = /* @__PURE__ */ new Set([
         "tokens",