Add support for openAI client 1.1+, drop support for older versions (#607)

Author: JonasKunz

CHANGELOG.next-release.md

@@ -1,3 +1,4 @@
 * Switched the default of `otel.exporter.otlp.metrics.temporality.preference` from `CUMULATIVE` to `DELTA` to improve dashboarding experience with Kibana. If you want to restore the previous behaviour, you can manually override `otel.exporter.otlp.metrics.temporality.preference` to `CUMULATIVE` via JVM-properties or environment variables. - #583
- * Set elastic-specific User-Agent header for OTLP exporters - #593
-* Enable Azure resource provider by default with `otel.resource.providers.azure.enabled` = `true`.
+* Set elastic-specific User-Agent header for OTLP exporters - #593
+* Add support for openAI client 1.1+, drop support for older versions - #607
+* Enable Azure resource provider by default with `otel.resource.providers.azure.enabled` = `true`. - #596

custom/build.gradle.kts

@@ -3,8 +3,7 @@ plugins {
 }
 
 val instrumentations = listOf<String>(
-  ":instrumentation:openai-client-instrumentation:instrumentation-0.8",
-  ":instrumentation:openai-client-instrumentation:instrumentation-0.14"
+  ":instrumentation:openai-client-instrumentation:instrumentation-1.1"
 )
 
 dependencies {

examples/openai/build.gradle.kts

@@ -14,7 +14,7 @@ repositories {
 
 dependencies {
     implementation(platform("org.slf4j:slf4j-bom:2.0.16"))
-    implementation("com.openai:openai-java:0.13.0")
+    implementation("com.openai:openai-java:1.2.0")
     implementation("org.slf4j:slf4j-simple")
 }
 

examples/openai/src/main/java/openai/example/Chat.java

@@ -2,25 +2,27 @@
 
 import com.openai.client.OpenAIClient;
 import com.openai.client.okhttp.OpenAIOkHttpClient;
-import com.openai.models.*;
+import com.openai.models.chat.completions.ChatCompletion;
+import com.openai.models.chat.completions.ChatCompletionCreateParams;
+import com.openai.models.chat.completions.ChatCompletionUserMessageParam;
 
 
 final class Chat {
 
-    public static void main(String[] args) {
-        String chatModel = System.getenv().getOrDefault("CHAT_MODEL", "gpt-4o-mini");
+  public static void main(String[] args) {
+    String chatModel = System.getenv().getOrDefault("CHAT_MODEL", "gpt-4o-mini");
 
-        OpenAIClient client = OpenAIOkHttpClient.fromEnv();
+    OpenAIClient client = OpenAIOkHttpClient.fromEnv();
 
-        String message = "Answer in up to 3 words: Which ocean contains Bouvet Island?";
-        ChatCompletionCreateParams params = ChatCompletionCreateParams.builder()
-                .addMessage(ChatCompletionUserMessageParam.builder()
-                    .content(message)
-                    .build())
-                .model(chatModel)
-                .build();
+    String message = "Answer in up to 3 words: Which ocean contains Bouvet Island?";
+    ChatCompletionCreateParams params = ChatCompletionCreateParams.builder()
+        .addMessage(ChatCompletionUserMessageParam.builder()
+            .content(message)
+            .build())
+        .model(chatModel)
+        .build();
 
-        ChatCompletion chatCompletion = client.chat().completions().create(params);
-        System.out.println(chatCompletion.choices().get(0).message().content().get());
-    }
+    ChatCompletion chatCompletion = client.chat().completions().create(params);
+    System.out.println(chatCompletion.choices().get(0).message().content().get());
+  }
 }

examples/openai/src/main/java/openai/example/Embeddings.java

@@ -4,7 +4,8 @@
 
 import com.openai.client.OpenAIClient;
 import com.openai.client.okhttp.OpenAIOkHttpClient;
-import com.openai.models.*;
+import com.openai.models.embeddings.Embedding;
+import com.openai.models.embeddings.EmbeddingCreateParams;
 
 final class Embeddings {
 

gradle/libs.versions.toml

@@ -77,7 +77,7 @@ ant = "org.apache.ant:ant:1.10.15"
 asm = "org.ow2.asm:asm:9.8"
 
 # Instrumented libraries
-openaiClient = "com.openai:openai-java:0.33.0"
+openaiClient = "com.openai:openai-java:1.2.0"
 
 [bundles]