chore: address pr feedback

Author: keshavdandeva

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryDriver.java

@@ -157,13 +157,10 @@ public Connection connect(String url, Properties info) throws SQLException {
         if (logPath == null) {
           logPath = System.getenv(BigQueryJdbcUrlUtility.LOG_PATH_ENV_VAR);
         }
-        if (logPath == null) {
-          // Cloud-Only Mode: Suppress local file creation if GCP log exporter is enabled
-          if (ds.getEnableGcpLogExporter() && logLevel != Level.OFF) {
-            logPath = null;
-          } else {
-            logPath = BigQueryJdbcUrlUtility.DEFAULT_LOG_PATH;
-          }
+
+        // Fallback to default path only if not specified and not in Cloud-Only mode
+        if (logPath == null && !ds.getEnableGcpLogExporter()) {
+          logPath = BigQueryJdbcUrlUtility.DEFAULT_LOG_PATH;
         }
 
         BigQueryJdbcRootLogger.setLevel(logLevel, logPath);

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcOpenTelemetry.java

@@ -28,6 +28,7 @@ public class BigQueryJdbcOpenTelemetry {
 
   static final String INSTRUMENTATION_SCOPE_NAME = "com.google.cloud.bigquery.jdbc";
   static final String BIGQUERY_NAMESPACE = "com.google.cloud.bigquery";
+  public static final String CONNECTION_ID_BAGGAGE_KEY = "jdbc.connection_id";
 
   static class TelemetryConfig {
     final OpenTelemetry openTelemetry;

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcRootLogger.java

@@ -141,15 +141,14 @@ public static void setLevel(Level level, String logPath) throws IOException {
       if (logPath != null) {
         setPath(logPath, level);
       }
-      logger.setLevel(level);
     } else {
       for (Handler h : logger.getHandlers()) {
         h.close();
         logger.removeHandler(h);
       }
       fileHandler = null;
-      logger.setLevel(Level.OFF);
     }
+    logger.setLevel(level);
   }
 
   static void setPath(String logPath, Level level) {

java-bigquery/google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/OpenTelemetryJulHandler.java

@@ -51,7 +51,8 @@ public void publish(LogRecord record) {
     try {
       // Extract connection ID from baggage
       String connectionId =
-          Baggage.fromContext(Context.current()).getEntryValue("jdbc.connection_id");
+          Baggage.fromContext(Context.current())
+              .getEntryValue(BigQueryJdbcOpenTelemetry.CONNECTION_ID_BAGGAGE_KEY);
 
       // Fallback to MDC if not in baggage (if MDC is available and used)
       if (connectionId == null) {
@@ -85,9 +86,6 @@ private void publishToGcp(LogRecord record, String connectionId, Logging logging
     String spanId = spanContext.isValid() ? spanContext.getSpanId() : null;
 
     // TODO(b/491238299): May require refinement for structured logging or error handling
-    if (loggingClient == null) {
-      return;
-    }
 
     LogEntry.Builder builder =
         LogEntry.newBuilder(Payload.StringPayload.of(formatMessage(record)))
@@ -101,7 +99,7 @@ private void publishToGcp(LogRecord record, String connectionId, Logging logging
       builder.setSpanId(spanId);
     }
     if (connectionId != null) {
-      builder.addLabel("jdbc.connection_id", connectionId);
+      builder.addLabel(BigQueryJdbcOpenTelemetry.CONNECTION_ID_BAGGAGE_KEY, connectionId);
     }
 
     loggingClient.write(Collections.singleton(builder.build()));
@@ -117,10 +115,6 @@ private com.google.cloud.logging.Severity mapGcpSeverity(Level level) {
   }
 
   private void publishToOTel(LogRecord record, String connectionId, OpenTelemetry openTelemetry) {
-    if (openTelemetry == null) {
-      return;
-    }
-
     String loggerName = record.getLoggerName();
     Logger logger =
         openTelemetry
@@ -139,7 +133,9 @@ private void publishToOTel(LogRecord record, String connectionId, OpenTelemetry
             .setContext(Context.current());
 
     if (connectionId != null) {
-      builder.setAttribute(AttributeKey.stringKey("jdbc.connection_id"), connectionId);
+      builder.setAttribute(
+          AttributeKey.stringKey(BigQueryJdbcOpenTelemetry.CONNECTION_ID_BAGGAGE_KEY),
+          connectionId);
     }
 
     builder.emit();

java-bigquery/google-cloud-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/OpenTelemetryJulHandlerTest.java

@@ -64,7 +64,10 @@ public void testPublishToOTel() {
         "test-uuid", otelTesting.getOpenTelemetry(), null, false);
 
     BigQueryConnection mockConnection = mock(BigQueryConnection.class);
-    Baggage baggage = Baggage.builder().put("jdbc.connection_id", "test-uuid").build();
+    Baggage baggage =
+        Baggage.builder()
+            .put(BigQueryJdbcOpenTelemetry.CONNECTION_ID_BAGGAGE_KEY, "test-uuid")
+            .build();
     try (Scope scope = baggage.makeCurrent();
         BigQueryJdbcMdc.MdcCloseable mdcScope =
             BigQueryJdbcMdc.registerInstance(mockConnection, "test-uuid")) {
@@ -77,7 +80,9 @@ public void testPublishToOTel() {
     assertEquals("Test message", log.getBody().asString());
     assertEquals(Severity.INFO, log.getSeverity());
     assertEquals(
-        "test-uuid", log.getAttributes().get(AttributeKey.stringKey("jdbc.connection_id")));
+        "test-uuid",
+        log.getAttributes()
+            .get(AttributeKey.stringKey(BigQueryJdbcOpenTelemetry.CONNECTION_ID_BAGGAGE_KEY)));
   }
 
   @Test
@@ -87,7 +92,10 @@ public void testPublishWithFiltering() {
         "test-uuid", otelTesting.getOpenTelemetry(), null, false);
 
     // Log with WRONG connection ID
-    Baggage baggage = Baggage.builder().put("jdbc.connection_id", "wrong-uuid").build();
+    Baggage baggage =
+        Baggage.builder()
+            .put(BigQueryJdbcOpenTelemetry.CONNECTION_ID_BAGGAGE_KEY, "wrong-uuid")
+            .build();
     try (Scope scope = baggage.makeCurrent()) {
       logger.info("Test message");
     }
@@ -103,7 +111,10 @@ public void testPublishToGcp() {
         "gcp-uuid", otelTesting.getOpenTelemetry(), loggingClient, true);
 
     BigQueryConnection mockConnection = mock(BigQueryConnection.class);
-    Baggage baggage = Baggage.builder().put("jdbc.connection_id", "gcp-uuid").build();
+    Baggage baggage =
+        Baggage.builder()
+            .put(BigQueryJdbcOpenTelemetry.CONNECTION_ID_BAGGAGE_KEY, "gcp-uuid")
+            .build();
     try (Scope scope = baggage.makeCurrent();
         BigQueryJdbcMdc.MdcCloseable mdcScope =
             BigQueryJdbcMdc.registerInstance(mockConnection, "gcp-uuid")) {