Skip to content

Commit 2c51c00

Browse files
harshachintaharshachinta
committed
chore(spanner): skip tests and fix tests
1 parent 64a93e5 commit 2c51c00

File tree

3 files changed

+46
-0
lines changed

3 files changed

+46
-0
lines changed

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetryApiTracerTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ public void createSpannerInstance() {
135135
SessionPoolOptions.newBuilder()
136136
.setWaitForMinSessionsDuration(Duration.ofSeconds(5L))
137137
.setFailOnSessionLeak()
138+
.setSkipVerifyingBeginTransactionForMuxRW(true)
138139
.build())
139140
.setEnableApiTracing(true)
140141
.build()
@@ -428,6 +429,7 @@ public boolean isEnableApiTracing() {
428429
SessionPoolOptions.newBuilder()
429430
.setWaitForMinSessionsDuration(Duration.ofSeconds(5L))
430431
.setFailOnSessionLeak()
432+
.setSkipVerifyingBeginTransactionForMuxRW(true)
431433
.build())
432434
.build()
433435
.getService();

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetryBuiltInMetricsTracerTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ public void createSpannerInstance() {
144144
SessionPoolOptions.newBuilder()
145145
.setWaitForMinSessionsDuration(Duration.ofSeconds(5L))
146146
.setFailOnSessionLeak()
147+
.setSkipVerifyingBeginTransactionForMuxRW(true)
147148
.build())
148149
// Setting this to false so that Spanner Options does not register Metrics Tracer
149150
// factory again.

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/OpenTelemetryTracingTest.java‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.junit.Assert.assertEquals;
2121
import static org.junit.Assert.assertFalse;
2222
import static org.junit.Assert.assertTrue;
23+
import static org.junit.Assume.assumeFalse;
2324

2425
import com.google.cloud.spanner.MockSpannerServiceImpl;
2526
import com.google.cloud.spanner.ResultSet;
@@ -111,6 +112,9 @@ Connection createTestConnection(String url) {
111112
public void testSingleUseQuery_withoutSqlStatement() {
112113
try (Connection connection = createTestConnection(getBaseUrl())) {
113114
connection.setAutocommit(true);
115+
assumeFalse(
116+
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
117+
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
114118
try (ResultSet resultSet = connection.executeQuery(SELECT1_STATEMENT)) {
115119
assertTrue(resultSet.next());
116120
assertFalse(resultSet.next());
@@ -149,6 +153,9 @@ public boolean isEnableExtendedTracing() {
149153

150154
try (Connection connection = createTestConnection(getBaseUrl())) {
151155
connection.setAutocommit(true);
156+
assumeFalse(
157+
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
158+
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
152159
try (ResultSet resultSet = connection.executeQuery(SELECT1_STATEMENT)) {
153160
assertTrue(resultSet.next());
154161
assertFalse(resultSet.next());
@@ -185,6 +192,9 @@ public boolean isEnableExtendedTracing() {
185192
public void testSingleUseQuery() {
186193
try (Connection connection = createTestConnection()) {
187194
connection.setAutocommit(true);
195+
assumeFalse(
196+
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
197+
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
188198
try (ResultSet resultSet = connection.executeQuery(SELECT1_STATEMENT)) {
189199
assertTrue(resultSet.next());
190200
assertFalse(resultSet.next());
@@ -220,6 +230,9 @@ public void testSingleUseUpdate() {
220230
try (Connection connection = createTestConnection()) {
221231
connection.setAutocommit(true);
222232
connection.executeUpdate(INSERT_STATEMENT);
233+
assumeFalse(
234+
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
235+
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
223236
}
224237
assertEquals(CompletableResultCode.ofSuccess(), spanExporter.flush());
225238
List<SpanData> spans = spanExporter.getFinishedSpanItems();
@@ -256,6 +269,9 @@ public void testSingleUseBatchUpdate() {
256269
connection.executeUpdate(INSERT_STATEMENT);
257270
connection.executeUpdate(INSERT_STATEMENT);
258271
connection.runBatch();
272+
assumeFalse(
273+
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
274+
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
259275
}
260276
assertEquals(CompletableResultCode.ofSuccess(), spanExporter.flush());
261277
List<SpanData> spans = spanExporter.getFinishedSpanItems();
@@ -297,6 +313,9 @@ public void testSingleUseDdl() {
297313

298314
try (Connection connection = createTestConnection()) {
299315
connection.setAutocommit(true);
316+
assumeFalse(
317+
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
318+
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
300319
connection.execute(Statement.of(ddl));
301320
}
302321
assertEquals(CompletableResultCode.ofSuccess(), spanExporter.flush());
@@ -315,6 +334,9 @@ public void testSingleUseDdlBatch() {
315334

316335
try (Connection connection = createTestConnection()) {
317336
connection.setAutocommit(true);
337+
assumeFalse(
338+
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
339+
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
318340
connection.startBatchDdl();
319341
connection.execute(Statement.of(ddl1));
320342
connection.execute(Statement.of(ddl2));
@@ -332,6 +354,9 @@ public void testSingleUseDdlBatch() {
332354
public void testMultiUseReadOnlyQueries() {
333355
try (Connection connection = createTestConnection()) {
334356
connection.setAutocommit(false);
357+
assumeFalse(
358+
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
359+
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
335360
connection.setReadOnly(true);
336361
twice(
337362
() -> {
@@ -363,6 +388,9 @@ public void testMultiUseReadOnlyQueries() {
363388
public void testMultiUseReadWriteQueries() {
364389
try (Connection connection = createTestConnection()) {
365390
connection.setAutocommit(false);
391+
assumeFalse(
392+
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
393+
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
366394
connection.setReadOnly(false);
367395
twice(
368396
() -> {
@@ -397,6 +425,9 @@ public void testMultiUseReadWriteQueries() {
397425
public void testMultiUseReadWriteUpdates() {
398426
try (Connection connection = createTestConnection()) {
399427
connection.setAutocommit(false);
428+
assumeFalse(
429+
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
430+
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
400431
connection.setReadOnly(false);
401432
assertEquals(1L, connection.executeUpdate(INSERT_STATEMENT));
402433
assertEquals(1L, connection.executeUpdate(INSERT_STATEMENT));
@@ -426,6 +457,9 @@ public void testMultiUseReadWriteUpdates() {
426457
public void testMultiUseReadWriteBatchUpdates() {
427458
try (Connection connection = createTestConnection()) {
428459
connection.setAutocommit(false);
460+
assumeFalse(
461+
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
462+
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
429463
connection.setReadOnly(false);
430464

431465
twice(
@@ -466,6 +500,9 @@ public void testMultiUseReadWriteBatchUpdates() {
466500
public void testMultiUseReadWriteAborted() {
467501
try (Connection connection = createTestConnection()) {
468502
connection.setAutocommit(false);
503+
assumeFalse(
504+
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
505+
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
469506
connection.setReadOnly(false);
470507
assertEquals(1L, connection.executeUpdate(INSERT_STATEMENT));
471508
mockSpanner.abortNextStatement();
@@ -514,6 +551,9 @@ public void testSavepoint() {
514551

515552
try (Connection connection = createTestConnection()) {
516553
connection.setAutocommit(false);
554+
assumeFalse(
555+
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
556+
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
517557
connection.setReadOnly(false);
518558
connection.setSavepointSupport(SavepointSupport.ENABLED);
519559
assertEquals(1L, connection.executeUpdate(statement1));
@@ -563,6 +603,9 @@ public void testTransactionTag() {
563603
try (Connection connection = createTestConnection()) {
564604
connection.setAutocommit(false);
565605
connection.setReadOnly(false);
606+
assumeFalse(
607+
"OpenTelemetryTracingTest handler is not implemented for read-write with multiplexed sessions",
608+
isMultiplexedSessionsEnabledForRW(connection.getSpanner()));
566609
connection.setTransactionTag("my_tag");
567610
assertEquals(1L, connection.executeUpdate(INSERT_STATEMENT));
568611
connection.commit();

0 commit comments

Comments
 (0)