PR fixes

Author: lenatraceloop

packages/instrumentation-google-generativeai/package.json

@@ -50,7 +50,7 @@
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@google/genai": "^1.49.0",
+    "@google/genai": "^1.50.1",
     "@opentelemetry/context-async-hooks": "^2.0.1",
     "@opentelemetry/sdk-trace-base": "^2.0.1",
     "@opentelemetry/sdk-trace-node": "^2.0.1",

packages/instrumentation-google-generativeai/src/content-block-mapper.ts

@@ -67,14 +67,8 @@ export function mapGenAIContentBlock(block: genai.Part | string): object {
     const mimeType = block.inlineData.mimeType;
     return {
       type: GenAIOtelPartType.BLOB,
-      // Only set modality/mime_type when mimeType is known — an absent mimeType
-      // produces the wrong modality if we blindly pass "" to genaiModalityFromMimeType.
-      ...(mimeType
-        ? {
-            modality: genaiModalityFromMimeType(mimeType),
-            mime_type: mimeType,
-          }
-        : {}),
+      modality: genaiModalityFromMimeType(mimeType ?? ""),
+      ...(mimeType ? { mime_type: mimeType } : {}),
       content: block.inlineData.data,
     };
   }
@@ -83,12 +77,8 @@ export function mapGenAIContentBlock(block: genai.Part | string): object {
     const mimeType = block.fileData.mimeType;
     return {
       type: GenAIOtelPartType.URI,
-      ...(mimeType
-        ? {
-            modality: genaiModalityFromMimeType(mimeType),
-            mime_type: mimeType,
-          }
-        : {}),
+      modality: genaiModalityFromMimeType(mimeType ?? ""),
+      ...(mimeType ? { mime_type: mimeType } : {}),
       uri: block.fileData.fileUri,
     };
   }

packages/instrumentation-google-generativeai/src/instrumentation.ts

@@ -49,7 +49,7 @@ import {
   ATTR_GEN_AI_PROVIDER_NAME,
   ATTR_GEN_AI_SYSTEM_INSTRUCTIONS,
   GEN_AI_OPERATION_NAME_VALUE_GENERATE_CONTENT,
-  GEN_AI_PROVIDER_NAME_VALUE_GCP_GEMINI,
+  GEN_AI_PROVIDER_NAME_VALUE_GCP_GEN_AI,
 } from "@opentelemetry/semantic-conventions/incubating";
 import {
   formatInputMessages,
@@ -71,7 +71,7 @@ export const genaiFinishReasonMap: Record<string, string> = {
   SAFETY: FinishReasons.CONTENT_FILTER,
   RECITATION: FinishReasons.CONTENT_FILTER,
   LANGUAGE: FinishReasons.CONTENT_FILTER,
-  OTHER: FinishReasons.OTHER,
+  OTHER: FinishReasons.ERROR,
   BLOCKLIST: FinishReasons.CONTENT_FILTER,
   PROHIBITED_CONTENT: FinishReasons.CONTENT_FILTER,
   SPII: FinishReasons.CONTENT_FILTER,
@@ -85,11 +85,6 @@ export const genaiFinishReasonMap: Record<string, string> = {
   IMAGE_OTHER: FinishReasons.ERROR,
 };
 
-// Lowercase and strip the "finish_reason_" prefix for the span-level attribute.
-function geminiReasonToSpanValue(reason: string): string {
-  return reason.toLowerCase().replace(/^finish_reason_/, "");
-}
-
 export class GenAIInstrumentation extends InstrumentationBase {
   declare protected _config: GenAIInstrumentationConfig;
   /** Tracks already-patched modules to prevent double-patching on repeated calls. */
@@ -292,8 +287,11 @@ export class GenAIInstrumentation extends InstrumentationBase {
                       for (const part of cParts) {
                         if (part.text !== undefined) {
                           const prev = acc[acc.length - 1];
-                          if (prev?.text !== undefined) {
-                            prev.text += part.text; // concatenate consecutive text parts
+                          if (
+                            prev?.text !== undefined &&
+                            !!prev.thought === !!part.thought
+                          ) {
+                            prev.text += part.text; // concatenate consecutive same-type text parts
                           } else {
                             acc.push({ ...part });
                           }
@@ -377,7 +375,7 @@ export class GenAIInstrumentation extends InstrumentationBase {
     const operationType = GEN_AI_OPERATION_NAME_VALUE_GENERATE_CONTENT;
 
     const attributes: Attributes = {
-      [ATTR_GEN_AI_PROVIDER_NAME]: GEN_AI_PROVIDER_NAME_VALUE_GCP_GEMINI,
+      [ATTR_GEN_AI_PROVIDER_NAME]: GEN_AI_PROVIDER_NAME_VALUE_GCP_GEN_AI,
       [ATTR_GEN_AI_OPERATION_NAME]: operationType,
       [ATTR_GEN_AI_REQUEST_MODEL]: model,
     };
@@ -463,18 +461,13 @@ export class GenAIInstrumentation extends InstrumentationBase {
     try {
       const candidates = response.candidates ?? [];
 
-      // Collect finish reasons from all candidates (metadata — always emit).
-      // Use passthrough lowercase for span attribute; deduplicate across candidates.
-      const finishReasons = [
-        ...new Set(
-          candidates
-            .map((c) => c.finishReason)
-            .filter((r) => r != null)
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            .map((r) => geminiReasonToSpanValue(r!)),
-        ),
-      ];
-      if (finishReasons.length > 0) {
+      // Collect finish reasons per-candidate (no dedup — matches Python behaviour).
+      // null/unspecified → ""; set attr only when at least one reason is non-empty.
+      const finishReasons = candidates.map((c) => {
+        const r = c.finishReason;
+        return r != null ? (genaiFinishReasonMap[r] ?? r) : "";
+      });
+      if (finishReasons.some((r) => r !== "")) {
         span.setAttribute(ATTR_GEN_AI_RESPONSE_FINISH_REASONS, finishReasons);
       }
 

packages/instrumentation-google-generativeai/tests/content_parts.test.ts

@@ -87,13 +87,13 @@ describe("mapGenAIContentBlock", () => {
       assert.strictEqual(result.mime_type, "video/mp4");
     });
 
-    it("maps inlineData without mimeType — omits modality and mime_type", () => {
+    it("maps inlineData without mimeType — uses document modality fallback", () => {
       const result = mapGenAIContentBlock({
         inlineData: { data: "rawdata" },
       }) as Record<string, unknown>;
       assert.strictEqual(result.type, "blob");
       assert.strictEqual(result.content, "rawdata");
-      assert.strictEqual(result.modality, undefined);
+      assert.strictEqual(result.modality, "document");
       assert.strictEqual(result.mime_type, undefined);
     });
   });

packages/instrumentation-google-generativeai/tests/finish_reasons.test.ts

@@ -70,8 +70,8 @@ describe("genaiFinishReasonMap", () => {
     );
   });
 
-  it('maps "OTHER" to other', () => {
-    assert.strictEqual(genaiFinishReasonMap["OTHER"], FinishReasons.OTHER);
+  it('maps "OTHER" to error', () => {
+    assert.strictEqual(genaiFinishReasonMap["OTHER"], FinishReasons.ERROR);
   });
 
   it('maps "BLOCKLIST" to content_filter', () => {