Skip to content

Commit 8bc5ce1

Browse files
fix(bigquery-jdbc): feature branch failing tests (#13287)
b/517498094 This PR fixes dependency analysis failures and flaky test issues identified in the OpenTelemetry integration feature branch.
1 parent 051c352 commit 8bc5ce1

5 files changed

Lines changed: 25 additions & 1 deletion

File tree

java-bigquery-jdbc/pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@
8383
<ignoredUsedUndeclaredDependency>org.apache.httpcomponents.*:*</ignoredUsedUndeclaredDependency>
8484
<ignoredUsedUndeclaredDependency>io.grpc:*</ignoredUsedUndeclaredDependency>
8585
</ignoredUsedUndeclaredDependencies>
86+
<ignoredUnusedDeclaredDependencies>
87+
<ignoredUnusedDeclaredDependency>io.opentelemetry.contrib:opentelemetry-gcp-auth-extension</ignoredUnusedDeclaredDependency>
88+
<ignoredUnusedDeclaredDependency>io.opentelemetry:opentelemetry-exporter-otlp</ignoredUnusedDeclaredDependency>
89+
</ignoredUnusedDeclaredDependencies>
8690
</configuration>
8791
</plugin>
8892
<plugin>
@@ -434,6 +438,16 @@
434438
<artifactId>opentelemetry-sdk-testing</artifactId>
435439
<scope>test</scope>
436440
</dependency>
441+
<dependency>
442+
<groupId>io.opentelemetry</groupId>
443+
<artifactId>opentelemetry-sdk-logs</artifactId>
444+
<scope>test</scope>
445+
</dependency>
446+
<dependency>
447+
<groupId>io.opentelemetry</groupId>
448+
<artifactId>opentelemetry-sdk-trace</artifactId>
449+
<scope>test</scope>
450+
</dependency>
437451
<dependency>
438452
<groupId>com.google.cloud</groupId>
439453
<artifactId>google-cloud-trace</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ private BigQueryJdbcOpenTelemetry() {}
140140
}));
141141
}
142142

143-
public static void ensureGlobalHandlerAttached() {
143+
public static synchronized void ensureGlobalHandlerAttached() {
144144
Logger logger = Logger.getLogger(BIGQUERY_NAMESPACE);
145145
boolean present = false;
146146
for (Handler h : logger.getHandlers()) {

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ public abstract class BigQueryJdbcLoggingBaseTest extends BigQueryJdbcBaseTest {
3030
private Handler handler;
3131
private Logger logger;
3232
private long threadId;
33+
private java.util.logging.Level originalLevel;
3334

3435
@BeforeEach
3536
public void setUpLogValidator() {
3637
logger = BigQueryJdbcRootLogger.getRootLogger();
38+
originalLevel = logger.getLevel();
3739
logger.setLevel(java.util.logging.Level.ALL);
3840
capturedLogs.clear();
3941
threadId = Thread.currentThread().getId();
@@ -59,6 +61,7 @@ public void close() throws SecurityException {}
5961
public void tearDownLogValidator() {
6062
if (logger != null && handler != null) {
6163
logger.removeHandler(handler);
64+
logger.setLevel(originalLevel);
6265
}
6366
}
6467

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,11 @@ public class OpenTelemetryJulHandlerTest {
4444
static final OpenTelemetryExtension otelTesting = OpenTelemetryExtension.create();
4545

4646
private static final Logger logger = Logger.getLogger("com.google.cloud.bigquery");
47+
private java.util.logging.Level originalLevel;
4748

4849
@BeforeEach
4950
public void setUp() {
51+
originalLevel = logger.getLevel();
5052
logger.setLevel(java.util.logging.Level.ALL);
5153
BigQueryJdbcOpenTelemetry.ensureGlobalHandlerAttached();
5254
}
@@ -56,6 +58,7 @@ public void tearDown() {
5658
BigQueryJdbcOpenTelemetry.unregisterConnection("test-uuid");
5759
BigQueryJdbcOpenTelemetry.unregisterConnection("wrong-uuid");
5860
BigQueryJdbcOpenTelemetry.unregisterConnection("gcp-uuid");
61+
logger.setLevel(originalLevel);
5962
}
6063

6164
@Test

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,15 @@ public class PerConnectionFileHandlerTest {
4545

4646
private PerConnectionFileHandler handler;
4747
private BigQueryConnection mockConnection;
48+
private Level originalLevel;
4849

4950
@BeforeEach
5051
public void setUp() {
5152
handler = new PerConnectionFileHandler(tempDir.toString(), Level.INFO);
5253
mockConnection = Mockito.mock(BigQueryConnection.class);
5354
BigQueryJdbcMdc.clear();
55+
originalLevel = BigQueryJdbcRootLogger.getRootLogger().getLevel();
56+
BigQueryJdbcRootLogger.getRootLogger().setLevel(Level.ALL);
5457
}
5558

5659
@AfterEach
@@ -59,6 +62,7 @@ public void tearDown() {
5962
handler.close();
6063
}
6164
BigQueryJdbcMdc.clear();
65+
BigQueryJdbcRootLogger.getRootLogger().setLevel(originalLevel);
6266
}
6367

6468
private Optional<Path> findLogFile(String suffix) throws IOException {

0 commit comments

Comments
 (0)