fix IT test failures

Author: whuffman36

google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/BigQueryReadClient.java

@@ -131,7 +131,9 @@ protected BigQueryReadClient(BigQueryReadSettings settings) throws IOException {
     this.settings = settings;
     this.stub =
         EnhancedBigQueryReadStub.create(
-            settings.getTypedStubSettings(), settings.getReadRowsRetryAttemptListener());
+            settings.getTypedStubSettings(),
+            settings.getReadRowsRetryAttemptListener(),
+            settings.isOpenTelemetryEnabled());
   }
 
   @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
@@ -241,14 +243,12 @@ public final ReadSession createReadSession(CreateReadSessionRequest request) {
               .setAttribute(
                   "bq.storage.read_session.request.parent", getFieldAsString(request.getParent()))
               .setAttribute(
-                  "bq.storage.read_session.request.max_stream_count",
-                  getFieldAsString(request.getMaxStreamCount()))
+                  "bq.storage.read_session.request.max_stream_count", request.getMaxStreamCount())
               .setAttribute(
                   "bq.storage.read_session.request.preferred_min_stream_count",
-                  getFieldAsString(request.getPreferredMinStreamCount()))
+                  request.getPreferredMinStreamCount())
               .setAttribute(
-                  "bq.storage.read_session.request.serialized_size",
-                  getFieldAsString(request.getSerializedSize()))
+                  "bq.storage.read_session.request.serialized_size", request.getSerializedSize())
               .setAllAttributes(otelAttributesFrom(request.getReadSession()))
               .startSpan();
     }
@@ -548,18 +548,14 @@ private Attributes otelAttributesFrom(ReadSession readSession) {
             "bq.storage.read_session.serialized_size",
             getFieldAsString(readSession.getSerializedSize()))
         .put("bq.storage.read_session.table", getFieldAsString(readSession.getTable()))
-        .put(
-            "bq.storage.read_session.estimated_row_count",
-            getFieldAsString(readSession.getEstimatedRowCount()))
+        .put("bq.storage.read_session.estimated_row_count", readSession.getEstimatedRowCount())
         .put(
             "bq.storage.read_session.estimated_total_bytes_scanned",
-            getFieldAsString(readSession.getEstimatedTotalBytesScanned()))
+            readSession.getEstimatedTotalBytesScanned())
         .put(
             "bq.storage.read_session.estimated_total_physical_bytes",
-            getFieldAsString(readSession.getEstimatedTotalPhysicalFileSize()))
-        .put(
-            "bq.storage.read_session.streams_count",
-            getFieldAsString(readSession.getStreamsCount()))
+            readSession.getEstimatedTotalPhysicalFileSize())
+        .put("bq.storage.read_session.streams_count", readSession.getStreamsCount())
         .put("bq.storage.read_session.trace_id", getFieldAsString(readSession.getTraceId()))
         .put("bq.storage.read_session.expire_time", getFieldAsString(readSession.getExpireTime()))
         .build();

google-cloud-bigquerystorage/src/test/java/com/google/cloud/bigquery/storage/v1/it/ITBigQueryStorageTest.java

@@ -469,7 +469,6 @@ public class ITBigQueryStorageTest {
       new HashMap<String, Map<AttributeKey<?>, Object>>();
   private static final Map<String, String> OTEL_PARENT_SPAN_IDS = new HashMap<>();
   private static final Map<String, String> OTEL_SPAN_IDS_TO_NAMES = new HashMap<>();
-  private static final String OTEL_PARENT_SPAN_ID = "0000000000000000";
 
   private static class TestSpanExporter implements io.opentelemetry.sdk.trace.export.SpanExporter {
     @Override
@@ -1600,34 +1599,30 @@ public void testUniverseDomainWithMatchingDomain() throws IOException {
   }
 
   @Test
-  public void testSimpleReadWithOtelTracing() {
-    client.enableOpenTelemetryTracing();
+  public void testSimpleReadWithOtelTracing() throws IOException {
+    BigQueryReadSettings otelSettings =
+        BigQueryReadSettings.newBuilder().setEnableOpenTelemetryTracing(true).build();
+    BigQueryReadClient otelClient = BigQueryReadClient.create(otelSettings);
+
     String table =
         BigQueryResource.FormatTableResource(
             /* projectId= */ "bigquery-public-data",
             /* datasetId= */ "samples",
             /* tableId= */ "shakespeare");
 
     ReadSession session =
-        client.createReadSession(
+        otelClient.createReadSession(
             /* parent= */ parentProjectId,
             /* readSession= */ ReadSession.newBuilder()
                 .setTable(table)
                 .setDataFormat(DataFormat.AVRO)
                 .build(),
             /* maxStreamCount= */ 1);
-    assertEquals(
-        String.format(
-            "Did not receive expected number of streams for table '%s' CreateReadSession"
-                + " response:%n%s",
-            table, session.toString()),
-        1,
-        session.getStreamsCount());
 
     ReadRowsRequest readRowsRequest =
         ReadRowsRequest.newBuilder().setReadStream(session.getStreams(0).getName()).build();
 
-    ServerStream<ReadRowsResponse> stream = client.readRowsCallable().call(readRowsRequest);
+    ServerStream<ReadRowsResponse> stream = otelClient.readRowsCallable().call(readRowsRequest);
 
     assertNotNull(
         OTEL_ATTRIBUTES.get("com.google.cloud.bigquery.storage.v1.read.createReadSession"));
@@ -1647,12 +1642,17 @@ public void testSimpleReadWithOtelTracing() {
             OTEL_PARENT_SPAN_IDS.get(
                 "com.google.cloud.bigquery.storage.v1.read.createReadSessionCallable")),
         "com.google.cloud.bigquery.storage.v1.read.createReadSession");
+
+    Map<AttributeKey<?>, Object> createReadSessionMap =
+        OTEL_ATTRIBUTES.get("com.google.cloud.bigquery.storage.v1.read.createReadSession");
+    assertNotNull(createReadSessionMap);
+    assertNotNull(
+        createReadSessionMap.get(
+            AttributeKey.longKey("bq.storage.read_session.request.max_stream_count")));
     assertEquals(
-        OTEL_ATTRIBUTES
-            .get("com.google.cloud.bigquery.storage.v1.read.createReadSession")
-            .get("bq.storage.read_session.request.max_stream_count"),
-        1);
-    client.disableOpenTelemetryTracing();
+        createReadSessionMap.get(
+            AttributeKey.longKey("bq.storage.read_session.request.max_stream_count")),
+        1L);
   }
 
   public void testUniverseDomain() throws IOException {