From 1342af07b4e87662c7cab630979fe9c1e7f8c16b Mon Sep 17 00:00:00 2001 From: Gal Zahavi <38544478+galz10@users.noreply.github.com> Date: Tue, 16 May 2023 12:54:59 -0700 Subject: [PATCH 1/2] fix: filter None values from OpenTelemetry attributes --- google/cloud/bigquery/opentelemetry_tracing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google/cloud/bigquery/opentelemetry_tracing.py b/google/cloud/bigquery/opentelemetry_tracing.py index 3d0a66ba8..f331bbeaf 100644 --- a/google/cloud/bigquery/opentelemetry_tracing.py +++ b/google/cloud/bigquery/opentelemetry_tracing.py @@ -97,7 +97,7 @@ def _get_final_span_attributes(attributes=None, client=None, job_ref=None): final_attributes.update(job_attributes) if attributes: final_attributes.update(attributes) - return final_attributes + return {k: v for k, v in final_attributes.items() if v} def _set_client_attributes(client): From 19edf97035331eb840f8e9fc908b8c82b870eeb1 Mon Sep 17 00:00:00 2001 From: Gal Zahavi <38544478+galz10@users.noreply.github.com> Date: Thu, 18 May 2023 10:14:41 -0700 Subject: [PATCH 2/2] moved filtering out before return value --- google/cloud/bigquery/opentelemetry_tracing.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/google/cloud/bigquery/opentelemetry_tracing.py b/google/cloud/bigquery/opentelemetry_tracing.py index f331bbeaf..0e1187c6b 100644 --- a/google/cloud/bigquery/opentelemetry_tracing.py +++ b/google/cloud/bigquery/opentelemetry_tracing.py @@ -97,7 +97,12 @@ def _get_final_span_attributes(attributes=None, client=None, job_ref=None): final_attributes.update(job_attributes) if attributes: final_attributes.update(attributes) - return {k: v for k, v in final_attributes.items() if v} + + filtered = {k: v for k, v in final_attributes.items() if v is not None} + final_attributes.clear() + final_attributes.update(filtered) + + return final_attributes def _set_client_attributes(client):