fix(test): provide libraryMetadata for ApiTracerContext.newBuilder in tests

Author: westarle

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/LoggingTracer.java

@@ -105,10 +105,12 @@ private void recordActionableError(Throwable error) {
 
     ErrorInfo errorInfo = ObservabilityUtils.extractErrorInfo(error);
     if (errorInfo != null) {
-      logContext.put("error.type", errorInfo.getReason());
-      logContext.put("gcp.errors.domain", errorInfo.getDomain());
+      logContext.put(ObservabilityAttributes.ERROR_TYPE_ATTRIBUTE, errorInfo.getReason());
+      logContext.put(ObservabilityAttributes.ERROR_DOMAIN_ATTRIBUTE, errorInfo.getDomain());
       for (Map.Entry<String, String> entry : errorInfo.getMetadataMap().entrySet()) {
-        logContext.put("gcp.errors.metadata." + entry.getKey(), entry.getValue());
+        logContext.put(
+            ObservabilityAttributes.ERROR_METADATA_ATTRIBUTE_PREFIX + entry.getKey(),
+            entry.getValue());
       }
     }
 

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/LoggingTracerFactory.java

@@ -54,7 +54,7 @@ public ApiTracer newTracer(ApiTracer parent, SpanName spanName, OperationType op
 
   @Override
   public ApiTracer newTracer(ApiTracer parent, ApiTracerContext context) {
-    return new LoggingTracer(context);
+    return new LoggingTracer(apiTracerContext.merge(context));
   }
 
   @Override

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/ObservabilityAttributes.java

@@ -93,4 +93,13 @@ public class ObservabilityAttributes {
 
   /** The destination resource id of the request (e.g. projects/p/locations/l/topics/t). */
   public static final String DESTINATION_RESOURCE_ID_ATTRIBUTE = "gcp.resource.destination.id";
+
+  /** The type of error that occurred (e.g., from google.rpc.ErrorInfo.reason). */
+  public static final String ERROR_TYPE_ATTRIBUTE = "error.type";
+
+  /** The domain of the error (e.g., from google.rpc.ErrorInfo.domain). */
+  public static final String ERROR_DOMAIN_ATTRIBUTE = "gcp.errors.domain";
+
+  /** The prefix for error metadata (e.g., from google.rpc.ErrorInfo.metadata). */
+  public static final String ERROR_METADATA_ATTRIBUTE_PREFIX = "gcp.errors.metadata.";
 }

sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/logging/TestLogger.java

@@ -48,6 +48,10 @@ public class TestLogger implements Logger, LoggingEventAware {
   List<String> messageList = new ArrayList<>();
   Level level;
 
+  public List<String> getMessageList() {
+    return messageList;
+  }
+
   Map<String, Object> keyValuePairsMap = new HashMap<>();
 
   private String loggerName;

sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/LoggingTracerFactoryTest.java

@@ -63,7 +63,8 @@ void testNewTracer_WithContext_CreatesLoggingTracer() {
   @Test
   void testWithContext_ReturnsNewFactoryWithMergedContext() {
     LoggingTracerFactory factory = new LoggingTracerFactory();
-    ApiTracerContext context = ApiTracerContext.newBuilder().setServerAddress("address").build();
+    ApiTracerContext context =
+        ApiTracerContext.empty().toBuilder().setServerAddress("address").build();
     ApiTracerFactory updatedFactory = factory.withContext(context);
 
     assertNotNull(updatedFactory);

sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/LoggingTracerTest.java

@@ -30,7 +30,10 @@
 
 package com.google.api.gax.tracing;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import com.google.api.gax.logging.TestLogger;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.LoggerFactory;
@@ -42,19 +45,68 @@ class LoggingTracerTest {
   @BeforeEach
   void setUp() {
     testLogger = (TestLogger) LoggerFactory.getLogger(LoggingTracer.class);
+    testLogger.getMessageList().clear();
+
+    try {
+      java.lang.reflect.Field lpField = LoggingTracer.class.getDeclaredField("LOGGER_PROVIDER");
+      lpField.setAccessible(true);
+      Object lp = lpField.get(null);
+
+      java.lang.reflect.Field loggerField = lp.getClass().getDeclaredField("logger");
+      loggerField.setAccessible(true);
+      loggerField.set(lp, testLogger);
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @AfterEach
+  void tearDown() {
+    try {
+      java.lang.reflect.Method method =
+          com.google.api.gax.logging.LoggingUtils.class.getDeclaredMethod(
+              "setLoggingEnabled", boolean.class);
+      method.setAccessible(true);
+      method.invoke(null, false);
+
+      // Reset the injected logger
+      java.lang.reflect.Field lpField = LoggingTracer.class.getDeclaredField("LOGGER_PROVIDER");
+      lpField.setAccessible(true);
+      Object lp = lpField.get(null);
+
+      java.lang.reflect.Field loggerField = lp.getClass().getDeclaredField("logger");
+      loggerField.setAccessible(true);
+      loggerField.set(lp, null);
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
   }
 
   @Test
   void testAttemptFailed_LogsError() {
     ApiTracerContext context = ApiTracerContext.empty();
     LoggingTracer tracer = new LoggingTracer(context);
 
+    // Enable logging using reflection
+    try {
+      // Force Slf4jUtils to be loaded while logging is still disabled
+      // so it caches the default 'false', preventing test interference.
+      Class.forName("com.google.api.gax.logging.Slf4jUtils");
+
+      java.lang.reflect.Method method =
+          com.google.api.gax.logging.LoggingUtils.class.getDeclaredMethod(
+              "setLoggingEnabled", boolean.class);
+      method.setAccessible(true);
+      method.invoke(null, true);
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+
     // Call attemptFailed with a generic exception
     Exception error = new RuntimeException("generic failure");
     tracer.attemptFailed(error, org.threeten.bp.Duration.ZERO);
 
-    // To prevent failing due to disabled logging or other missing context,
-    // we don't strictly assert the contents of the log here if the logger isn't enabled.
-    // The main verification is that calling attemptFailed doesn't throw.
+    assertEquals(1, testLogger.getMessageList().size());
+    assertEquals("generic failure", testLogger.getMessageList().get(0));
   }
 }