diff --git a/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java b/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java index 82f53a738efc..74c9ce60e84f 100644 --- a/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java +++ b/java-bigquery/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java @@ -452,7 +452,10 @@ && getOptions().getOpenTelemetryTracer() != null) { getOptions() .getOpenTelemetryTracer() .spanBuilder("com.google.cloud.bigquery.BigQuery.createJob") - .setAllAttributes(jobInfo.getJobId().getOtelAttributes()) + .setAllAttributes( + jobInfo.getJobId() != null + ? jobInfo.getJobId().getOtelAttributes() + : Attributes.empty()) .setAllAttributes(otelAttributesFromOptions(options)) .startSpan(); } @@ -2072,7 +2075,7 @@ && getOptions().getOpenTelemetryTracer() != null) { getOptions() .getOpenTelemetryTracer() .spanBuilder("com.google.cloud.bigquery.BigQuery.queryWithTimeout") - .setAllAttributes(jobId != null ? jobId.getOtelAttributes() : null) + .setAllAttributes(jobId != null ? jobId.getOtelAttributes() : Attributes.empty()) .setAllAttributes(otelAttributesFromOptions(options)) .startSpan(); } @@ -2125,7 +2128,7 @@ && getOptions().getOpenTelemetryTracer() != null) { getOptions() .getOpenTelemetryTracer() .spanBuilder("com.google.cloud.bigquery.BigQuery.getQueryResults") - .setAllAttributes(jobId.getOtelAttributes()) + .setAllAttributes(jobId != null ? jobId.getOtelAttributes() : Attributes.empty()) .setAllAttributes(otelAttributesFromOptions(options)) .startSpan(); }