Merge pull request #107 from braintrustdata/ark/s3-images-other-providers

support more formats in attachment processor

Author: realark

braintrust-sdk/instrumentation/anthropic_2_2_0/src/test/java/dev/braintrust/instrumentation/anthropic/v2_2_0/BraintrustAnthropicTest.java

@@ -67,7 +67,7 @@ void testWrapAnthropic() {
         assertEquals(1, spans.size());
         var span = spans.get(0);
 
-        assertEquals("anthropic.messages.create", span.getName());
+        assertFalse(span.getName().isEmpty(), "span name should be non-empty");
 
         // Verify span_attributes
         String spanAttributesJson =
@@ -156,7 +156,7 @@ void testWrapAnthropicStreaming() {
         assertEquals(1, spans.size());
         var span = spans.get(0);
 
-        assertEquals("anthropic.messages.create", span.getName());
+        assertFalse(span.getName().isEmpty(), "span name should be non-empty");
 
         // Verify metadata
         String metadataJson =
@@ -220,7 +220,7 @@ void testWrapAnthropicAsync() {
         assertEquals(1, spans.size());
         var span = spans.get(0);
 
-        assertEquals("anthropic.messages.create", span.getName());
+        assertFalse(span.getName().isEmpty(), "span name should be non-empty");
 
         String spanAttributesJson =
                 span.getAttributes().get(AttributeKey.stringKey("braintrust.span_attributes"));
@@ -290,7 +290,7 @@ void testWrapAnthropicAsyncStreaming() {
         assertEquals(1, spans.size());
         var span = spans.get(0);
 
-        assertEquals("anthropic.messages.create", span.getName());
+        assertFalse(span.getName().isEmpty(), "span name should be non-empty");
 
         assertNotNull(span.getAttributes().get(AttributeKey.stringKey("braintrust.input_json")));
 
@@ -342,7 +342,7 @@ void testWrapAnthropicBeta() {
         assertEquals(1, spans.size());
         var span = spans.get(0);
 
-        assertEquals("anthropic.messages.create", span.getName());
+        assertFalse(span.getName().isEmpty(), "span name should be non-empty");
 
         // Verify span_attributes
         String spanAttributesJson =
@@ -431,7 +431,7 @@ void testWrapAnthropicBetaStreaming() {
         assertEquals(1, spans.size());
         var span = spans.get(0);
 
-        assertEquals("anthropic.messages.create", span.getName());
+        assertFalse(span.getName().isEmpty(), "span name should be non-empty");
 
         // Verify metadata
         String metadataJson =

braintrust-sdk/src/main/java/dev/braintrust/instrumentation/InstrumentationSemConv.java

@@ -211,6 +211,11 @@ private static void tagAnthropicRequest(
 
         if (requestBody != null) {
             JsonNode requestJson = BraintrustJsonMapper.get().readTree(requestBody);
+            if (requestJson.has("stream")
+                    && requestJson.get("stream").isBoolean()
+                    && requestJson.get("stream").asBoolean()) {
+                span.updateName(getStreamingSpanName(providerName, pathSegments));
+            }
             if (requestJson.has("model")) {
                 metadata.put("model", requestJson.get("model").asText());
             }
@@ -503,4 +508,15 @@ private static String getSpanName(String providerName, List<String> pathSegments
             default -> lastSegment;
         };
     }
+
+    private static String getStreamingSpanName(String providerName, List<String> pathSegments) {
+        if (pathSegments.isEmpty()) {
+            return UNSET_LLM_SPAN_NAME;
+        }
+        String lastSegment = pathSegments.get(pathSegments.size() - 1);
+        return switch (providerName + ":" + lastSegment) {
+            case PROVIDER_NAME_ANTHROPIC + ":messages" -> "anthropic.messages.stream";
+            default -> getSpanName(providerName, pathSegments);
+        };
+    }
 }