From ec199e992e3bfe8bee372e2afd35d5e194511363 Mon Sep 17 00:00:00 2001
From: Chamikara Jayalath <chamikaramj@gmail.com>
Date: Thu, 31 Mar 2022 10:05:09 -0700
Subject: [PATCH] Merge pull request #17228: [BEAM-14179] Fix possibly null
 value

---
 .../java/org/apache/beam/sdk/io/gcp/datastore/DatastoreV1.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/datastore/DatastoreV1.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/datastore/DatastoreV1.java
index 042887994ec4..7e88de712b69 100644
--- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/datastore/DatastoreV1.java
+++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/datastore/DatastoreV1.java
@@ -919,7 +919,8 @@ private RunQueryResponse runQueryWithRetries(RunQueryRequest request) throws Exc
                   options.getProjectId(), options.getNamespace()));
           baseLabels.put(MonitoringInfoConstants.Labels.DATASTORE_PROJECT, options.getProjectId());
           baseLabels.put(
-              MonitoringInfoConstants.Labels.DATASTORE_NAMESPACE, options.getNamespace());
+              MonitoringInfoConstants.Labels.DATASTORE_NAMESPACE,
+              String.valueOf(options.getNamespace()));
           ServiceCallMetric serviceCallMetric =
               new ServiceCallMetric(MonitoringInfoConstants.Urns.API_REQUEST_COUNT, baseLabels);
           try {