Cleanup

Author: anuraaga

instrumentation/openai/openai-java-1.1/javaagent/build.gradle.kts

@@ -19,9 +19,6 @@ dependencies {
   library("com.openai:openai-java:1.1.0")
 
   testImplementation(project(":instrumentation:openai:openai-java-1.1:testing"))
-
-  // needed for latest dep tests
-  testCompileOnly("com.google.errorprone:error_prone_annotations")
 }
 
 tasks {

instrumentation/openai/openai-java-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/openai/v1_1/OpenAIClientInstrumentation.java

@@ -32,7 +32,7 @@ public void transform(TypeTransformer transformer) {
 
   @SuppressWarnings("unused")
   public static class BuildAdvice {
-    @Advice.OnMethodExit
+    @Advice.OnMethodExit(suppress = Throwable.class)
     @Advice.AssignReturned.ToReturned
     public static OpenAIClient onExit(@Advice.Return OpenAIClient client) {
       return TELEMETRY.wrap(client);

instrumentation/openai/openai-java-1.1/library/build.gradle.kts

@@ -7,9 +7,6 @@ dependencies {
   library("com.openai:openai-java:1.1.0")
 
   testImplementation(project(":instrumentation:openai:openai-java-1.1:testing"))
-
-  // needed for latest dep tests
-  testCompileOnly("com.google.errorprone:error_prone_annotations")
 }
 
 tasks {

instrumentation/openai/openai-java-1.1/library/src/main/java/io/opentelemetry/instrumentation/openai/v1_1/ChatCompletionEventsHelper.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.instrumentation.openai.v1_1;
 
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
-import static io.opentelemetry.instrumentation.openai.v1_1.OpenAITelemetryBuilder.INSTRUMENTATION_NAME;
+import static io.opentelemetry.instrumentation.openai.v1_1.GenAiAttributes.GEN_AI_SYSTEM;
 
 import com.openai.models.chat.completions.ChatCompletion;
 import com.openai.models.chat.completions.ChatCompletionAssistantMessageParam;
@@ -19,7 +19,6 @@
 import com.openai.models.chat.completions.ChatCompletionSystemMessageParam;
 import com.openai.models.chat.completions.ChatCompletionToolMessageParam;
 import com.openai.models.chat.completions.ChatCompletionUserMessageParam;
-import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Value;
 import io.opentelemetry.api.logs.LogRecordBuilder;
@@ -34,14 +33,10 @@
 
 final class ChatCompletionEventsHelper {
 
-  private static final Logger eventLogger =
-      GlobalOpenTelemetry.get().getLogsBridge().get(INSTRUMENTATION_NAME);
-
   private static final AttributeKey<String> EVENT_NAME = stringKey("event.name");
-  private static final AttributeKey<String> GEN_AI_SYSTEM = stringKey("gen_ai.system");
 
   public static void emitPromptLogEvents(
-      ChatCompletionCreateParams request, boolean captureMessageContent) {
+      Logger eventLogger, ChatCompletionCreateParams request, boolean captureMessageContent) {
     for (ChatCompletionMessageParam msg : request.messages()) {
       String eventType;
       Map<String, Value<?>> body = new HashMap<>();
@@ -89,7 +84,7 @@ public static void emitPromptLogEvents(
       } else {
         continue;
       }
-      newEvent(eventType).setBody(Value.of(body)).emit();
+      newEvent(eventLogger, eventType).setBody(Value.of(body)).emit();
     }
   }
 
@@ -165,7 +160,7 @@ private static String joinContentParts(List<ChatCompletionContentPartText> conte
   }
 
   public static void emitCompletionLogEvents(
-      ChatCompletion completion, boolean captureMessageContent) {
+      Logger eventLogger, ChatCompletion completion, boolean captureMessageContent) {
     for (ChatCompletion.Choice choice : completion.choices()) {
       ChatCompletionMessage choiceMsg = choice.message();
       Map<String, Value<?>> message = new HashMap<>();
@@ -184,11 +179,12 @@ public static void emitCompletionLogEvents(
                             .collect(Collectors.toList())));
               });
       emitCompletionLogEvent(
-          choice.index(), choice.finishReason().toString(), Value.of(message), null);
+          eventLogger, choice.index(), choice.finishReason().toString(), Value.of(message), null);
     }
   }
 
   public static void emitCompletionLogEvent(
+      Logger eventLogger,
       long index,
       String finishReason,
       Value<?> eventMessageObject,
@@ -197,14 +193,14 @@ public static void emitCompletionLogEvent(
     body.put("finish_reason", Value.of(finishReason));
     body.put("index", Value.of(index));
     body.put("message", eventMessageObject);
-    LogRecordBuilder builder = newEvent("gen_ai.choice").setBody(Value.of(body));
+    LogRecordBuilder builder = newEvent(eventLogger, "gen_ai.choice").setBody(Value.of(body));
     if (contextOverride != null) {
       builder.setContext(contextOverride);
     }
     builder.emit();
   }
 
-  private static LogRecordBuilder newEvent(String name) {
+  private static LogRecordBuilder newEvent(Logger eventLogger, String name) {
     return eventLogger
         .logRecordBuilder()
         .setAttribute(EVENT_NAME, name)

instrumentation/openai/openai-java-1.1/library/src/main/java/io/opentelemetry/instrumentation/openai/v1_1/GenAiAttributes.java

@@ -5,8 +5,14 @@
 
 package io.opentelemetry.instrumentation.openai.v1_1;
 
+import static io.opentelemetry.api.common.AttributeKey.stringKey;
+
+import io.opentelemetry.api.common.AttributeKey;
+
 // copied from GenAiIncubatingAttributes
 final class GenAiAttributes {
+  static final AttributeKey<String> GEN_AI_SYSTEM = stringKey("gen_ai.system");
+
   static final class GenAiOperationNameIncubatingValues {
     static final String CHAT = "chat";
 

instrumentation/openai/openai-java-1.1/library/src/main/java/io/opentelemetry/instrumentation/openai/v1_1/InstrumentationSettings.java

@@ -9,6 +9,7 @@
 import com.openai.models.chat.completions.ChatCompletion;
 import com.openai.models.chat.completions.ChatCompletionCreateParams;
 import com.openai.services.blocking.chat.ChatCompletionService;
+import io.opentelemetry.api.logs.Logger;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
@@ -18,14 +19,17 @@ final class InstrumentedChatCompletionService
     extends DelegatingInvocationHandler<ChatCompletionService, InstrumentedChatCompletionService> {
 
   private final Instrumenter<ChatCompletionCreateParams, ChatCompletion> instrumenter;
+  private final Logger eventLogger;
   private final boolean captureMessageContent;
 
   InstrumentedChatCompletionService(
       ChatCompletionService delegate,
       Instrumenter<ChatCompletionCreateParams, ChatCompletion> instrumenter,
+      Logger eventLogger,
       boolean captureMessageContent) {
     super(delegate);
     this.instrumenter = instrumenter;
+    this.eventLogger = eventLogger;
     this.captureMessageContent = captureMessageContent;
   }
 
@@ -76,9 +80,9 @@ private ChatCompletion create(
   private ChatCompletion createWithLogs(
       ChatCompletionCreateParams chatCompletionCreateParams, RequestOptions requestOptions) {
     ChatCompletionEventsHelper.emitPromptLogEvents(
-        chatCompletionCreateParams, captureMessageContent);
+        eventLogger, chatCompletionCreateParams, captureMessageContent);
     ChatCompletion result = delegate.create(chatCompletionCreateParams, requestOptions);
-    ChatCompletionEventsHelper.emitCompletionLogEvents(result, captureMessageContent);
+    ChatCompletionEventsHelper.emitCompletionLogEvents(eventLogger, result, captureMessageContent);
     return result;
   }
 }

instrumentation/openai/openai-java-1.1/library/src/main/java/io/opentelemetry/instrumentation/openai/v1_1/InstrumentedChatCompletionService.java

@@ -8,21 +8,25 @@
 import com.openai.models.chat.completions.ChatCompletion;
 import com.openai.models.chat.completions.ChatCompletionCreateParams;
 import com.openai.services.blocking.ChatService;
+import io.opentelemetry.api.logs.Logger;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import java.lang.reflect.Method;
 
 final class InstrumentedChatService
     extends DelegatingInvocationHandler<ChatService, InstrumentedChatService> {
 
   private final Instrumenter<ChatCompletionCreateParams, ChatCompletion> instrumenter;
+  private final Logger eventLogger;
   private final boolean captureMessageContent;
 
   public InstrumentedChatService(
       ChatService delegate,
       Instrumenter<ChatCompletionCreateParams, ChatCompletion> instrumenter,
+      Logger eventLogger,
       boolean captureMessageContent) {
     super(delegate);
     this.instrumenter = instrumenter;
+    this.eventLogger = eventLogger;
     this.captureMessageContent = captureMessageContent;
   }
 
@@ -37,7 +41,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
     Class<?>[] parameterTypes = method.getParameterTypes();
     if (methodName.equals("completions") && parameterTypes.length == 0) {
       return new InstrumentedChatCompletionService(
-              delegate.completions(), instrumenter, captureMessageContent)
+              delegate.completions(), instrumenter, eventLogger, captureMessageContent)
           .createProxy();
     }
     return super.invoke(proxy, method, args);

instrumentation/openai/openai-java-1.1/library/src/main/java/io/opentelemetry/instrumentation/openai/v1_1/InstrumentedChatService.java

@@ -8,22 +8,25 @@
 import com.openai.client.OpenAIClient;
 import com.openai.models.chat.completions.ChatCompletion;
 import com.openai.models.chat.completions.ChatCompletionCreateParams;
+import io.opentelemetry.api.logs.Logger;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import java.lang.reflect.Method;
 
-@SuppressWarnings("IdentifierName") // Want to match library's convention
-final class InstrumentedOpenAIClient
-    extends DelegatingInvocationHandler<OpenAIClient, InstrumentedOpenAIClient> {
+final class InstrumentedOpenAiClient
+    extends DelegatingInvocationHandler<OpenAIClient, InstrumentedOpenAiClient> {
 
   private final Instrumenter<ChatCompletionCreateParams, ChatCompletion> chatInstrumenter;
+  private final Logger eventLogger;
   private final boolean captureMessageContent;
 
-  InstrumentedOpenAIClient(
+  InstrumentedOpenAiClient(
       OpenAIClient delegate,
       Instrumenter<ChatCompletionCreateParams, ChatCompletion> chatInstrumenter,
+      Logger eventLogger,
       boolean captureMessageContent) {
     super(delegate);
     this.chatInstrumenter = chatInstrumenter;
+    this.eventLogger = eventLogger;
     this.captureMessageContent = captureMessageContent;
   }
 
@@ -37,7 +40,8 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
     String methodName = method.getName();
     Class<?>[] parameterTypes = method.getParameterTypes();
     if (methodName.equals("chat") && parameterTypes.length == 0) {
-      return new InstrumentedChatService(delegate.chat(), chatInstrumenter, captureMessageContent)
+      return new InstrumentedChatService(
+              delegate.chat(), chatInstrumenter, eventLogger, captureMessageContent)
           .createProxy();
     }
     return super.invoke(proxy, method, args);

instrumentation/openai/openai-java-1.1/library/src/main/java/io/opentelemetry/instrumentation/openai/v1_1/InstrumentedOpenAIClient.java renamed to instrumentation/openai/openai-java-1.1/library/src/main/java/io/opentelemetry/instrumentation/openai/v1_1/InstrumentedOpenAiClient.java

@@ -9,11 +9,12 @@
 import com.openai.models.chat.completions.ChatCompletion;
 import com.openai.models.chat.completions.ChatCompletionCreateParams;
 import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.logs.Logger;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 
 /** Entrypoint for instrumenting OpenAI clients. */
 @SuppressWarnings("IdentifierName") // Want to match library's convention
-public class OpenAITelemetry {
+public final class OpenAITelemetry {
   /** Returns a new {@link OpenAITelemetry} configured with the given {@link OpenTelemetry}. */
   public static OpenAITelemetry create(OpenTelemetry openTelemetry) {
     return builder(openTelemetry).build();
@@ -28,18 +29,23 @@ public static OpenAITelemetryBuilder builder(OpenTelemetry openTelemetry) {
 
   private final Instrumenter<ChatCompletionCreateParams, ChatCompletion> chatInstrumenter;
 
+  private final Logger eventLogger;
+
   private final boolean captureMessageContent;
 
   OpenAITelemetry(
       Instrumenter<ChatCompletionCreateParams, ChatCompletion> chatInstrumenter,
+      Logger eventLogger,
       boolean captureMessageContent) {
     this.chatInstrumenter = chatInstrumenter;
+    this.eventLogger = eventLogger;
     this.captureMessageContent = captureMessageContent;
   }
 
   /** Wraps the provided OpenAIClient, enabling telemetry for it. */
   public OpenAIClient wrap(OpenAIClient client) {
-    return new InstrumentedOpenAIClient(client, chatInstrumenter, captureMessageContent)
+    return new InstrumentedOpenAiClient(
+            client, chatInstrumenter, eventLogger, captureMessageContent)
         .createProxy();
   }
 }