@lunardinos/server 0.2.2 → 0.2.4

package/dist/index.js

@@ -88,7 +88,7 @@ class LunarDinosSpanProcessor {
   }
   onStart(_span, _context) {}
   onEnd(span) {
-    const scope = span.instrumentationLibrary?.name;
+    const scope = span.instrumentationScope?.name ?? span.instrumentationLibrary?.name;
     if (scope !== "ai")
       return;
     if (span.name.startsWith("ai.toolCall")) {
@@ -102,8 +102,8 @@ class LunarDinosSpanProcessor {
       return;
     const traceId = span.spanContext().traceId;
     const model = strAttr(span, "ai.model.id") ?? strAttr(span, "gen_ai.request.model");
-    const inputTokens = numAttr(span, "gen_ai.usage.input_tokens") || numAttr(span, "ai.usage.promptTokens");
-    const outputTokens = numAttr(span, "gen_ai.usage.output_tokens") || numAttr(span, "ai.usage.completionTokens");
+    const inputTokens = numAttr(span, "ai.usage.inputTokens") || numAttr(span, "gen_ai.usage.input_tokens") || numAttr(span, "ai.usage.promptTokens");
+    const outputTokens = numAttr(span, "ai.usage.outputTokens") || numAttr(span, "gen_ai.usage.output_tokens") || numAttr(span, "ai.usage.completionTokens");
     const startMs = hrtimeToMs(span.startTime);
     const endMs = hrtimeToMs(span.endTime);
     const childToolCalls = this.toolCallSpans.get(traceId);
@@ -124,7 +124,7 @@ class LunarDinosSpanProcessor {
       durationMs: Math.round(endMs - startMs),
       msToFirstChunk: numAttr(span, "ai.response.msToFirstChunk") || null,
       operation: span.name.replace("ai.", ""),
-      finishReason: strAttr(span, "ai.finishReason") ?? strAttr(span, "gen_ai.response.finish_reasons"),
+      finishReason: finishReason(span),
       error: span.status?.code === 2,
       toolCalls,
       prompt: this.config.recordPrompts ? jsonAttr(span, "ai.prompt.messages") : null,
@@ -179,6 +179,15 @@ class LunarDinosSpanProcessor {
 function hrtimeToMs(hrtime) {
   return hrtime[0] * 1000 + hrtime[1] / 1e6;
 }
+function finishReason(span) {
+  const direct = strAttr(span, "ai.response.finishReason");
+  if (direct)
+    return direct;
+  const reasons = attr(span, "gen_ai.response.finish_reasons");
+  if (Array.isArray(reasons) && typeof reasons[0] === "string")
+    return reasons[0];
+  return null;
+}
 
 // src/init.ts
 function initLunarDinos(config) {

package/dist/src/processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"processor.d.ts","sourceRoot":"","sources":["../../src/processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAGhF,MAAM,WAAW,gBAAgB;IAC/B,0BAA0B;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,kFAAkF;IAClF,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,4EAA4E;IAC5E,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,0CAA0C;IAC1C,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,0DAA0D;IAC1D,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AA8FD,qBAAa,uBAAwB,YAAW,aAAa;IAO/C,OAAO,CAAC,MAAM;IAN1B,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,KAAK,CAA8C;IAC3D,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,YAAY,CAAQ;IAC5B,OAAO,CAAC,aAAa,CAAoC;gBAErC,MAAM,EAAE,gBAAgB;IAS5C,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI;IAEhD,KAAK,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI;IAgFzB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAQjB,KAAK;CAepB"}
+{"version":3,"file":"processor.d.ts","sourceRoot":"","sources":["../../src/processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAGhF,MAAM,WAAW,gBAAgB;IAC/B,0BAA0B;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,kFAAkF;IAClF,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,4EAA4E;IAC5E,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,0CAA0C;IAC1C,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,0DAA0D;IAC1D,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AA8FD,qBAAa,uBAAwB,YAAW,aAAa;IAO/C,OAAO,CAAC,MAAM;IAN1B,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,KAAK,CAA8C;IAC3D,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,YAAY,CAAQ;IAC5B,OAAO,CAAC,aAAa,CAAoC;gBAErC,MAAM,EAAE,gBAAgB;IAS5C,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI;IAEhD,KAAK,CAAC,IAAI,EAAE,YAAY,GAAG,IAAI;IA4FzB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAQjB,KAAK;CAepB"}

package/dist/src/processor.js

@@ -65,7 +65,11 @@ export class LunarDinosSpanProcessor {
     }
     onStart(_span, _context) { }
     onEnd(span) {
-        const scope = span.instrumentationLibrary?.name;
+        // OTel 2.x renamed `instrumentationLibrary` to `instrumentationScope`. The
+        // new field isn't on the 1.x ReadableSpan type we build against, so read it
+        // through a widened view and fall back to the legacy field for 1.x spans.
+        const scope = span.instrumentationScope?.name ??
+            span.instrumentationLibrary?.name;
         if (scope !== "ai")
             return;
         if (span.name.startsWith("ai.toolCall")) {
@@ -79,8 +83,16 @@ export class LunarDinosSpanProcessor {
             return;
         const traceId = span.spanContext().traceId;
         const model = strAttr(span, "ai.model.id") ?? strAttr(span, "gen_ai.request.model");
-        const inputTokens = numAttr(span, "gen_ai.usage.input_tokens") || numAttr(span, "ai.usage.promptTokens");
-        const outputTokens = numAttr(span, "gen_ai.usage.output_tokens") || numAttr(span, "ai.usage.completionTokens");
+        // Root AI SDK spans (v5+) carry `ai.usage.inputTokens`/`outputTokens`. The
+        // older `ai.usage.promptTokens`/`completionTokens` and the `gen_ai.usage.*`
+        // names only appear on the child doGenerate/doStream spans we skip — keep
+        // them as fallbacks for older SDKs / alternative instrumentations.
+        const inputTokens = numAttr(span, "ai.usage.inputTokens") ||
+            numAttr(span, "gen_ai.usage.input_tokens") ||
+            numAttr(span, "ai.usage.promptTokens");
+        const outputTokens = numAttr(span, "ai.usage.outputTokens") ||
+            numAttr(span, "gen_ai.usage.output_tokens") ||
+            numAttr(span, "ai.usage.completionTokens");
         const startMs = hrtimeToMs(span.startTime);
         const endMs = hrtimeToMs(span.endTime);
         const childToolCalls = this.toolCallSpans.get(traceId);
@@ -101,7 +113,7 @@ export class LunarDinosSpanProcessor {
             durationMs: Math.round(endMs - startMs),
             msToFirstChunk: numAttr(span, "ai.response.msToFirstChunk") || null,
             operation: span.name.replace("ai.", ""),
-            finishReason: strAttr(span, "ai.finishReason") ?? strAttr(span, "gen_ai.response.finish_reasons"),
+            finishReason: finishReason(span),
             error: span.status?.code === 2,
             toolCalls,
             prompt: this.config.recordPrompts ? jsonAttr(span, "ai.prompt.messages") : null,
@@ -161,3 +173,17 @@ export class LunarDinosSpanProcessor {
 function hrtimeToMs(hrtime) {
     return hrtime[0] * 1000 + hrtime[1] / 1_000_000;
 }
+/**
+ * Finish reason from a root AI SDK span. v5+ sets `ai.response.finishReason`
+ * (a string); the gen_ai convention sets `gen_ai.response.finish_reasons` (a
+ * string array) — read either.
+ */
+function finishReason(span) {
+    const direct = strAttr(span, "ai.response.finishReason");
+    if (direct)
+        return direct;
+    const reasons = attr(span, "gen_ai.response.finish_reasons");
+    if (Array.isArray(reasons) && typeof reasons[0] === "string")
+        return reasons[0];
+    return null;
+}

package/dist/src/processor.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=processor.test.d.ts.map

package/dist/src/processor.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"processor.test.d.ts","sourceRoot":"","sources":["../../src/processor.test.ts"],"names":[],"mappings":""}

package/dist/src/processor.test.js

@@ -0,0 +1,161 @@
+import { afterEach, beforeEach, describe, expect, test } from "bun:test";
+import { LunarDinosSpanProcessor } from "./processor";
+/** Minimal ReadableSpan stub with just the fields the processor reads. */
+function makeSpan(opts) {
+    return {
+        name: opts.name,
+        attributes: opts.attributes,
+        startTime: opts.startTime ?? [1000, 0],
+        endTime: opts.endTime ?? [1002, 500_000_000], // 2.5s later
+        status: { code: opts.statusCode ?? 0 },
+        instrumentationScope: { name: "ai" },
+        spanContext: () => ({ traceId: opts.traceId ?? "trace-1", spanId: "span-1" }),
+    };
+}
+describe("LunarDinosSpanProcessor", () => {
+    let sent;
+    let originalFetch;
+    beforeEach(() => {
+        sent = [];
+        originalFetch = globalThis.fetch;
+        globalThis.fetch = (async (_url, init) => {
+            const body = JSON.parse(init?.body ?? "{}");
+            sent.push(...body.events);
+            return new Response(null, { status: 200 });
+        });
+    });
+    afterEach(() => {
+        globalThis.fetch = originalFetch;
+    });
+    // A v6 root `ai.generateText` span: token usage lives under
+    // `ai.usage.inputTokens`/`outputTokens`, finish reason under
+    // `ai.response.finishReason`. (gen_ai.* + promptTokens are on child spans.)
+    function v6RootSpan() {
+        return makeSpan({
+            name: "ai.generateText",
+            attributes: {
+                "ai.model.id": "gemini-2.5-flash",
+                "ai.usage.inputTokens": 1200,
+                "ai.usage.outputTokens": 340,
+                "ai.response.finishReason": "stop",
+                "ai.response.text": "hello world",
+                "ai.prompt.messages": JSON.stringify([{ role: "user", content: "hi" }]),
+                "ai.telemetry.metadata.lunardinos.source": "chat",
+                "ai.telemetry.metadata.lunardinos.account": JSON.stringify({ id: "acme" }),
+            },
+        });
+    }
+    test("extracts non-zero tokens, cost, and finish reason from a v6 root span", async () => {
+        const proc = new LunarDinosSpanProcessor({ apiKey: "ik_test", flushIntervalMs: 999_999 });
+        proc.onEnd(v6RootSpan());
+        await proc.forceFlush();
+        expect(sent).toHaveLength(1);
+        const { payload } = sent[0];
+        expect(payload.model).toBe("gemini-2.5-flash");
+        expect(payload.inputTokens).toBe(1200);
+        expect(payload.outputTokens).toBe(340);
+        // gemini-2.5-flash: 15c/1M in, 60c/1M out → 1200/1e6*15 + 340/1e6*60
+        expect(payload.costCents).toBeCloseTo((1200 / 1e6) * 15 + (340 / 1e6) * 60, 10);
+        expect(payload.costCents).toBeGreaterThan(0);
+        expect(payload.finishReason).toBe("stop");
+        expect(payload.operation).toBe("generateText");
+        expect(payload.durationMs).toBe(2500);
+        expect(payload.error).toBe(false);
+        await proc.shutdown();
+    });
+    test("falls back to gen_ai.* / promptTokens names for older SDKs", async () => {
+        const proc = new LunarDinosSpanProcessor({ apiKey: "ik_test", flushIntervalMs: 999_999 });
+        proc.onEnd(makeSpan({
+            name: "ai.generateText",
+            attributes: {
+                "ai.model.id": "gpt-4o",
+                "gen_ai.usage.input_tokens": 100,
+                "gen_ai.usage.output_tokens": 50,
+                "gen_ai.response.finish_reasons": ["length"],
+                "ai.telemetry.metadata.lunardinos.source": "chat",
+            },
+        }));
+        await proc.forceFlush();
+        expect(sent).toHaveLength(1);
+        expect(sent[0].payload.inputTokens).toBe(100);
+        expect(sent[0].payload.outputTokens).toBe(50);
+        expect(sent[0].payload.finishReason).toBe("length");
+        await proc.shutdown();
+    });
+    test("does not record prompt/response unless recordPrompts is set", async () => {
+        const proc = new LunarDinosSpanProcessor({ apiKey: "ik_test", flushIntervalMs: 999_999 });
+        proc.onEnd(v6RootSpan());
+        await proc.forceFlush();
+        expect(sent[0].payload.prompt).toBeNull();
+        expect(sent[0].payload.response).toBeNull();
+        await proc.shutdown();
+        sent = [];
+        const proc2 = new LunarDinosSpanProcessor({
+            apiKey: "ik_test",
+            recordPrompts: true,
+            flushIntervalMs: 999_999,
+        });
+        proc2.onEnd(v6RootSpan());
+        await proc2.forceFlush();
+        expect(sent[0].payload.response).toBe("hello world");
+        expect(sent[0].payload.prompt).toEqual([{ role: "user", content: "hi" }]);
+        await proc2.shutdown();
+    });
+    test("drops events with no attribution context", async () => {
+        const proc = new LunarDinosSpanProcessor({ apiKey: "ik_test", flushIntervalMs: 999_999 });
+        proc.onEnd(makeSpan({
+            name: "ai.generateText",
+            attributes: { "ai.model.id": "gpt-4o", "ai.usage.inputTokens": 10 },
+        }));
+        await proc.forceFlush();
+        expect(sent).toHaveLength(0);
+        await proc.shutdown();
+    });
+    test("ignores non-AI spans", async () => {
+        const proc = new LunarDinosSpanProcessor({ apiKey: "ik_test", flushIntervalMs: 999_999 });
+        const span = makeSpan({
+            name: "ai.generateText",
+            attributes: { "ai.usage.inputTokens": 10 },
+        });
+        span.instrumentationScope = {
+            name: "http",
+        };
+        proc.onEnd(span);
+        await proc.forceFlush();
+        expect(sent).toHaveLength(0);
+        await proc.shutdown();
+    });
+    test("attaches captured tool calls to the root generation", async () => {
+        const proc = new LunarDinosSpanProcessor({
+            apiKey: "ik_test",
+            recordPrompts: true,
+            flushIntervalMs: 999_999,
+        });
+        proc.onEnd(makeSpan({
+            name: "ai.toolCall",
+            traceId: "trace-tc",
+            attributes: {
+                "ai.toolCall.name": "search",
+                "ai.toolCall.args": JSON.stringify({ q: "dinos" }),
+                "ai.toolCall.result": JSON.stringify({ hits: 3 }),
+            },
+        }));
+        proc.onEnd(makeSpan({
+            name: "ai.generateText",
+            traceId: "trace-tc",
+            attributes: {
+                "ai.model.id": "gpt-4o",
+                "ai.usage.inputTokens": 10,
+                "ai.usage.outputTokens": 5,
+                "ai.telemetry.metadata.lunardinos.source": "chat",
+            },
+        }));
+        await proc.forceFlush();
+        expect(sent).toHaveLength(1);
+        const tc = sent[0].payload;
+        expect(tc.toolCalls).toHaveLength(1);
+        expect(tc.toolCalls[0].name).toBe("search");
+        expect(tc.toolCalls[0].args).toEqual({ q: "dinos" });
+        await proc.shutdown();
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunardinos/server",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "type": "module",
   "exports": {
     ".": {
@@ -19,7 +19,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.9",
+    "@opentelemetry/api": "^1.9"
+  },
+  "peerDependencies": {
+    "@opentelemetry/sdk-trace-base": ">=1.30 <3",
+    "@opentelemetry/sdk-trace-node": ">=1.30 <3"
+  },
+  "devDependencies": {
     "@opentelemetry/sdk-trace-base": "^1.30",
     "@opentelemetry/sdk-trace-node": "^1.30"
   }