Simplify OpenAI exception log assertions

Author: trask

instrumentation/openai/openai-java-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/openai/v1_1/EmbeddingsTest.java

@@ -5,11 +5,19 @@
 
 package io.opentelemetry.javaagent.instrumentation.openai.v1_1;
 
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
+import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE;
+import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE;
+import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
+
 import com.openai.client.OpenAIClient;
 import com.openai.client.OpenAIClientAsync;
+import io.opentelemetry.api.logs.Severity;
 import io.opentelemetry.instrumentation.openai.v1_1.AbstractEmbeddingsTest;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import io.opentelemetry.sdk.testing.assertj.LogRecordDataAssert;
 import io.opentelemetry.sdk.testing.assertj.SpanDataAssert;
 import java.util.ArrayList;
 import java.util.List;
@@ -45,4 +53,23 @@ protected List<Consumer<SpanDataAssert>> maybeWithTransportSpan(Consumer<SpanDat
     result.add(s -> s.hasName("POST"));
     return result;
   }
+
+  @Override
+  protected List<Consumer<LogRecordDataAssert>> maybeWithTransportExceptionLog(
+      Consumer<LogRecordDataAssert> logRecord) {
+    List<Consumer<LogRecordDataAssert>> result = new ArrayList<>();
+    result.add(
+        transportLog ->
+            transportLog
+                .hasSeverity(Severity.WARN)
+                .hasEventName("http.client.request.exception")
+                .hasAttributesSatisfyingExactly(
+                    equalTo(EXCEPTION_TYPE, "java.net.ConnectException"),
+                    satisfies(
+                        EXCEPTION_MESSAGE, val -> val.startsWith("Failed to connect to localhost")),
+                    satisfies(EXCEPTION_STACKTRACE, val -> val.isNotNull()))
+                .hasTotalAttributeCount(3));
+    result.add(logRecord);
+    return result;
+  }
 }

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

@@ -10,9 +10,6 @@
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
-import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE;
-import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE;
-import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
 import static io.opentelemetry.semconv.incubating.GenAiIncubatingAttributes.GEN_AI_OPERATION_NAME;
 import static io.opentelemetry.semconv.incubating.GenAiIncubatingAttributes.GEN_AI_PROVIDER_NAME;
 import static io.opentelemetry.semconv.incubating.GenAiIncubatingAttributes.GEN_AI_REQUEST_ENCODING_FORMATS;
@@ -39,7 +36,10 @@
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
+import io.opentelemetry.sdk.testing.assertj.LogRecordDataAssert;
+import java.util.List;
 import java.util.concurrent.CompletionException;
+import java.util.function.Consumer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -264,14 +264,13 @@ void connectionError() {
     if (emitExceptionAsLogs()) {
       getTesting()
           .waitAndAssertLogRecords(
-              logRecord ->
-                  logRecord
-                      .hasSeverity(Severity.WARN)
-                      .hasEventName("gen_ai.client.operation.exception")
-                      .hasAttributesSatisfyingExactly(
-                          equalTo(EXCEPTION_TYPE, thrown.getClass().getName()),
-                          equalTo(EXCEPTION_MESSAGE, thrown.getMessage()),
-                          satisfies(EXCEPTION_STACKTRACE, val -> val.isNotNull())));
+              maybeWithTransportExceptionLog(
+                  logRecord ->
+                      logRecord
+                          .hasSeverity(Severity.WARN)
+                          .hasEventName("gen_ai.client.operation.exception")
+                          .hasException(thrown)
+                          .hasTotalAttributeCount(3)));
     }
 
     getTesting()
@@ -291,4 +290,9 @@ void connectionError() {
                                             equalTo(GEN_AI_OPERATION_NAME, EMBEDDINGS),
                                             equalTo(GEN_AI_REQUEST_MODEL, MODEL)))));
   }
+
+  protected List<Consumer<LogRecordDataAssert>> maybeWithTransportExceptionLog(
+      Consumer<LogRecordDataAssert> logRecord) {
+    return singletonList(logRecord);
+  }
 }