[FLINK-37426][metrics] Extract AttributeBuilder interface

Author: pnowojski

flink-metrics/flink-metrics-core/src/main/java/org/apache/flink/AttributeBuilder.java

@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink;
+
+import org.apache.flink.annotation.Experimental;
+
+/** Common interface to all builders that support key-value attributes. */
+@Experimental
+public interface AttributeBuilder {
+    /** Additional attribute to be attached to this builder. */
+    AttributeBuilder setAttribute(String key, String value);
+
+    /** Additional attribute to be attached to this builder. */
+    AttributeBuilder setAttribute(String key, long value);
+
+    /** Additional attribute to be attached to this builder. */
+    AttributeBuilder setAttribute(String key, double value);
+
+    /** Additional attribute to be attached to this builder. */
+    AttributeBuilder setAttribute(String key, boolean value);
+}

flink-metrics/flink-metrics-core/src/main/java/org/apache/flink/events/EventBuilder.java

@@ -18,6 +18,7 @@
 
 package org.apache.flink.events;
 
+import org.apache.flink.AttributeBuilder;
 import org.apache.flink.annotation.Experimental;
 
 import java.util.Collections;
@@ -26,7 +27,7 @@
 
 /** Builder used to construct {@link Event}. See {@link Event#builder(Class, String)}. */
 @Experimental
-public class EventBuilder {
+public class EventBuilder implements AttributeBuilder {
     private long observedTsMillis;
     private String name;
     private String classScope;
@@ -86,24 +87,28 @@ public EventBuilder setSeverity(String severity) {
     }
 
     /** Additional attribute to be attached to this {@link Event}. */
+    @Override
     public EventBuilder setAttribute(String key, String value) {
         attributes.put(key, value);
         return this;
     }
 
     /** Additional attribute to be attached to this {@link Event}. */
+    @Override
     public EventBuilder setAttribute(String key, long value) {
         attributes.put(key, value);
         return this;
     }
 
     /** Additional attribute to be attached to this {@link Event}. */
+    @Override
     public EventBuilder setAttribute(String key, double value) {
         attributes.put(key, value);
         return this;
     }
 
     /** Additional attribute to be attached to this {@link Event}. */
+    @Override
     public EventBuilder setAttribute(String key, boolean value) {
         attributes.put(key, value);
         return this;

flink-metrics/flink-metrics-core/src/main/java/org/apache/flink/traces/SpanBuilder.java

@@ -18,6 +18,7 @@
 
 package org.apache.flink.traces;
 
+import org.apache.flink.AttributeBuilder;
 import org.apache.flink.annotation.Experimental;
 
 import java.util.Collections;
@@ -26,7 +27,7 @@
 
 /** Builder used to construct {@link Span}. See {@link Span#builder(Class, String)}. */
 @Experimental
-public class SpanBuilder {
+public class SpanBuilder implements AttributeBuilder {
     private final HashMap<String, Object> attributes = new HashMap<>();
     private final Class<?> classScope;
     private final String name;
@@ -89,23 +90,33 @@ public SpanBuilder setEndTsMillis(long endTsMillis) {
     }
 
     /** Additional attribute to be attached to this {@link Span}. */
+    @Override
     public SpanBuilder setAttribute(String key, String value) {
         attributes.put(key, value);
         return this;
     }
 
     /** Additional attribute to be attached to this {@link Span}. */
+    @Override
     public SpanBuilder setAttribute(String key, long value) {
         attributes.put(key, value);
         return this;
     }
 
     /** Additional attribute to be attached to this {@link Span}. */
+    @Override
     public SpanBuilder setAttribute(String key, double value) {
         attributes.put(key, value);
         return this;
     }
 
+    /** Additional attribute to be attached to this {@link Span}. */
+    @Override
+    public SpanBuilder setAttribute(String key, boolean value) {
+        attributes.put(key, value);
+        return this;
+    }
+
     public String getName() {
         return name;
     }