fix: merge conflicts

Author: keshavdandeva

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

@@ -274,6 +274,9 @@ public class BigQueryConnection extends BigQueryNoOpsConnection {
       this.partnerToken = ds.getPartnerToken();
 
       this.headerProvider = createHeaderProvider();
+      this.enableGcpTraceExporter = ds.getEnableGcpTraceExporter();
+      this.enableGcpLogExporter = ds.getEnableGcpLogExporter();
+      this.customOpenTelemetry = ds.getCustomOpenTelemetry();
       this.bigQuery = getBigQueryConnection();
     }
   }