Merge pull request #43 from braintrustdata/ark/dev

Author: realark

build.gradle

@@ -3,7 +3,7 @@ plugins {
   id 'maven-publish'
   id 'signing'
   id 'com.diffplug.spotless' version '6.25.0'
-  id 'io.freefair.lombok' version '9.0.0-rc2'
+  id 'io.freefair.lombok' version '9.2.0'
   id 'com.vanniktech.maven.publish' version '0.28.0'
   id 'idea'
   id 'eclipse'
@@ -42,7 +42,7 @@ repositories {
 }
 
 ext {
-  otelVersion = '1.54.1'
+  otelVersion = '1.59.0'
   jacksonVersion = '2.16.1'
   junitVersion = '5.11.4'
   slf4jVersion = '2.0.17'
@@ -56,7 +56,7 @@ dependencies {
   api "io.opentelemetry:opentelemetry-sdk-logs:${otelVersion}"
   implementation "io.opentelemetry:opentelemetry-exporter-otlp:${otelVersion}"
   implementation "io.opentelemetry:opentelemetry-exporter-logging:${otelVersion}"
-  implementation "io.opentelemetry:opentelemetry-semconv:1.30.1-alpha"
+  implementation "io.opentelemetry.semconv:opentelemetry-semconv:1.39.0"
 
   implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
   implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}"
@@ -78,7 +78,7 @@ dependencies {
   // OAI instrumentation
   compileOnly 'com.openai:openai-java:2.8.1'
   testImplementation 'com.openai:openai-java:2.8.1'
-  implementation "io.opentelemetry.instrumentation:opentelemetry-openai-java-1.1:2.19.0-alpha"
+  implementation "io.opentelemetry.instrumentation:opentelemetry-openai-java-1.1:2.25.0-alpha"
 
   // Anthropic Instrumentation
   compileOnly "com.anthropic:anthropic-java:2.8.1"

src/main/java/dev/braintrust/trace/BraintrustTracing.java

@@ -19,7 +19,7 @@
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
 import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ServiceAttributes;
 import java.time.Duration;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
@@ -103,8 +103,8 @@ public static void enable(
         // Create resource first so BraintrustSpanProcessor can access service.name
         var resourceBuilder =
                 Resource.getDefault().toBuilder()
-                        .put(ResourceAttributes.SERVICE_NAME, OTEL_SERVICE_NAME)
-                        .put(ResourceAttributes.SERVICE_VERSION, INSTRUMENTATION_VERSION);
+                        .put(ServiceAttributes.SERVICE_NAME, OTEL_SERVICE_NAME)
+                        .put(ServiceAttributes.SERVICE_VERSION, INSTRUMENTATION_VERSION);
         var resource = resourceBuilder.build();
 
         // spans

src/test/java/dev/braintrust/instrumentation/anthropic/BraintrustAnthropicTest.java

@@ -61,7 +61,8 @@ void testWrapAnthropic() {
 
         // Verify standard GenAI attributes
         assertEquals(
-                "anthropic", span.getAttributes().get(AttributeKey.stringKey("gen_ai.system")));
+                "anthropic",
+                span.getAttributes().get(AttributeKey.stringKey("gen_ai.provider.name")));
         assertEquals(
                 "claude-3-5-haiku-20241022",
                 span.getAttributes().get(AttributeKey.stringKey("gen_ai.request.model")));
@@ -155,7 +156,8 @@ void testWrapAnthropicStreaming() {
 
         // Verify standard GenAI attributes
         assertEquals(
-                "anthropic", span.getAttributes().get(AttributeKey.stringKey("gen_ai.system")));
+                "anthropic",
+                span.getAttributes().get(AttributeKey.stringKey("gen_ai.provider.name")));
         assertEquals(
                 "claude-3-5-haiku-20241022",
                 span.getAttributes().get(AttributeKey.stringKey("gen_ai.request.model")));

src/test/java/dev/braintrust/instrumentation/openai/BraintrustOpenAITest.java

@@ -64,7 +64,8 @@ void testWrapOpenAi() {
         assertEquals("Chat Completion", span.getName());
 
         // Verify essential span attributes
-        assertEquals("openai", span.getAttributes().get(AttributeKey.stringKey("gen_ai.system")));
+        assertEquals(
+                "openai", span.getAttributes().get(AttributeKey.stringKey("gen_ai.provider.name")));
         assertEquals(
                 "gpt-4o-mini",
                 span.getAttributes().get(AttributeKey.stringKey("gen_ai.request.model")));
@@ -152,7 +153,8 @@ void testWrapOpenAiStreaming() {
         var span = spans.get(0);
 
         assertEquals("Chat Completion", span.getName());
-        assertEquals("openai", span.getAttributes().get(AttributeKey.stringKey("gen_ai.system")));
+        assertEquals(
+                "openai", span.getAttributes().get(AttributeKey.stringKey("gen_ai.provider.name")));
         assertNotNull(
                 span.getAttributes()
                         .get(AttributeKey.doubleKey("braintrust.metrics.time_to_first_token")));