Add histogram metric to portable runner

Author: Naireen

model/pipeline/src/main/proto/org/apache/beam/model/pipeline/v1/metrics.proto

@@ -378,6 +378,16 @@ message MonitoringInfoSpecs {
         }
       ]
     }];
+
+    USER_PER_WORKER_HISTOGRAM = 22 [(monitoring_info_spec) = {
+      urn: "beam:metric:user:per_worker_histogram_int64:v1",
+      type: "beam:metrics:per_worker_histogram_int64:v1",
+      required_labels: ["PTRANSFORM", "NAMESPACE", "NAME"],
+      annotations: [{
+        key: "description",
+        value: "URN utilized to report per worker histogram metric."
+      }]
+    }];
   }
 }
 
@@ -593,6 +603,12 @@ message MonitoringInfoTypeUrns {
     BOUNDED_TRIE_TYPE = 12 [(org.apache.beam.model.pipeline.v1.beam_urn) =
       "beam:metrics:bounded_trie:v1"];
 
+    // Represents a histogram.
+    //
+    // Encoding: DataflowHistogram proto
+    HISTOGRAM = 13 [(org.apache.beam.model.pipeline.v1.beam_urn) =
+      "beam:metrics:histogram_int64:v1"];
+
     // General monitored state information which contains structured information
     // which does not fit into a typical metric format. See MonitoringTableData
     // for more details.

runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/DefaultMetricResults.java

@@ -26,6 +26,7 @@
 import org.apache.beam.sdk.metrics.MetricResults;
 import org.apache.beam.sdk.metrics.MetricsFilter;
 import org.apache.beam.sdk.metrics.StringSetResult;
+import org.apache.beam.sdk.util.HistogramData;
 import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Iterables;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -44,18 +45,21 @@ public class DefaultMetricResults extends MetricResults {
   private final Iterable<MetricResult<GaugeResult>> gauges;
   private final Iterable<MetricResult<StringSetResult>> stringSets;
   private final Iterable<MetricResult<BoundedTrieResult>> boundedTries;
+  private final Iterable<MetricResult<HistogramData>> perWorkerHistograms;
 
   public DefaultMetricResults(
       Iterable<MetricResult<Long>> counters,
       Iterable<MetricResult<DistributionResult>> distributions,
       Iterable<MetricResult<GaugeResult>> gauges,
       Iterable<MetricResult<StringSetResult>> stringSets,
-      Iterable<MetricResult<BoundedTrieResult>> boundedTries) {
+      Iterable<MetricResult<BoundedTrieResult>> boundedTries,
+      Iterable<MetricResult<HistogramData>> perWorkerHistograms) {
     this.counters = counters;
     this.distributions = distributions;
     this.gauges = gauges;
     this.stringSets = stringSets;
     this.boundedTries = boundedTries;
+    this.perWorkerHistograms = perWorkerHistograms;
   }
 
   @Override
@@ -68,6 +72,10 @@ public MetricQueryResults queryMetrics(@Nullable MetricsFilter filter) {
         Iterables.filter(
             stringSets, stringSets -> MetricFiltering.matches(filter, stringSets.getKey())),
         Iterables.filter(
-            boundedTries, boundedTries -> MetricFiltering.matches(filter, boundedTries.getKey())));
+            boundedTries, boundedTries -> MetricFiltering.matches(filter, boundedTries.getKey())),
+            Iterables.filter(
+              perWorkerHistograms,
+              perWorkerHistogram -> MetricFiltering.matches(filter, perWorkerHistogram.getKey())));
+  
   }
 }

runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/HistogramCell.java

@@ -70,6 +70,12 @@ public void update(HistogramCell other) {
     dirty.afterModification();
   }
 
+  @Override
+  public void update(HistogramData data) {
+    this.value.update(data);
+    dirty.afterModification();
+  }
+
   // TODO(https://github.com/apache/beam/issues/20853): Update this function to allow incrementing
   // the infinite buckets as well.
   // and remove the incTopBucketCount and incBotBucketCount methods.

runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/MetricUpdates.java

@@ -21,6 +21,7 @@
 import java.io.Serializable;
 import java.util.Collections;
 import org.apache.beam.sdk.metrics.MetricKey;
+import org.apache.beam.sdk.util.HistogramData;
 import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Iterables;
 
 /** Representation of multiple metric updates. */
@@ -35,6 +36,7 @@ public abstract class MetricUpdates {
           Collections.emptyList(),
           Collections.emptyList(),
           Collections.emptyList(),
+          Collections.emptyList(),
           Collections.emptyList());
 
   /**
@@ -69,15 +71,23 @@ public static <T> MetricUpdate<T> create(MetricKey key, T update) {
 
   public abstract Iterable<MetricUpdate<BoundedTrieData>> boundedTrieUpdates();
 
+  /** All the histogram updates. */
+  public abstract Iterable<MetricUpdate<HistogramData>> perWorkerHistogramsUpdates();
+
   /** Create a new {@link MetricUpdates} bundle. */
   public static MetricUpdates create(
       Iterable<MetricUpdate<Long>> counterUpdates,
       Iterable<MetricUpdate<DistributionData>> distributionUpdates,
       Iterable<MetricUpdate<GaugeData>> gaugeUpdates,
       Iterable<MetricUpdate<StringSetData>> stringSetUpdates,
-      Iterable<MetricUpdate<BoundedTrieData>> boundedTrieUpdates) {
+      Iterable<MetricUpdate<BoundedTrieData>> boundedTrieUpdates,
+      Iterable<MetricUpdate<HistogramData>> perWorkerHistogramsUpdates) {
     return new AutoValue_MetricUpdates(
-        counterUpdates, distributionUpdates, gaugeUpdates, stringSetUpdates, boundedTrieUpdates);
+        counterUpdates,
+        distributionUpdates,
+        gaugeUpdates,
+        stringSetUpdates, boundedTrieUpdates,
+        perWorkerHistogramsUpdates);
   }
 
   /** Returns true if there are no updates in this MetricUpdates object. */
@@ -86,6 +96,7 @@ public boolean isEmpty() {
         && Iterables.isEmpty(distributionUpdates())
         && Iterables.isEmpty(gaugeUpdates())
         && Iterables.isEmpty(stringSetUpdates())
-        && Iterables.isEmpty(boundedTrieUpdates());
+        && Iterables.isEmpty(boundedTrieUpdates())
+        && Iterables.isEmpty(perWorkerHistogramsUpdates());
   }
 }