Skip to content

Commit 409a3ab

Browse files
committed
chore: minor improvements
1 parent fd30068 commit 409a3ab

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import com.google.cloud.bigquery.exception.BigQueryJdbcException;
4545
import io.opentelemetry.api.trace.Span;
4646
import io.opentelemetry.api.trace.SpanContext;
47+
import io.opentelemetry.api.trace.StatusCode;
4748
import io.opentelemetry.api.trace.Tracer;
4849
import io.opentelemetry.context.Context;
4950
import io.opentelemetry.context.Scope;
@@ -1744,6 +1745,7 @@ public ResultSet getTables(
17441745
Span backgroundSpan =
17451746
tracer
17461747
.spanBuilder("BigQueryDatabaseMetaData.getTables.background")
1748+
.setNoParent()
17471749
.addLink(parentSpanContext)
17481750
.startSpan();
17491751

@@ -1900,6 +1902,7 @@ public ResultSet getTables(
19001902
return resultSet;
19011903
} catch (Exception e) {
19021904
span.recordException(e);
1905+
span.setStatus(StatusCode.ERROR, e.getMessage());
19031906
throw e;
19041907
} finally {
19051908
span.end();
@@ -2045,6 +2048,7 @@ public ResultSet getCatalogs() {
20452048
catalogsSchema, catalogRows.size(), queue, null, new Thread[0]);
20462049
} catch (Exception e) {
20472050
span.recordException(e);
2051+
span.setStatus(StatusCode.ERROR, e.getMessage());
20482052
throw e;
20492053
} finally {
20502054
span.end();
@@ -2145,6 +2149,7 @@ public ResultSet getColumns(
21452149
Span backgroundSpan =
21462150
tracer
21472151
.spanBuilder("BigQueryDatabaseMetaData.getColumns.background")
2152+
.setNoParent()
21482153
.addLink(parentSpanContext)
21492154
.startSpan();
21502155

@@ -2258,6 +2263,7 @@ public ResultSet getColumns(
22582263
return resultSet;
22592264
} catch (Exception e) {
22602265
span.recordException(e);
2266+
span.setStatus(StatusCode.ERROR, e.getMessage());
22612267
throw e;
22622268
} finally {
22632269
span.end();
@@ -3707,6 +3713,7 @@ public ResultSet getSchemas(String catalog, String schemaPattern) {
37073713
Span backgroundSpan =
37083714
tracer
37093715
.spanBuilder("BigQueryDatabaseMetaData.getSchemas.background")
3716+
.setNoParent()
37103717
.addLink(parentSpanContext)
37113718
.startSpan();
37123719

@@ -3799,6 +3806,7 @@ public ResultSet getSchemas(String catalog, String schemaPattern) {
37993806
return resultSet;
38003807
} catch (Exception e) {
38013808
span.recordException(e);
3809+
span.setStatus(StatusCode.ERROR, e.getMessage());
38023810
throw e;
38033811
} finally {
38043812
span.end();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1578,7 +1578,7 @@ private void fetchNextPages(
15781578
}
15791579

15801580
SpanBuilder spanBuilder = tracer.spanBuilder("BigQueryStatement.pagination");
1581-
if (parentSpanContext != null) {
1581+
if (parentSpanContext.isValid()) {
15821582
spanBuilder.addLink(parentSpanContext);
15831583
}
15841584
Span paginationSpan = spanBuilder.startSpan();

0 commit comments

Comments
 (0)