refactor: rename connection property EnableOpenTelemetry and remove "master-switch" logic

Author: keshavdandeva

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

@@ -140,7 +140,7 @@ public class BigQueryConnection extends BigQueryNoOpsConnection {
   Long connectionPoolSize;
   Long listenerPoolSize;
   String partnerToken;
-  boolean enableOpenTelemetry;
+  boolean enableDefaultTelemetryExporter;
   OpenTelemetry customOpenTelemetry;
   Tracer tracer = OpenTelemetry.noop().getTracer("");
 
@@ -247,7 +247,7 @@ public class BigQueryConnection extends BigQueryNoOpsConnection {
     this.connectionPoolSize = ds.getConnectionPoolSize();
     this.listenerPoolSize = ds.getListenerPoolSize();
     this.partnerToken = ds.getPartnerToken();
-    this.enableOpenTelemetry = ds.getEnableOpenTelemetry();
+    this.enableDefaultTelemetryExporter = ds.getEnableDefaultTelemetryExporter();
     this.customOpenTelemetry = ds.getCustomOpenTelemetry();
 
     this.headerProvider = createHeaderProvider();
@@ -944,8 +944,8 @@ private BigQuery getBigQueryConnection() {
 
     OpenTelemetry openTelemetry =
         BigQueryJdbcOpenTelemetry.getOpenTelemetry(
-            this.enableOpenTelemetry, this.customOpenTelemetry);
-    if (this.enableOpenTelemetry) {
+            this.enableDefaultTelemetryExporter, this.customOpenTelemetry);
+    if (this.enableDefaultTelemetryExporter || this.customOpenTelemetry != null) {
       this.tracer = BigQueryJdbcOpenTelemetry.getTracer(openTelemetry);
       bigQueryOptions.setOpenTelemetryTracer(this.tracer);
     }

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

@@ -20,7 +20,6 @@
 import com.google.cloud.bigquery.exception.BigQueryJdbcRuntimeException;
 import io.grpc.LoadBalancerRegistry;
 import io.grpc.internal.PickFirstLoadBalancerProvider;
-import io.opentelemetry.api.OpenTelemetry;
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.Driver;
@@ -123,10 +122,6 @@ public Connection connect(String url, Properties info) throws SQLException {
     try {
       if (acceptsURL(url)) {
         Properties connectInfo = info == null ? new Properties() : (Properties) info.clone();
-        OpenTelemetry customOpenTelemetry = null;
-        if (connectInfo.containsKey("customOpenTelemetry")) {
-          customOpenTelemetry = (OpenTelemetry) connectInfo.remove("customOpenTelemetry");
-        }
         String connectionUri =
             BigQueryJdbcUrlUtility.appendPropertiesToURL(
                 url.substring(5), this.toString(), connectInfo);
@@ -137,7 +132,6 @@ public Connection connect(String url, Properties info) throws SQLException {
         }
 
         DataSource ds = DataSource.fromUrl(connectionUri);
-        ds.setCustomOpenTelemetry(customOpenTelemetry);
 
         // LogLevel
         String logLevelStr = ds.getLogLevel();

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

@@ -26,19 +26,20 @@ public class BigQueryJdbcOpenTelemetry {
 
   /**
    * Initializes or returns the OpenTelemetry instance based on hybrid logic. Prefer
-   * GlobalOpenTelemetry; fallback to an auto-configured GCP exporter if requested.
+   * customOpenTelemetry if provided; fallback to an auto-configured GCP exporter if requested.
    */
   public static OpenTelemetry getOpenTelemetry(
-      boolean enableOpenTelemetry, OpenTelemetry customOpenTelemetry) {
-    if (!enableOpenTelemetry) {
-      return OpenTelemetry.noop();
-    }
-
+      boolean enableDefaultTelemetryExporter, OpenTelemetry customOpenTelemetry) {
     if (customOpenTelemetry != null) {
       return customOpenTelemetry;
     }
 
-    return GlobalOpenTelemetry.get();
+    if (enableDefaultTelemetryExporter) {
+      // TODO(b/491245568): Initialize and return GCP-specific auto-configured SDK
+      return GlobalOpenTelemetry.get();
+    }
+
+    return OpenTelemetry.noop();
   }
 
   /** Gets a Tracer for the JDBC driver instrumentation scope. */

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

@@ -162,8 +162,9 @@ protected boolean removeEldestEntry(Map.Entry<String, Map<String, String>> eldes
   static final int DEFAULT_SWA_APPEND_ROW_COUNT_VALUE = 1000;
   static final String SWA_ACTIVATION_ROW_COUNT_PROPERTY_NAME = "SWA_ActivationRowCount";
   static final int DEFAULT_SWA_ACTIVATION_ROW_COUNT_VALUE = 3;
-  static final String ENABLE_OPENTELEMETRY_PROPERTY_NAME = "EnableOpenTelemetry";
-  static final boolean DEFAULT_ENABLE_OPENTELEMETRY_VALUE = false;
+  static final String ENABLE_DEFAULT_TELEMETRY_EXPORTER_PROPERTY_NAME =
+      "enableDefaultTelemetryExporter";
+  static final boolean DEFAULT_ENABLE_DEFAULT_TELEMETRY_EXPORTER_VALUE = false;
   private static final BigQueryJdbcCustomLogger LOG =
       new BigQueryJdbcCustomLogger(BigQueryJdbcUrlUtility.class.getName());
   static final String FILTER_TABLES_ON_DEFAULT_DATASET_PROPERTY_NAME =
@@ -611,10 +612,11 @@ protected boolean removeEldestEntry(Map.Entry<String, Map<String, String>> eldes
                               + " header.")
                       .build(),
                   BigQueryConnectionProperty.newBuilder()
-                      .setName(ENABLE_OPENTELEMETRY_PROPERTY_NAME)
+                      .setName(ENABLE_DEFAULT_TELEMETRY_EXPORTER_PROPERTY_NAME)
                       .setDescription(
-                          "Enables or disables OpenTelemetry features in the Driver. Disabled by default.")
-                      .setDefaultValue(String.valueOf(DEFAULT_ENABLE_OPENTELEMETRY_VALUE))
+                          "Enables or disables default OpenTelemetry exporters in the Driver. Disabled by default.")
+                      .setDefaultValue(
+                          String.valueOf(DEFAULT_ENABLE_DEFAULT_TELEMETRY_EXPORTER_VALUE))
                       .build())));
 
   private static final List<String> NETWORK_PROPERTIES =

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

@@ -114,7 +114,7 @@ public class DataSource implements javax.sql.DataSource {
   private String privateServiceConnect;
   private Long connectionPoolSize;
   private Long listenerPoolSize;
-  private Boolean enableOpenTelemetry;
+  private Boolean enableDefaultTelemetryExporter;
   private OpenTelemetry customOpenTelemetry;
 
   // Make sure the JDBC driver class is loaded.
@@ -328,11 +328,12 @@ public class DataSource implements javax.sql.DataSource {
               BigQueryJdbcUrlUtility.LISTENER_POOL_SIZE_PROPERTY_NAME,
               (ds, val) -> ds.setListenerPoolSize(Long.parseLong(val)))
           .put(
-              BigQueryJdbcUrlUtility.ENABLE_OPENTELEMETRY_PROPERTY_NAME,
+              BigQueryJdbcUrlUtility.ENABLE_DEFAULT_TELEMETRY_EXPORTER_PROPERTY_NAME,
               (ds, val) ->
-                  ds.setEnableOpenTelemetry(
+                  ds.setEnableDefaultTelemetryExporter(
                       BigQueryJdbcUrlUtility.convertIntToBoolean(
-                          val, BigQueryJdbcUrlUtility.ENABLE_OPENTELEMETRY_PROPERTY_NAME)))
+                          val,
+                          BigQueryJdbcUrlUtility.ENABLE_DEFAULT_TELEMETRY_EXPORTER_PROPERTY_NAME)))
           .build();
 
   public static DataSource fromUrl(String url) {
@@ -629,10 +630,10 @@ private Properties createProperties() {
           BigQueryJdbcUrlUtility.LISTENER_POOL_SIZE_PROPERTY_NAME,
           String.valueOf(this.listenerPoolSize));
     }
-    if (this.enableOpenTelemetry != null) {
+    if (this.enableDefaultTelemetryExporter != null) {
       connectionProperties.setProperty(
-          BigQueryJdbcUrlUtility.ENABLE_OPENTELEMETRY_PROPERTY_NAME,
-          String.valueOf(this.enableOpenTelemetry));
+          BigQueryJdbcUrlUtility.ENABLE_DEFAULT_TELEMETRY_EXPORTER_PROPERTY_NAME,
+          String.valueOf(this.enableDefaultTelemetryExporter));
     }
     return connectionProperties;
   }
@@ -755,14 +756,14 @@ public void setListenerPoolSize(Long listenerPoolSize) {
     this.listenerPoolSize = listenerPoolSize;
   }
 
-  public Boolean getEnableOpenTelemetry() {
-    return enableOpenTelemetry != null
-        ? enableOpenTelemetry
-        : BigQueryJdbcUrlUtility.DEFAULT_ENABLE_OPENTELEMETRY_VALUE;
+  public Boolean getEnableDefaultTelemetryExporter() {
+    return enableDefaultTelemetryExporter != null
+        ? enableDefaultTelemetryExporter
+        : BigQueryJdbcUrlUtility.DEFAULT_ENABLE_DEFAULT_TELEMETRY_EXPORTER_VALUE;
   }
 
-  public void setEnableOpenTelemetry(Boolean enableOpenTelemetry) {
-    this.enableOpenTelemetry = enableOpenTelemetry;
+  public void setEnableDefaultTelemetryExporter(Boolean enableDefaultTelemetryExporter) {
+    this.enableDefaultTelemetryExporter = enableDefaultTelemetryExporter;
   }
 
   public OpenTelemetry getCustomOpenTelemetry() {