Refactor advice API (#5848)

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedDoubleCounterBuilder.java

@@ -5,14 +5,18 @@
 
 package io.opentelemetry.extension.incubator.metrics;
 
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.metrics.DoubleCounterBuilder;
-import java.util.function.Consumer;
+import java.util.List;
 
 /** Extended {@link DoubleCounterBuilder} with experimental APIs. */
 public interface ExtendedDoubleCounterBuilder extends DoubleCounterBuilder {
 
-  /** Specify advice for counter implementations. */
-  default DoubleCounterBuilder setAdvice(Consumer<DoubleCounterAdviceConfigurer> adviceConsumer) {
+  /**
+   * Specify the attribute advice, which suggests the recommended set of attribute keys to be used
+   * for this counter.
+   */
+  default ExtendedDoubleCounterBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
     return this;
   }
 }

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedDoubleGaugeBuilder.java

@@ -5,7 +5,9 @@
 
 package io.opentelemetry.extension.incubator.metrics;
 
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.metrics.DoubleGaugeBuilder;
+import java.util.List;
 import java.util.function.Consumer;
 
 /** Extended {@link DoubleGaugeBuilder} with experimental APIs. */
@@ -22,8 +24,11 @@ public interface ExtendedDoubleGaugeBuilder extends DoubleGaugeBuilder {
    */
   DoubleGauge build();
 
-  /** Specify advice for gauge implementations. */
-  default DoubleGaugeBuilder setAdvice(Consumer<DoubleGaugeAdviceConfigurer> adviceConsumer) {
+  /**
+   * Specify the attribute advice, which suggests the recommended set of attribute keys to be used
+   * for this gauge.
+   */
+  default ExtendedDoubleGaugeBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
     return this;
   }
 }

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedDoubleHistogramBuilder.java

@@ -5,15 +5,27 @@
 
 package io.opentelemetry.extension.incubator.metrics;
 
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.metrics.DoubleHistogramBuilder;
-import java.util.function.Consumer;
+import java.util.List;
 
 /** Extended {@link DoubleHistogramBuilder} with experimental APIs. */
 public interface ExtendedDoubleHistogramBuilder extends DoubleHistogramBuilder {
 
-  /** Specify advice for histogram implementations. */
-  default DoubleHistogramBuilder setAdvice(
-      Consumer<DoubleHistogramAdviceConfigurer> adviceConsumer) {
+  /**
+   * Specify the explicit bucket buckets boundaries advice, which suggests the recommended set of
+   * explicit bucket boundaries for this histogram.
+   */
+  default ExtendedDoubleHistogramBuilder setExplicitBucketBoundariesAdvice(
+      List<Double> bucketBoundaries) {
+    return this;
+  }
+
+  /**
+   * Specify the attribute advice, which suggests the recommended set of attribute keys to be used
+   * for this histogram.
+   */
+  default ExtendedDoubleHistogramBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
     return this;
   }
 }

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedDoubleUpDownCounterBuilder.java

@@ -5,15 +5,18 @@
 
 package io.opentelemetry.extension.incubator.metrics;
 
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder;
-import java.util.function.Consumer;
+import java.util.List;
 
 /** Extended {@link DoubleUpDownCounterBuilder} with experimental APIs. */
 public interface ExtendedDoubleUpDownCounterBuilder extends DoubleUpDownCounterBuilder {
 
-  /** Specify advice for up down counter implementations. */
-  default DoubleUpDownCounterBuilder setAdvice(
-      Consumer<DoubleUpDownCounterAdviceConfigurer> adviceConsumer) {
+  /**
+   * Specify the attribute advice, which suggests the recommended set of attribute keys to be used
+   * for this up down counter.
+   */
+  default ExtendedDoubleUpDownCounterBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
     return this;
   }
 }

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedLongCounterBuilder.java

@@ -5,14 +5,18 @@
 
 package io.opentelemetry.extension.incubator.metrics;
 
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.metrics.LongCounterBuilder;
-import java.util.function.Consumer;
+import java.util.List;
 
 /** Extended {@link LongCounterBuilder} with experimental APIs. */
 public interface ExtendedLongCounterBuilder extends LongCounterBuilder {
 
-  /** Specify advice for counter implementations. */
-  default LongCounterBuilder setAdvice(Consumer<LongCounterAdviceConfigurer> adviceConsumer) {
+  /**
+   * Specify the attribute advice, which suggests the recommended set of attribute keys to be used
+   * for this counter.
+   */
+  default ExtendedLongCounterBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
     return this;
   }
 }

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedLongGaugeBuilder.java

@@ -5,7 +5,9 @@
 
 package io.opentelemetry.extension.incubator.metrics;
 
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.metrics.LongGaugeBuilder;
+import java.util.List;
 import java.util.function.Consumer;
 
 /** Extended {@link LongGaugeBuilder} with experimental APIs. */
@@ -22,8 +24,11 @@ public interface ExtendedLongGaugeBuilder extends LongGaugeBuilder {
    */
   LongGauge build();
 
-  /** Specify advice for gauge implementations. */
-  default LongGaugeBuilder setAdvice(Consumer<LongGaugeAdviceConfigurer> adviceConsumer) {
+  /**
+   * Specify the attribute advice, which suggests the recommended set of attribute keys to be used
+   * for this gauge.
+   */
+  default ExtendedLongGaugeBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
     return this;
   }
 }

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedLongHistogramBuilder.java

@@ -5,14 +5,27 @@
 
 package io.opentelemetry.extension.incubator.metrics;
 
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.metrics.LongHistogramBuilder;
-import java.util.function.Consumer;
+import java.util.List;
 
 /** Extended {@link LongHistogramBuilder} with experimental APIs. */
 public interface ExtendedLongHistogramBuilder extends LongHistogramBuilder {
 
-  /** Specify advice for histogram implementations. */
-  default LongHistogramBuilder setAdvice(Consumer<LongHistogramAdviceConfigurer> adviceConsumer) {
+  /**
+   * Specify the explicit bucket buckets boundaries advice, which suggests the recommended set of
+   * explicit bucket boundaries for this histogram.
+   */
+  default ExtendedLongHistogramBuilder setExplicitBucketBoundariesAdvice(
+      List<Long> bucketBoundaries) {
+    return this;
+  }
+
+  /**
+   * Specify the attribute advice, which suggests the recommended set of attribute keys to be used
+   * for this histogram.
+   */
+  default ExtendedLongHistogramBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
     return this;
   }
 }

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedLongUpDownCounterBuilder.java

@@ -5,15 +5,18 @@
 
 package io.opentelemetry.extension.incubator.metrics;
 
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.metrics.LongUpDownCounterBuilder;
-import java.util.function.Consumer;
+import java.util.List;
 
 /** Extended {@link LongUpDownCounterBuilder} with experimental APIs. */
 public interface ExtendedLongUpDownCounterBuilder extends LongUpDownCounterBuilder {
 
-  /** Specify advice for up down counter implementations. */
-  default LongUpDownCounterBuilder setAdvice(
-      Consumer<LongUpDownCounterAdviceConfigurer> adviceConsumer) {
+  /**
+   * Specify the attribute advice, which suggests the recommended set of attribute keys to be used
+   * for this up down counter.
+   */
+  default ExtendedLongUpDownCounterBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
     return this;
   }
 }

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleCounter.java

@@ -8,11 +8,9 @@
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.metrics.DoubleCounter;
-import io.opentelemetry.api.metrics.DoubleCounterBuilder;
 import io.opentelemetry.api.metrics.ObservableDoubleCounter;
 import io.opentelemetry.api.metrics.ObservableDoubleMeasurement;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.extension.incubator.metrics.DoubleCounterAdviceConfigurer;
 import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleCounterBuilder;
 import io.opentelemetry.sdk.internal.ThrottlingLogger;
 import io.opentelemetry.sdk.metrics.internal.descriptor.Advice;
@@ -61,7 +59,7 @@ public void add(double increment) {
 
   static final class SdkDoubleCounterBuilder
       extends AbstractInstrumentBuilder<SdkDoubleCounterBuilder>
-      implements ExtendedDoubleCounterBuilder, DoubleCounterAdviceConfigurer {
+      implements ExtendedDoubleCounterBuilder {
 
     SdkDoubleCounterBuilder(
         MeterProviderSharedState meterProviderSharedState,
@@ -86,12 +84,6 @@ protected SdkDoubleCounterBuilder getThis() {
       return this;
     }
 
-    @Override
-    public DoubleCounterBuilder setAdvice(Consumer<DoubleCounterAdviceConfigurer> adviceConsumer) {
-      adviceConsumer.accept(this);
-      return this;
-    }
-
     @Override
     public SdkDoubleCounter build() {
       return buildSynchronousInstrument(SdkDoubleCounter::new);
@@ -109,7 +101,7 @@ public ObservableDoubleMeasurement buildObserver() {
     }
 
     @Override
-    public DoubleCounterAdviceConfigurer setAttributes(List<AttributeKey<?>> attributes) {
+    public ExtendedDoubleCounterBuilder setAttributesAdvice(List<AttributeKey<?>> attributes) {
       adviceBuilder.setAttributes(attributes);
       return this;
     }