Skip to content

Commit a2009d7

Browse files
authored
Fix flaky openai test (#15185)
1 parent f17f87e commit a2009d7

File tree

1 file changed

+9
-0
lines changed
  • instrumentation/openai/openai-java-1.1/testing/src/main/java/io/opentelemetry/instrumentation/openai/v1_1

1 file changed

+9
-0
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
import io.opentelemetry.api.trace.SpanContext;
6464
import io.opentelemetry.context.Context;
6565
import io.opentelemetry.instrumentation.openai.TestHelper;
66+
import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
6667
import java.util.ArrayList;
6768
import java.util.Arrays;
6869
import java.util.Collections;
@@ -73,15 +74,19 @@
7374
import java.util.concurrent.CompletionException;
7475
import java.util.stream.Collectors;
7576
import org.junit.jupiter.api.Test;
77+
import org.junit.jupiter.api.extension.RegisterExtension;
7678

7779
public abstract class AbstractChatTest extends AbstractOpenAiTest {
80+
7881
protected static final AttributeKey<String> EVENT_NAME = AttributeKey.stringKey("event.name");
7982

8083
protected static final String TEST_CHAT_MODEL = "gpt-4o-mini";
8184
protected static final String TEST_CHAT_RESPONSE_MODEL = "gpt-4o-mini-2024-07-18";
8285
protected static final String TEST_CHAT_INPUT =
8386
"Answer in up to 3 words: Which ocean contains Bouvet Island?";
8487

88+
@RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
89+
8590
protected final ChatCompletion doCompletions(ChatCompletionCreateParams params) {
8691
return doCompletions(params, getClient(), getClientAsync());
8792
}
@@ -878,6 +883,8 @@ void connectionError() {
878883
.apiKey("testing")
879884
.maxRetries(0)
880885
.build());
886+
cleanup.deferCleanup(client::close);
887+
cleanup.deferCleanup(clientAsync::close);
881888

882889
ChatCompletionCreateParams params =
883890
ChatCompletionCreateParams.builder()
@@ -1583,6 +1590,8 @@ void streamConnectionError() {
15831590
.apiKey("testing")
15841591
.maxRetries(0)
15851592
.build());
1593+
cleanup.deferCleanup(client::close);
1594+
cleanup.deferCleanup(clientAsync::close);
15861595

15871596
ChatCompletionCreateParams params =
15881597
ChatCompletionCreateParams.builder()

0 commit comments

Comments
 (0)