[BEAM-12490] Fixed test_harness_monitoring_infos_and_metadata precomm…

…it error (#15033)
apache · Jun 18, 2021 · 9af555d · 9af555d
1 parent 6c15b0f
commit 9af555d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/sdks/python/apache_beam/io/gcp/gcsio.py b/sdks/python/apache_beam/io/gcp/gcsio.py
@@ -591,7 +591,7 @@ def __init__(self, client, path, buffer_size, get_project_number):
         monitoring_infos.METHOD_LABEL: 'Objects.get',
         monitoring_infos.RESOURCE_LABEL: resource,
         monitoring_infos.GCS_BUCKET_LABEL: self._bucket,
-        monitoring_infos.GCS_PROJECT_ID_LABEL: project_number
+        monitoring_infos.GCS_PROJECT_ID_LABEL: str(project_number)
     }
     service_call_metric = ServiceCallMetric(
         request_count_urn=monitoring_infos.API_REQUEST_COUNT_URN,
@@ -697,7 +697,7 @@ def _start_upload(self):
         monitoring_infos.METHOD_LABEL: 'Objects.insert',
         monitoring_infos.RESOURCE_LABEL: resource,
         monitoring_infos.GCS_BUCKET_LABEL: self._bucket,
-        monitoring_infos.GCS_PROJECT_ID_LABEL: project_number
+        monitoring_infos.GCS_PROJECT_ID_LABEL: str(project_number)
     }
     service_call_metric = ServiceCallMetric(
         request_count_urn=monitoring_infos.API_REQUEST_COUNT_URN,

diff --git a/sdks/python/apache_beam/io/gcp/gcsio_test.py b/sdks/python/apache_beam/io/gcp/gcsio_test.py
@@ -769,6 +769,9 @@ def test_mime_binary_encoding(self):
     self.assertEqual(test_msg.encode('ascii'), output_buffer.getvalue())
 
   def test_downloader_monitoring_info(self):
+    # Clear the process wide metric container.
+    MetricsEnvironment.process_wide_container().reset()
+
     file_name = 'gs://gcsio-metrics-test/dummy_mode_file'
     file_size = 5 * 1024 * 1024 + 100
     random_file = self._insert_random_file(self.client, file_name, file_size)
@@ -780,7 +783,7 @@ def test_downloader_monitoring_info(self):
         monitoring_infos.METHOD_LABEL: 'Objects.get',
         monitoring_infos.RESOURCE_LABEL: resource,
         monitoring_infos.GCS_BUCKET_LABEL: random_file.bucket,
-        monitoring_infos.GCS_PROJECT_ID_LABEL: DEFAULT_PROJECT_NUMBER,
+        monitoring_infos.GCS_PROJECT_ID_LABEL: str(DEFAULT_PROJECT_NUMBER),
         monitoring_infos.STATUS_LABEL: 'ok'
     }
 
@@ -792,6 +795,9 @@ def test_downloader_monitoring_info(self):
     self.assertEqual(metric_value, 2)
 
   def test_uploader_monitoring_info(self):
+    # Clear the process wide metric container.
+    MetricsEnvironment.process_wide_container().reset()
+
     file_name = 'gs://gcsio-metrics-test/dummy_mode_file'
     file_size = 5 * 1024 * 1024 + 100
     random_file = self._insert_random_file(self.client, file_name, file_size)
@@ -803,7 +809,7 @@ def test_uploader_monitoring_info(self):
         monitoring_infos.METHOD_LABEL: 'Objects.insert',
         monitoring_infos.RESOURCE_LABEL: resource,
         monitoring_infos.GCS_BUCKET_LABEL: random_file.bucket,
-        monitoring_infos.GCS_PROJECT_ID_LABEL: DEFAULT_PROJECT_NUMBER,
+        monitoring_infos.GCS_PROJECT_ID_LABEL: str(DEFAULT_PROJECT_NUMBER),
         monitoring_infos.STATUS_LABEL: 'ok'
     }