More cleanup

Author: anuraaga

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

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.openai.v1_1;
 
-import static io.opentelemetry.javaagent.instrumentation.openai.v1_1.OpenAISingletons.TELEMETRY;
+import static io.opentelemetry.javaagent.instrumentation.openai.v1_1.OpenAiSingletons.TELEMETRY;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
 
@@ -16,8 +16,7 @@
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
 
-@SuppressWarnings("IdentifierName") // Want to match library's convention
-public class OpenAIClientInstrumentation implements TypeInstrumentation {
+public class OpenAiClientInstrumentation implements TypeInstrumentation {
   @Override
   public ElementMatcher<TypeDescription> typeMatcher() {
     return named("com.openai.client.okhttp.OpenAIOkHttpClient$Builder");
@@ -27,7 +26,7 @@ public ElementMatcher<TypeDescription> typeMatcher() {
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
         named("build").and(returns(named("com.openai.client.OpenAIClient"))),
-        OpenAIClientInstrumentation.class.getName() + "$BuildAdvice");
+        OpenAiClientInstrumentation.class.getName() + "$BuildAdvice");
   }
 
   @SuppressWarnings("unused")

instrumentation/openai/openai-java-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/openai/v1_1/OpenAIInstrumentationModule.java renamed to instrumentation/openai/openai-java-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/openai/v1_1/OpenAiInstrumentationModule.java

@@ -15,9 +15,8 @@
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
-@SuppressWarnings("IdentifierName") // Want to match library's convention
-public class OpenAIInstrumentationModule extends InstrumentationModule {
-  public OpenAIInstrumentationModule() {
+public class OpenAiInstrumentationModule extends InstrumentationModule {
+  public OpenAiInstrumentationModule() {
     super("openai-java", "openai-java-1.1", "openai");
   }
 
@@ -28,6 +27,6 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
 
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
-    return singletonList(new OpenAIClientInstrumentation());
+    return singletonList(new OpenAiClientInstrumentation());
   }
 }

instrumentation/openai/openai-java-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/openai/v1_1/OpenAISingletons.java renamed to instrumentation/openai/openai-java-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/openai/v1_1/OpenAiSingletons.java

@@ -9,14 +9,13 @@
 import io.opentelemetry.instrumentation.openai.v1_1.OpenAITelemetry;
 import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
 
-@SuppressWarnings("IdentifierName") // Want to match library's convention
-public final class OpenAISingletons {
+public final class OpenAiSingletons {
   public static final OpenAITelemetry TELEMETRY =
       OpenAITelemetry.builder(GlobalOpenTelemetry.get())
           .setCaptureMessageContent(
               AgentInstrumentationConfig.get()
                   .getBoolean("otel.instrumentation.genai.capture-message-content", false))
           .build();
 
-  private OpenAISingletons() {}
+  private OpenAiSingletons() {}
 }