diff --git a/instrumentation/openai/openai-java-1.1/testing/src/main/java/io/opentelemetry/instrumentation/openai/v1_1/AbstractChatTest.java b/instrumentation/openai/openai-java-1.1/testing/src/main/java/io/opentelemetry/instrumentation/openai/v1_1/AbstractChatTest.java index 315e6c62d753..b8ee95c14b85 100644 --- a/instrumentation/openai/openai-java-1.1/testing/src/main/java/io/opentelemetry/instrumentation/openai/v1_1/AbstractChatTest.java +++ b/instrumentation/openai/openai-java-1.1/testing/src/main/java/io/opentelemetry/instrumentation/openai/v1_1/AbstractChatTest.java @@ -63,6 +63,7 @@ import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.context.Context; import io.opentelemetry.instrumentation.openai.TestHelper; +import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -73,8 +74,10 @@ import java.util.concurrent.CompletionException; import java.util.stream.Collectors; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; public abstract class AbstractChatTest extends AbstractOpenAiTest { + protected static final AttributeKey EVENT_NAME = AttributeKey.stringKey("event.name"); protected static final String TEST_CHAT_MODEL = "gpt-4o-mini"; @@ -82,6 +85,8 @@ public abstract class AbstractChatTest extends AbstractOpenAiTest { protected static final String TEST_CHAT_INPUT = "Answer in up to 3 words: Which ocean contains Bouvet Island?"; + @RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create(); + protected final ChatCompletion doCompletions(ChatCompletionCreateParams params) { return doCompletions(params, getClient(), getClientAsync()); } @@ -878,6 +883,8 @@ void connectionError() { .apiKey("testing") .maxRetries(0) .build()); + cleanup.deferCleanup(client::close); + cleanup.deferCleanup(clientAsync::close); ChatCompletionCreateParams params = ChatCompletionCreateParams.builder() @@ -1583,6 +1590,8 @@ void streamConnectionError() { .apiKey("testing") .maxRetries(0) .build()); + cleanup.deferCleanup(client::close); + cleanup.deferCleanup(clientAsync::close); ChatCompletionCreateParams params = ChatCompletionCreateParams.builder()