testing if there's a disconnect between proto behavior locally and in tests

Author: jrmccluskey

sdks/python/apache_beam/runners/dataflow/dataflow_metrics.py

@@ -202,10 +202,14 @@ def _get_metric_value(self, metric):
     if metric is None:
       return None
 
-    if metric.HasField('scalar'):
+    print("Scalar: ", metric.scalar)
+    print("Distribution: ", metric.distribution)
+    if metric.scalar is not None:
       # This will always be a single value if there is any data in the field.
+      print("Treating as scalar: ", metric.scalar.number_value)
       return metric.scalar.number_value
-    elif metric.HasField('distribution'):
+    elif metric.distribution is not None:
+      print("Treating as distribution: ", metric.distribution)
       dist_count = metric.distribution.struct_value.fields['count'].number_value
       dist_min = metric.distribution.struct_value.fields['min'].number_value
       dist_max = metric.distribution.struct_value.fields['max'].number_value

sdks/python/apache_beam/runners/dataflow/dataflow_metrics_test.py

@@ -148,6 +148,7 @@ class TestDataflowMetrics(unittest.TestCase):
                   "name": "word_length_dist",
                   "origin": "user"
               },
+              "scalar": None,
               "distribution": {
                   "min": 2,
                   "max": 16,
@@ -165,6 +166,7 @@ class TestDataflowMetrics(unittest.TestCase):
                   "name": "word_length_dist",
                   "origin": "user"
               },
+              "scalar": None,
               "distribution": {
                   "min": 2,
                   "max": 16,
@@ -260,7 +262,6 @@ def setup_mock_client_result(self, counter_list=None):
     mock_client = mock.Mock()
     mock_query_result = json_format.ParseDict(
         counter_list, dataflow.JobMetrics()._pb)
-    print("mock_query_result: ", mock_query_result)
     mock_client.get_job_metrics.return_value = mock_query_result
     mock_job_result = mock.Mock()
     mock_job_result.job_id.return_value = 1