Skip to content

Commit 3bb7f05

Browse files
committed
style: reformat code after test fixes
1 parent a0865ae commit 3bb7f05

2 files changed

Lines changed: 22 additions & 9 deletions

File tree

java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITOpenTelemetryTest.java

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,14 @@ public void testListDatasetsTraced() {
9999
assertEquals(200L, attrs.get(HttpTracingRequestInitializer.HTTP_RESPONSE_STATUS_CODE));
100100
assertEquals("bigquery.googleapis.com", attrs.get(BigQueryTelemetryTracer.URL_DOMAIN));
101101
assertEquals(
102-
"https://bigquery.googleapis.com/bigquery/v2/projects/" + bigqueryHelper.getOptions().getProjectId() + "/datasets?prettyPrint=false",
102+
"https://bigquery.googleapis.com/bigquery/v2/projects/"
103+
+ bigqueryHelper.getOptions().getProjectId()
104+
+ "/datasets?prettyPrint=false",
103105
attrs.get(HttpTracingRequestInitializer.URL_FULL));
104106
assertEquals(
105-
"//bigquery.googleapis.com/projects/" + bigqueryHelper.getOptions().getProjectId() + "/datasets",
107+
"//bigquery.googleapis.com/projects/"
108+
+ bigqueryHelper.getOptions().getProjectId()
109+
+ "/datasets",
106110
attrs.get(BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID));
107111
assertEquals(
108112
"projects/{+projectId}/datasets", attrs.get(BigQueryTelemetryTracer.URL_TEMPLATE));
@@ -146,19 +150,25 @@ public void testGetDatasetNotFoundTraced() {
146150
"projects/{+projectId}/datasets/{+datasetId}",
147151
attrs.get(BigQueryTelemetryTracer.URL_TEMPLATE));
148152
assertEquals(
149-
"https://bigquery.googleapis.com/bigquery/v2/projects/" + bigqueryHelper.getOptions().getProjectId() + "/datasets/non_existent_dataset?prettyPrint=false",
153+
"https://bigquery.googleapis.com/bigquery/v2/projects/"
154+
+ bigqueryHelper.getOptions().getProjectId()
155+
+ "/datasets/non_existent_dataset?prettyPrint=false",
150156
attrs.get(HttpTracingRequestInitializer.URL_FULL));
151157
assertEquals(
152158
"bigquery.googleapis.com", attrs.get(HttpTracingRequestInitializer.SERVER_ADDRESS));
153159
assertEquals("bigquery.googleapis.com", attrs.get(BigQueryTelemetryTracer.URL_DOMAIN));
154160
assertEquals(
155-
"//bigquery.googleapis.com/projects/" + bigqueryHelper.getOptions().getProjectId() + "/datasets/non_existent_dataset",
161+
"//bigquery.googleapis.com/projects/"
162+
+ bigqueryHelper.getOptions().getProjectId()
163+
+ "/datasets/non_existent_dataset",
156164
attrs.get(BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID));
157165

158166
// Error attributes
159167
assertEquals("notFound", attrs.get(BigQueryTelemetryTracer.ERROR_TYPE));
160168
assertEquals(
161-
"Not found: Dataset " + bigqueryHelper.getOptions().getProjectId() + ":non_existent_dataset",
169+
"Not found: Dataset "
170+
+ bigqueryHelper.getOptions().getProjectId()
171+
+ ":non_existent_dataset",
162172
attrs.get(BigQueryTelemetryTracer.STATUS_MESSAGE));
163173
}
164174
}
@@ -197,7 +207,9 @@ public void testClientErrorAndRetriesTraced() {
197207
Map<AttributeKey<?>, Object> attrs = span.getAttributes().asMap();
198208
checkGeneralAttributes(attrs);
199209
assertEquals(
200-
"https://invalid-host-name-12345.com:8080/bigquery/v2/projects/" + bigqueryHelper.getOptions().getProjectId() + "/datasets?prettyPrint=false",
210+
"https://invalid-host-name-12345.com:8080/bigquery/v2/projects/"
211+
+ bigqueryHelper.getOptions().getProjectId()
212+
+ "/datasets?prettyPrint=false",
201213
(String) attrs.get(HttpTracingRequestInitializer.URL_FULL));
202214
assertEquals(
203215
"invalid-host-name-12345.com", attrs.get(HttpTracingRequestInitializer.SERVER_ADDRESS));
@@ -206,7 +218,9 @@ public void testClientErrorAndRetriesTraced() {
206218
assertEquals(
207219
"projects/{+projectId}/datasets", attrs.get(BigQueryTelemetryTracer.URL_TEMPLATE));
208220
assertEquals(
209-
"//bigquery.googleapis.com/projects/" + bigqueryHelper.getOptions().getProjectId() + "/datasets",
221+
"//bigquery.googleapis.com/projects/"
222+
+ bigqueryHelper.getOptions().getProjectId()
223+
+ "/datasets",
210224
attrs.get(BigQueryTelemetryTracer.GCP_RESOURCE_DESTINATION_ID));
211225
checkRetryAttribute(span, rpcSpanCount);
212226

java-bigquery/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpcTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,8 +1079,7 @@ public void testHttpTracingEnabled_GenericException_SetsAttributes() throws Exce
10791079
assertEquals(
10801080
"java.io.IOException",
10811081
rpcSpan.getAttributes().get(BigQueryTelemetryTracer.EXCEPTION_TYPE));
1082-
assertEquals(
1083-
"IOException", rpcSpan.getAttributes().get(BigQueryTelemetryTracer.ERROR_TYPE));
1082+
assertEquals("IOException", rpcSpan.getAttributes().get(BigQueryTelemetryTracer.ERROR_TYPE));
10841083
}
10851084

10861085
@Test

0 commit comments

Comments
 (0)