use different proto

apache · Oct 29, 2024 · e2847b8 · e2847b8
1 parent 6887687
commit e2847b8
Show file tree

Hide file tree

Showing 38 changed files with 2,077 additions and 2,357 deletions.
diff --git a/model/pipeline/src/main/proto/org/apache/beam/model/pipeline/v1/metrics.proto b/model/pipeline/src/main/proto/org/apache/beam/model/pipeline/v1/metrics.proto
@@ -352,7 +352,6 @@ message MonitoringInfoSpecs {
       ]
     }];
 
-  //import com.google.api.services.dataflow.model.PerWorkerMetrics;
     API_REQUEST_LATENCIES = 20 [(monitoring_info_spec) = {
       urn: "beam:metric:io:api_request_latencies:v1",
       type: "beam:metrics:histogram_int64:v1",
@@ -587,9 +586,7 @@ message MonitoringInfoTypeUrns {
     SET_STRING_TYPE = 11 [(org.apache.beam.model.pipeline.v1.beam_urn) =
       "beam:metrics:set_string:v1"];
 
-    // Encoding: <iter><value1><value2>...<valueN></iter>
-    //   - iter:   beam:coder:iterable:v1
-    //   - valueX: beam:coder:stringutf8:v1
+    // Represents histograms 
     PER_WORKER_HISTOGRAM = 12 [(org.apache.beam.model.pipeline.v1.beam_urn) =
       "beam:metrics:per_worker_histogram_int64:v1"];
 

diff --git a/runners/core-java/build.gradle b/runners/core-java/build.gradle
@@ -38,29 +38,21 @@ test {
   }
 }
 
-// def google_api_services_dataflow = library.java.google_api_services_dataflow
-
 dependencies {
   implementation project(path: ":model:pipeline", configuration: "shadow")
   implementation project(path: ":sdks:java:core", configuration: "shadow")
   implementation project(path: ":model:job-management", configuration: "shadow")
+  provided library.java.google_api_services_dataflow
   implementation library.java.vendored_guava_32_1_2_jre
   implementation library.java.joda_time
   implementation library.java.vendored_grpc_1_60_1
   implementation library.java.slf4j_api
   implementation library.java.jackson_core
   implementation library.java.jackson_databind
-  // implementation library.java.proto_google_common_protos
-  implementation library.java.google_cloud_dataflow_java_proto_library_all
-
   testImplementation project(path: ":sdks:java:core", configuration: "shadowTest")
   testImplementation library.java.junit
   testImplementation library.java.mockito_core
   testImplementation library.java.slf4j_api
   testRuntimeOnly library.java.slf4j_simple
-  provided(library.java.google_api_services_dataflow)
-  provided library.java.google_cloud_dataflow_java_proto_library_all
-  testImplementation library.java.google_cloud_dataflow_java_proto_library_all
   testImplementation(library.java.google_api_services_dataflow)
-  implementation project(path: ":runners:google-cloud-dataflow-java:worker:windmill", configuration: "shadow") // need histogram proto
 }
diff --git a/...rs/core-java/src/main/java/org/apache/beam/runners/core/metrics/DefaultMetricResults.java b/...rs/core-java/src/main/java/org/apache/beam/runners/core/metrics/DefaultMetricResults.java
@@ -28,8 +28,6 @@
 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;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Default implementation of {@link org.apache.beam.sdk.metrics.MetricResults}, which takes static
@@ -40,7 +38,6 @@
   "nullness" // TODO(https://github.com/apache/beam/issues/20497)
 })
 public class DefaultMetricResults extends MetricResults {
-  private static final Logger LOG = LoggerFactory.getLogger(DefaultMetricResults.class);
 
   private final Iterable<MetricResult<Long>> counters;
   private final Iterable<MetricResult<DistributionResult>> distributions;
@@ -54,7 +51,6 @@ public DefaultMetricResults(
       Iterable<MetricResult<GaugeResult>> gauges,
       Iterable<MetricResult<StringSetResult>> stringSets,
       Iterable<MetricResult<HistogramData>> perWorkerHistograms) {
-    LOG.info("xxx does this get here? DefaultMetricResults ");
     this.counters = counters;
     this.distributions = distributions;
     this.gauges = gauges;

diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/HistogramCell.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/HistogramCell.java
@@ -62,7 +62,6 @@ public void update(double value) {
     dirty.afterModification();
   }
 
-  /** Update it by another Histogram Data. */
   @Override
   public void update(HistogramData data) {
     this.value.update(data);

diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/LabeledMetrics.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/LabeledMetrics.java
@@ -52,13 +52,4 @@ public static Histogram histogram(
       boolean processWideContainer) {
     return new DelegatingHistogram(metricName, bucketType, processWideContainer);
   }
-
-  public static Histogram histogram(
-      MonitoringInfoMetricName metricName,
-      HistogramData.BucketType bucketType,
-      boolean processWideContainer,
-      boolean perWorkerHistogram) {
-    return new DelegatingHistogram(
-        metricName, bucketType, processWideContainer, perWorkerHistogram);
-  }
 }
diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/LockFreeHistogram.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/LockFreeHistogram.java
diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/MetricUpdates.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/metrics/MetricUpdates.java
@@ -78,7 +78,6 @@ public static MetricUpdates create(
       Iterable<MetricUpdate<GaugeData>> gaugeUpdates,
       Iterable<MetricUpdate<StringSetData>> stringSetUpdates,
       Iterable<MetricUpdate<HistogramData>> perWorkerHistogramsUpdates) {
-    // System.out.println("xxx metric create");
     return new AutoValue_MetricUpdates(
         counterUpdates,
         distributionUpdates,