fix(tracing): upgrade to otel 2.0+

Author: MichaelDoyle

genkit-tools/common/src/types/trace.ts

@@ -97,7 +97,16 @@ export const LinkSchema = z.object({
 });
 
 /**
- * Zod schema for instrumentation library.
+ * Zod schema for instrumentation scope.
+ */
+export const InstrumentationScopeSchema = z.object({
+  name: z.string().readonly(),
+  version: z.string().optional().readonly(),
+  schemaUrl: z.string().optional().readonly(),
+});
+
+/**
+ * Zod schema for legacy instrumentation library.
  */
 export const InstrumentationLibrarySchema = z.object({
   name: z.string().readonly(),
@@ -118,7 +127,8 @@ export const SpanDataSchema = z
     attributes: z.record(z.string(), z.unknown()),
     displayName: z.string(),
     links: z.array(LinkSchema).optional(),
-    instrumentationLibrary: InstrumentationLibrarySchema,
+    instrumentationLibrary: InstrumentationLibrarySchema.optional(),
+    instrumentationScope: InstrumentationScopeSchema.optional(),
     spanKind: z.string(),
     sameProcessAsParentSpan: z.object({ value: z.boolean() }).optional(),
     status: SpanStatusSchema.optional(),

genkit-tools/genkit-schema.json

@@ -1404,6 +1404,24 @@
       ],
       "additionalProperties": false
     },
+    "InstrumentationScope": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "version": {
+          "type": "string"
+        },
+        "schemaUrl": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "name"
+      ],
+      "additionalProperties": false
+    },
     "Link": {
       "type": "object",
       "properties": {
@@ -1500,6 +1518,9 @@
         "instrumentationLibrary": {
           "$ref": "#/$defs/InstrumentationLibrary"
         },
+        "instrumentationScope": {
+          "$ref": "#/$defs/InstrumentationScope"
+        },
         "spanKind": {
           "type": "string"
         },
@@ -1541,7 +1562,6 @@
         "endTime",
         "attributes",
         "displayName",
-        "instrumentationLibrary",
         "spanKind"
       ],
       "additionalProperties": false

genkit-tools/telemetry-server/src/utils/otlp.ts

@@ -120,7 +120,7 @@ function toSpanData(span: OtlpSpan, scope: OtlpScopeSpan['scope']): SpanData {
     endTime: toMillis(span.endTimeUnixNano),
     displayName: span.name,
     attributes,
-    instrumentationLibrary: {
+    instrumentationScope: {
       name: scope.name,
       version: scope.version,
     },

js/core/src/tracing/types.ts

@@ -74,6 +74,12 @@ export const LinkSchema = z.object({
   droppedAttributesCount: z.number().optional(),
 });
 
+export const InstrumentationLibrarySchema = z.object({
+  name: z.string().readonly(),
+  version: z.string().optional().readonly(),
+  schemaUrl: z.string().optional().readonly(),
+});
+
 export const InstrumentationScopeSchema = z.object({
   name: z.string().readonly(),
   version: z.string().optional().readonly(),
@@ -89,7 +95,8 @@ export const SpanDataSchema = z.object({
   attributes: z.record(z.string(), z.any()),
   displayName: z.string(),
   links: z.array(LinkSchema).optional(),
-  instrumentationScope: InstrumentationScopeSchema,
+  instrumentationLibrary: InstrumentationLibrarySchema.optional(),
+  instrumentationScope: InstrumentationScopeSchema.optional(),
   spanKind: z.string(),
   sameProcessAsParentSpan: z.object({ value: z.boolean() }).optional(),
   status: SpanStatusSchema.optional(),