|
18 | 18 | import static com.google.common.truth.Truth.assertThat; |
19 | 19 | import static org.junit.jupiter.api.Assertions.assertEquals; |
20 | 20 | import static org.junit.jupiter.api.Assertions.assertNotNull; |
| 21 | +import static org.junit.jupiter.api.Assertions.assertNull; |
21 | 22 | import static org.junit.jupiter.api.Assertions.assertThrows; |
22 | 23 | import static org.junit.jupiter.api.Assertions.assertTrue; |
23 | 24 |
|
|
44 | 45 | import com.google.api.services.bigquery.model.TableReference; |
45 | 46 | import com.google.cloud.NoCredentials; |
46 | 47 | import com.google.cloud.bigquery.BigQueryOptions; |
| 48 | +import com.google.cloud.bigquery.telemetry.BigQueryTelemetryTracer; |
| 49 | +import com.google.cloud.bigquery.telemetry.HttpTracingRequestInitializer; |
47 | 50 | import io.opentelemetry.api.common.AttributeKey; |
48 | 51 | import io.opentelemetry.api.trace.Tracer; |
49 | 52 | import io.opentelemetry.sdk.OpenTelemetrySdk; |
@@ -943,9 +946,8 @@ public void testHttpTracingEnabledAddsAdditionalAttributes() throws Exception { |
943 | 946 | .findFirst() |
944 | 947 | .orElse(null); |
945 | 948 | assertNotNull(rpcSpan); |
946 | | - assertEquals( |
947 | | - "http", rpcSpan.getAttributes().get(AttributeKey.stringKey("rpc.system.name"))); |
948 | | - assertNotNull(rpcSpan.getAttributes().get(AttributeKey.stringKey("server.address"))); |
| 949 | + assertEquals("http", rpcSpan.getAttributes().get(BigQueryTelemetryTracer.RPC_SYSTEM_NAME)); |
| 950 | + assertNotNull(rpcSpan.getAttributes().get(HttpTracingRequestInitializer.URL_DOMAIN)); |
949 | 951 | } finally { |
950 | 952 | System.clearProperty("com.google.cloud.bigquery.http.tracing.dev.enabled"); |
951 | 953 | } |
@@ -987,8 +989,8 @@ public void testHttpTracingDisabledDoesNotAddAdditionalAttributes() throws Excep |
987 | 989 | .findFirst() |
988 | 990 | .orElse(null); |
989 | 991 | assertNotNull(rpcSpan); |
990 | | - assertThat(rpcSpan.getAttributes().get(AttributeKey.stringKey("rpc.system.name"))).isNull(); |
991 | | - assertThat(rpcSpan.getAttributes().get(AttributeKey.stringKey("server.address"))).isNull(); |
| 992 | + assertNull(rpcSpan.getAttributes().get(BigQueryTelemetryTracer.RPC_SYSTEM_NAME)); |
| 993 | + assertNull(rpcSpan.getAttributes().get(HttpTracingRequestInitializer.URL_DOMAIN)); |
992 | 994 | } finally { |
993 | 995 | System.clearProperty("com.google.cloud.bigquery.http.tracing.dev.enabled"); |
994 | 996 | } |
|
0 commit comments