Skip to content

Commit 7b1e3da

Browse files
authored
Review fixes for openai-java-1.1:testing (open-telemetry#17566)
Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
1 parent 53d7c3c commit 7b1e3da

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,16 @@
3131
import io.opentelemetry.api.trace.Span;
3232
import io.opentelemetry.api.trace.SpanKind;
3333
import io.opentelemetry.context.Context;
34+
import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
3435
import java.util.concurrent.CompletionException;
3536
import org.junit.jupiter.api.Test;
37+
import org.junit.jupiter.api.extension.RegisterExtension;
3638

3739
public abstract class AbstractEmbeddingsTest extends AbstractOpenAiTest {
3840
private static final String MODEL = "text-embedding-3-small";
3941

42+
@RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
43+
4044
protected final CreateEmbeddingResponse doEmbeddings(EmbeddingCreateParams request) {
4145
return doEmbeddings(request, getClient(), getClientAsync());
4246
}
@@ -218,6 +222,8 @@ void connectionError() {
218222
.apiKey("testing")
219223
.maxRetries(0)
220224
.build());
225+
cleanup.deferCleanup(client::close);
226+
cleanup.deferCleanup(clientAsync::close);
221227

222228
EmbeddingCreateParams request =
223229
EmbeddingCreateParams.builder()

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ public ChatCompletionTool chatCompletionTool(FunctionDefinition functionDefiniti
3030
@Override
3131
public MessageToolCallBuilder messageToolCallBuilder() {
3232
return new MessageToolCallBuilder() {
33-
final ChatCompletionMessageToolCall.Builder builder = ChatCompletionMessageToolCall.builder();
33+
private final ChatCompletionMessageToolCall.Builder builder =
34+
ChatCompletionMessageToolCall.builder();
3435

3536
@Override
3637
public MessageToolCallBuilder id(String id) {
@@ -57,7 +58,7 @@ public FunctionBuilder messageToolCallFunctionBuilder() {
5758
}
5859

5960
private static class FunctionBuilderImpl implements FunctionBuilder {
60-
final ChatCompletionMessageToolCall.Function.Builder builder =
61+
private final ChatCompletionMessageToolCall.Function.Builder builder =
6162
ChatCompletionMessageToolCall.Function.builder();
6263

6364
@Override

0 commit comments

Comments
 (0)