address PR comments

Author: nayeem-kamal

dd-java-agent/instrumentation/openai/build.gradle renamed to dd-java-agent/instrumentation/openai-client/build.gradle

@@ -14,7 +14,7 @@ apply from: "$rootDir/gradle/java.gradle"
 addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {
-  compileOnly(group: 'com.openai', name: 'openai-java', version: '2.8.1')
+  compileOnly(group: 'com.openai', name: 'openai-java', version: '2.8.0')
 
   testImplementation(group: 'com.openai', name: 'openai-java') {
     version {

dd-java-agent/instrumentation/openai/gradle.lockfile renamed to dd-java-agent/instrumentation/openai-client/gradle.lockfile

@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.openai;
+package datadog.trace.instrumentation.openaiclient;
 
 import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface;
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
@@ -24,7 +24,7 @@
 public class ChatCompletionServiceInstrumentation extends InstrumenterModule.Tracing
     implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
   public ChatCompletionServiceInstrumentation() {
-    super("openai-client");
+    super("openai-client", "openai-java", "openai-2.8");
   }
 
   @Override

dd-java-agent/instrumentation/openai/src/main/java/datadog/trace/instrumentation/openai/ChatCompletionServiceInstrumentation.java renamed to dd-java-agent/instrumentation/openai-client/src/main/java/datadog/trace/instrumentation/openaiclient/ChatCompletionServiceInstrumentation.java

@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.openai;
+package datadog.trace.instrumentation.openaiclient;
 
 import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface;
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
@@ -22,7 +22,7 @@
 public class CompletionServiceInstrumentation extends InstrumenterModule.Tracing
     implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
   public CompletionServiceInstrumentation() {
-    super("openai-client");
+    super("openai-client", "openai-java", "openai-2.8");
   }
 
   @Override

dd-java-agent/instrumentation/openai/src/main/java/datadog/trace/instrumentation/openai/CompletionServiceInstrumentation.java renamed to dd-java-agent/instrumentation/openai-client/src/main/java/datadog/trace/instrumentation/openaiclient/CompletionServiceInstrumentation.java

@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.openai;
+package datadog.trace.instrumentation.openaiclient;
 
 import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface;
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
@@ -22,7 +22,7 @@ public class EmbeddingServiceInstrumentation extends InstrumenterModule.Tracing
     implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
   public EmbeddingServiceInstrumentation() {
-    super("openai", "openai-java");
+    super("openai", "openai-java", "openai-2.8");
   }
 
   @Override

dd-java-agent/instrumentation/openai/src/main/java/datadog/trace/instrumentation/openai/EmbeddingServiceInstrumentation.java renamed to dd-java-agent/instrumentation/openai-client/src/main/java/datadog/trace/instrumentation/openaiclient/EmbeddingServiceInstrumentation.java

@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.openai;
+package datadog.trace.instrumentation.openaiclient;
 
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan;
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;

dd-java-agent/instrumentation/openai/src/main/java/datadog/trace/instrumentation/openai/OpenAIClientDecorator.java renamed to dd-java-agent/instrumentation/openai-client/src/main/java/datadog/trace/instrumentation/openaiclient/OpenAIClientDecorator.java

@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.openai;
+package datadog.trace.instrumentation.openaiclient;
 
 import com.openai.azure.credential.AzureApiKeyCredential;
 import com.openai.core.ClientOptions;
@@ -33,10 +33,11 @@ public static OpenAIClientInfo fromClientOptions(ClientOptions options) {
         info.setApiKey(((BearerTokenCredential) options.credential()).token());
       } else if (options.credential() instanceof AzureApiKeyCredential) {
         info.setApiKey(((AzureApiKeyCredential) options.credential()).apiKey());
-      } else info.setApiKey(null);
+      } else {
+        info.setApiKey(null);
+      }
 
     } catch (Exception e) {
-      // TODO: returns empty info for now
       return info;
     }
 

dd-java-agent/instrumentation/openai/src/main/java/datadog/trace/instrumentation/openai/OpenAIClientInfo.java renamed to dd-java-agent/instrumentation/openai-client/src/main/java/datadog/trace/instrumentation/openaiclient/OpenAIClientInfo.java

@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.openai;
+package datadog.trace.instrumentation.openaiclient;
 
 import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -20,7 +20,7 @@
 public class OpenAIClientInstrumentation extends InstrumenterModule.Tracing
     implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
   public OpenAIClientInstrumentation() {
-    super("openai-client");
+    super("openai-client", "openai-java", "openai-2.8");
   }
 
   @Override

dd-java-agent/instrumentation/openai/src/main/java/datadog/trace/instrumentation/openai/OpenAIClientInstrumentation.java renamed to dd-java-agent/instrumentation/openai-client/src/main/java/datadog/trace/instrumentation/openaiclient/OpenAIClientInstrumentation.java

@@ -430,7 +430,7 @@ include ':dd-java-agent:instrumentation:ognl-appsec'
 include ':dd-java-agent:instrumentation:opensearch'
 include ':dd-java-agent:instrumentation:opensearch:rest'
 include ':dd-java-agent:instrumentation:opensearch:transport'
-include ':dd-java-agent:instrumentation:openai'
+include ':dd-java-agent:instrumentation:openai-client'
 include ':dd-java-agent:instrumentation:opentelemetry:opentelemetry-0.3'
 include ':dd-java-agent:instrumentation:opentelemetry:opentelemetry-1.4'
 include ':dd-java-agent:instrumentation:opentelemetry:opentelemetry-annotations-1.20'