Cache toString() for MetricKey and MetricName in instance variables

linkedin · Aug 30, 2024 · a7a4293 · a7a4293
1 parent 10074a9
commit a7a4293
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -398,7 +398,7 @@ class BeamModulePlugin implements Plugin<Project> {
 
     // Automatically use the official release version if we are performing a release
     // otherwise append '-SNAPSHOT'
-    project.version = '2.45.24'
+    project.version = '2.45.25'
     if (isLinkedin(project)) {
       project.ext.mavenGroupId = 'com.linkedin.beam'
     }

diff --git a/gradle.properties b/gradle.properties
@@ -30,8 +30,8 @@ signing.gnupg.useLegacyGpg=true
 # buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy.
 # To build a custom Beam version make sure you change it in both places, see
 # https://github.com/apache/beam/issues/21302.
-version=2.45.24
-sdk_version=2.45.24
+version=2.45.25
+sdk_version=2.45.25
 
 javaVersion=1.8
 

diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/metrics/MetricKey.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/metrics/MetricKey.java
@@ -18,11 +18,13 @@
 package org.apache.beam.sdk.metrics;
 
 import com.google.auto.value.AutoValue;
+import com.google.auto.value.extension.memoized.Memoized;
 import java.io.Serializable;
 import org.apache.beam.sdk.annotations.Experimental;
 import org.apache.beam.sdk.annotations.Experimental.Kind;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+
 /** Metrics are keyed by the step name they are associated with and the name of the metric. */
 @Experimental(Kind.METRICS)
 @AutoValue
@@ -35,6 +37,7 @@ public abstract class MetricKey implements Serializable {
   public abstract MetricName metricName();
 
   @Override
+  @Memoized
   public final String toString() {
     return stepName() + ":" + metricName();
   }

diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/metrics/MetricName.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/metrics/MetricName.java
@@ -17,14 +17,16 @@
  */
 package org.apache.beam.sdk.metrics;
 
-import static org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.checkArgument;
-
 import com.google.auto.value.AutoValue;
+import com.google.auto.value.extension.memoized.Memoized;
 import java.io.Serializable;
 import org.apache.beam.sdk.annotations.Experimental;
 import org.apache.beam.sdk.annotations.Experimental.Kind;
 import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Strings;
 
+import static org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions.*;
+
+
 /**
  * The name of a metric consists of a {@link #getNamespace} and a {@link #getName}. The {@link
  * #getNamespace} allows grouping related metrics together and also prevents collisions between
@@ -42,6 +44,7 @@ public abstract class MetricName implements Serializable {
   public abstract String getName();
 
   @Override
+  @Memoized
   public String toString() {
     return getNamespace() + ":" + getName();
   }