Fix merge

Author: anuraaga

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

@@ -61,11 +61,4 @@ public OpenAIClientAsync wrap(OpenAIClientAsync client) {
             client, chatInstrumenter, embeddingsInstrumenter, eventLogger, captureMessageContent)
         .createProxy();
   }
-
-  /** Wraps the provided OpenAIClientAsync, enabling telemetry for it. */
-  public OpenAIClientAsync wrap(OpenAIClientAsync client) {
-    return new InstrumentedOpenAiClientAsync(
-            client, chatInstrumenter, eventLogger, captureMessageContent)
-        .createProxy();
-  }
 }

instrumentation/openai/openai-java-1.1/testing/src/main/java/io/opentelemetry/instrumentation/openai/v1_1/AbstractChatTest.java

@@ -155,82 +155,6 @@ protected final List<ChatCompletionChunk> doCompletionsStreaming(
     throw new AssertionError();
   }
 
-  @Parameter TestType testType;
-
-  protected final ChatCompletion doCompletions(ChatCompletionCreateParams params) {
-    return doCompletions(params, getClient(), getClientAsync());
-  }
-
-  protected final ChatCompletion doCompletions(
-      ChatCompletionCreateParams params, OpenAIClient client, OpenAIClientAsync clientAsync) {
-    switch (testType) {
-      case SYNC:
-        return client.chat().completions().create(params);
-      case SYNC_FROM_ASYNC:
-        return clientAsync.sync().chat().completions().create(params);
-      case ASYNC:
-      case ASYNC_FROM_SYNC:
-        OpenAIClientAsync cl = testType == TestType.ASYNC ? clientAsync : client.async();
-        try {
-          return cl.chat()
-              .completions()
-              .create(params)
-              .thenApply(
-                  res -> {
-                    assertThat(Span.fromContextOrNull(Context.current())).isNull();
-                    return res;
-                  })
-              .join();
-        } catch (CompletionException e) {
-          if (e.getCause() instanceof OpenAIIoException) {
-            throw ((OpenAIIoException) e.getCause());
-          }
-          throw e;
-        }
-    }
-    throw new AssertionError();
-  }
-
-  protected final List<ChatCompletionChunk> doCompletionsStreaming(
-      ChatCompletionCreateParams params) {
-    return doCompletionsStreaming(params, getClient(), getClientAsync());
-  }
-
-  protected final List<ChatCompletionChunk> doCompletionsStreaming(
-      ChatCompletionCreateParams params, OpenAIClient client, OpenAIClientAsync clientAsync) {
-    switch (testType) {
-      case SYNC:
-        try (StreamResponse<ChatCompletionChunk> result =
-            client.chat().completions().createStreaming(params)) {
-          return result.stream().collect(Collectors.toList());
-        }
-      case SYNC_FROM_ASYNC:
-        try (StreamResponse<ChatCompletionChunk> result =
-            clientAsync.sync().chat().completions().createStreaming(params)) {
-          return result.stream().collect(Collectors.toList());
-        }
-      case ASYNC:
-      case ASYNC_FROM_SYNC:
-        {
-          OpenAIClientAsync cl = testType == TestType.ASYNC ? clientAsync : client.async();
-          AsyncStreamResponse<ChatCompletionChunk> stream =
-              cl.chat().completions().createStreaming(params);
-          List<ChatCompletionChunk> result = new ArrayList<>();
-          stream.subscribe(result::add);
-          try {
-            stream.onCompleteFuture().join();
-          } catch (CompletionException e) {
-            if (e.getCause() instanceof OpenAIIoException) {
-              throw ((OpenAIIoException) e.getCause());
-            }
-            throw e;
-          }
-          return result;
-        }
-    }
-    throw new AssertionError();
-  }
-
   @Test
   void basic() {
     ChatCompletionCreateParams params =