Skip to content

fix(bigquery-jdbc): enable ITOpenTelemetryTest #13991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keshavdandeva merged 7 commits into from
Aug 5, 2026
Merged

fix(bigquery-jdbc): enable ITOpenTelemetryTest #13991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6eea03b
chore: add debug statements
keshavdandeva Aug 4, 2026
d19142d
remove excluded tag
keshavdandeva Aug 4, 2026
ec4d529
fix removal of log handler
keshavdandeva Aug 4, 2026
1691cd7
remove debug lines
keshavdandeva Aug 4, 2026
478c6ba
Merge branch 'main' into jdbc-test-otel-failing-it
keshavdandeva Aug 4, 2026
13316ec
address pr feedback and revert ipv4 changes
keshavdandeva Aug 4, 2026
e4f5443
Merge branch 'main' into jdbc-test-otel-failing-it
keshavdandeva Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions java-bigquery-jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<github.global.server>github</github.global.server>
<site.installationModule>google-cloud-bigquery-jdbc</site.installationModule>
<skipShade>false</skipShade>
<preferIpv4.test.argLine>-Djava.net.preferIPv4Stack=true</preferIpv4.test.argLine>
</properties>

<build>
Expand All @@ -48,7 +47,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.2</version>
<configuration>
<argLine>@{argLine} ${preferIpv4.test.argLine}</argLine>
<skip>${skipSurefire}</skip>
<systemPropertyVariables>
<JDBC_TESTS>true</JDBC_TESTS>
Expand All @@ -59,7 +57,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<argLine>@{argLine} ${preferIpv4.test.argLine}</argLine>
<systemPropertyVariables>
<JDBC_TESTS>true</JDBC_TESTS>
</systemPropertyVariables>
Expand Down Expand Up @@ -480,14 +477,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>@{argLine} ${preferIpv4.test.argLine} --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
<argLine>--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
Comment thread
keshavdandeva marked this conversation as resolved.
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<argLine>@{argLine} ${preferIpv4.test.argLine} --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
<argLine>--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
Comment thread
keshavdandeva marked this conversation as resolved.
</configuration>
</plugin>
</plugins>
Expand Down
1 change: 1 addition & 0 deletions java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,6 +1185,7 @@ void removeStatement(Statement statement) {
}

private OpenTelemetry getOpenTelemetryInstance() {
BigQueryJdbcOpenTelemetry.ensureGlobalHandlerAttached();

String effectiveProjectId =
(this.gcpTelemetryProjectId != null) ? this.gcpTelemetryProjectId : this.catalog;
Expand Down
6 changes: 4 additions & 2 deletions java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/OpenTelemetryJulHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import io.opentelemetry.context.Context;
import java.time.Instant;
import java.util.Collections;
import java.util.logging.ErrorManager;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.LogRecord;
Expand Down Expand Up @@ -78,7 +79,8 @@ public void publish(LogRecord record) {
publishToOTel(record, connectionId, config.openTelemetry);
}
} catch (Throwable t) {
// Ignore exceptions to prevent breaking application logging or other handlers
Exception ex = (t instanceof Exception) ? (Exception) t : new Exception(t);
reportError("Error publishing log to OpenTelemetry/GCP", ex, ErrorManager.WRITE_FAILURE);
}
Comment thread
keshavdandeva marked this conversation as resolved.
}

Expand Down Expand Up @@ -182,7 +184,7 @@ public void flush() {
try {
config.loggingClient.flush();
} catch (Exception e) {
// Ignore failures during flush to protect other connections
reportError("Error flushing log to OpenTelemetry/GCP", e, ErrorManager.FLUSH_FAILURE);
}
}
}
Expand Down
7 changes: 5 additions & 2 deletions java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITBigQueryJDBCTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import com.google.cloud.bigquery.jdbc.BigQueryConnection;
import com.google.cloud.bigquery.jdbc.BigQueryDriver;
import com.google.cloud.bigquery.jdbc.DataSource;
import com.google.cloud.bigquery.jdbc.OpenTelemetryJulHandler;
import com.google.common.collect.ImmutableMap;
import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -2808,8 +2809,10 @@ public void testPerConnectionLoggingE2E() throws SQLException, IOException {
java.util.logging.Logger bqLogger =
java.util.logging.Logger.getLogger("com.google.cloud.bigquery");
for (java.util.logging.Handler h : bqLogger.getHandlers()) {
h.close();
bqLogger.removeHandler(h);
if (!(h instanceof OpenTelemetryJulHandler)) {
h.close();
bqLogger.removeHandler(h);
}
}

// Verify physical connection-specific log file creation
Expand Down
4 changes: 1 addition & 3 deletions java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/it/ITOpenTelemetryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,8 @@
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;

@Tag("known_issue") // b/539615312
public class ITOpenTelemetryTest extends ITBase {

private static final String PROJECT_ID = ServiceOptions.getDefaultProjectId();
Expand Down Expand Up @@ -309,7 +307,7 @@ private Trace verifyAndFetchTrace(String traceId) throws Exception {

private <T> T pollWithRetry(java.util.concurrent.Callable<T> task) throws InterruptedException {
int attempts = 0;
int maxAttempts = 24;
int maxAttempts = 10;
long delayMs = 10000;

// 10 second wait for GCP to ingest data
Expand Down
Loading