Remove AggregationTemporality from View configuration API (#3805)

Update all tests / use cases to leverage exporter-based configuration.

Author: jsuereth

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/AsynchronousMetricStorage.java

@@ -38,7 +38,6 @@ public final class AsynchronousMetricStorage<T> implements MetricStorage {
   private final AsyncAccumulator<T> asyncAccumulator;
   private final TemporalMetricStorage<T> storage;
   private final Runnable metricUpdater;
-  @Nullable private final AggregationTemporality configuredTemporality;
 
   /** Constructs asynchronous metric storage which stores nothing. */
   public static MetricStorage empty() {
@@ -78,11 +77,7 @@ public void observe(double value) {
           }
         };
     return new AsynchronousMetricStorage<>(
-        metricDescriptor,
-        aggregator,
-        measurementAccumulator,
-        () -> metricUpdater.accept(result),
-        view.getAggregation().getConfiguredTemporality());
+        metricDescriptor, aggregator, measurementAccumulator, () -> metricUpdater.accept(result));
   }
 
   /** Constructs storage for {@code long} valued instruments. */
@@ -114,24 +109,18 @@ public void observe(long value) {
           }
         };
     return new AsynchronousMetricStorage<>(
-        metricDescriptor,
-        aggregator,
-        measurementAccumulator,
-        () -> metricUpdater.accept(result),
-        view.getAggregation().getConfiguredTemporality());
+        metricDescriptor, aggregator, measurementAccumulator, () -> metricUpdater.accept(result));
   }
 
   private AsynchronousMetricStorage(
       MetricDescriptor metricDescriptor,
       Aggregator<T> aggregator,
       AsyncAccumulator<T> asyncAccumulator,
-      Runnable metricUpdater,
-      @Nullable AggregationTemporality configuredTemporality) {
+      Runnable metricUpdater) {
     this.metricDescriptor = metricDescriptor;
     this.asyncAccumulator = asyncAccumulator;
     this.metricUpdater = metricUpdater;
     this.storage = new TemporalMetricStorage<>(aggregator, /* isSynchronous= */ false);
-    this.configuredTemporality = configuredTemporality;
   }
 
   @Override
@@ -145,9 +134,7 @@ public MetricData collectAndReset(
       boolean suppressSynchronousCollection) {
     AggregationTemporality temporality =
         TemporalityUtils.resolveTemporality(
-            collectionInfo.getSupportedAggregation(),
-            collectionInfo.getPreferredAggregation(),
-            configuredTemporality);
+            collectionInfo.getSupportedAggregation(), collectionInfo.getPreferredAggregation());
     collectLock.lock();
     try {
       metricUpdater.run();

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/DefaultSynchronousMetricStorage.java

@@ -30,18 +30,15 @@ public final class DefaultSynchronousMetricStorage<T> implements SynchronousMetr
   private final DeltaMetricStorage<T> deltaMetricStorage;
   private final TemporalMetricStorage<T> temporalMetricStorage;
   private final AttributesProcessor attributesProcessor;
-  @Nullable private final AggregationTemporality configuredTemporality;
 
   DefaultSynchronousMetricStorage(
       MetricDescriptor metricDescriptor,
       Aggregator<T> aggregator,
-      AttributesProcessor attributesProcessor,
-      @Nullable AggregationTemporality configuredTemporality) {
+      AttributesProcessor attributesProcessor) {
     this.attributesProcessor = attributesProcessor;
     this.metricDescriptor = metricDescriptor;
     this.deltaMetricStorage = new DeltaMetricStorage<>(aggregator);
     this.temporalMetricStorage = new TemporalMetricStorage<>(aggregator, /* isSynchronous= */ true);
-    this.configuredTemporality = configuredTemporality;
   }
 
   // This is a storage handle to use when the attributes processor requires
@@ -108,9 +105,7 @@ public MetricData collectAndReset(
       boolean suppressSynchronousCollection) {
     AggregationTemporality temporality =
         TemporalityUtils.resolveTemporality(
-            collectionInfo.getSupportedAggregation(),
-            collectionInfo.getPreferredAggregation(),
-            configuredTemporality);
+            collectionInfo.getSupportedAggregation(), collectionInfo.getPreferredAggregation());
     Map<Attributes, T> result =
         deltaMetricStorage.collectFor(
             collectionInfo.getCollector(),

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/SynchronousMetricStorage.java

@@ -46,9 +46,6 @@ static <T> SynchronousMetricStorage create(
       return empty();
     }
     return new DefaultSynchronousMetricStorage<>(
-        metricDescriptor,
-        aggregator,
-        view.getAttributesProcessor(),
-        view.getAggregation().getConfiguredTemporality());
+        metricDescriptor, aggregator, view.getAttributesProcessor());
   }
 }

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/TemporalityUtils.java

@@ -17,16 +17,9 @@ private TemporalityUtils() {}
    *
    * @param supported All aggregation temporalities supported by the exporter.
    * @param preferred The preferred temporality of the exporter.
-   * @param configured The aggregation temporality configured via the View interface.
    */
   static AggregationTemporality resolveTemporality(
-      EnumSet<AggregationTemporality> supported,
-      @Nullable AggregationTemporality preferred,
-      @Nullable AggregationTemporality configured) {
-    // Return the configured temporality, if it exists and is supported.
-    if (configured != null && supported.contains(configured)) {
-      return configured;
-    }
+      EnumSet<AggregationTemporality> supported, @Nullable AggregationTemporality preferred) {
     // Next assume preferred should always win.
     if (preferred != null) {
       return preferred;

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/view/Aggregation.java

@@ -6,10 +6,8 @@
 package io.opentelemetry.sdk.metrics.view;
 
 import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor;
-import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.exemplar.ExemplarFilter;
 import io.opentelemetry.sdk.metrics.internal.aggregator.Aggregator;
-import io.opentelemetry.sdk.metrics.internal.aggregator.ExplicitBucketHistogramUtils;
 import java.util.List;
 import javax.annotation.Nullable;
 
@@ -33,16 +31,6 @@ public abstract class Aggregation {
   public abstract <T> Aggregator<T> createAggregator(
       InstrumentDescriptor instrumentDescriptor, ExemplarFilter exemplarFilter);
 
-  /**
-   * Returns the user-configured {@link AggregationTemporality} for this aggregation.
-   *
-   * @return the temporality, or {code null} if no temporality was specified.
-   */
-  @Nullable
-  public AggregationTemporality getConfiguredTemporality() {
-    return null;
-  }
-
   /** The None Aggregation will ignore/drop all Instrument Measurements. */
   public static Aggregation none() {
     return NoAggregation.INSTANCE;
@@ -53,11 +41,6 @@ public static Aggregation defaultAggregation() {
     return DefaultAggregation.INSTANCE;
   }
 
-  /** Instrument measurements will be combined into a metric Sum. */
-  public static Aggregation sum(AggregationTemporality temporality) {
-    return new SumAggregation(temporality);
-  }
-
   /** Instrument measurements will be combined into a metric Sum. */
   public static Aggregation sum() {
     return SumAggregation.DEFAULT;
@@ -75,36 +58,14 @@ public static Aggregation explicitBucketHistogram() {
     return ExplicitBucketHistogramAggregation.DEFAULT;
   }
 
-  /**
-   * Aggregates measurements into an explicit bucket histogram using the default bucket boundaries.
-   *
-   * @param temporality Whether to report DELTA or CUMULATIVE metrics.
-   */
-  public static Aggregation explicitBucketHistogram(AggregationTemporality temporality) {
-    return explicitBucketHistogram(
-        temporality, ExplicitBucketHistogramUtils.DEFAULT_HISTOGRAM_BUCKET_BOUNDARIES);
-  }
-
   /**
    * Aggregates measurements into an explicit bucket histogram.
    *
    * @param bucketBoundaries A list of (inclusive) upper bounds for the histogram. Should be in
    *     order from lowest to highest.
    */
   public static Aggregation explicitBucketHistogram(List<Double> bucketBoundaries) {
-    return new ExplicitBucketHistogramAggregation(null, bucketBoundaries);
-  }
-
-  /**
-   * Aggregates measurements into an explicit bucket histogram.
-   *
-   * @param temporality Whether to report DELTA or CUMULATIVE metrics.
-   * @param bucketBoundaries A list of (inclusive) upper bounds for the histogram. Should be in
-   *     order from lowest to highest.
-   */
-  public static Aggregation explicitBucketHistogram(
-      AggregationTemporality temporality, List<Double> bucketBoundaries) {
-    return new ExplicitBucketHistogramAggregation(temporality, bucketBoundaries);
+    return new ExplicitBucketHistogramAggregation(bucketBoundaries);
   }
 
   /** Aggregates measurements using the best available Histogram. */

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/view/ExplicitBucketHistogramAggregation.java

@@ -7,29 +7,24 @@
 
 import io.opentelemetry.sdk.common.Clock;
 import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor;
-import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.exemplar.ExemplarFilter;
 import io.opentelemetry.sdk.metrics.exemplar.ExemplarReservoir;
 import io.opentelemetry.sdk.metrics.internal.aggregator.Aggregator;
 import io.opentelemetry.sdk.metrics.internal.aggregator.DoubleHistogramAggregator;
 import io.opentelemetry.sdk.metrics.internal.aggregator.ExplicitBucketHistogramUtils;
 import java.util.List;
-import javax.annotation.Nullable;
 
 /** Explicit bucket histogram aggregation configuration. */
 class ExplicitBucketHistogramAggregation extends Aggregation {
 
   static final Aggregation DEFAULT =
       new ExplicitBucketHistogramAggregation(
-          null, ExplicitBucketHistogramUtils.DEFAULT_HISTOGRAM_BUCKET_BOUNDARIES);
+          ExplicitBucketHistogramUtils.DEFAULT_HISTOGRAM_BUCKET_BOUNDARIES);
 
-  @Nullable private final AggregationTemporality temporality;
   private final List<Double> bucketBoundaries;
   private final double[] bucketBoundaryArray;
 
-  ExplicitBucketHistogramAggregation(
-      @Nullable AggregationTemporality temporality, List<Double> bucketBoundaries) {
-    this.temporality = temporality;
+  ExplicitBucketHistogramAggregation(List<Double> bucketBoundaries) {
     this.bucketBoundaries = bucketBoundaries;
     // We need to fail here if our bucket boundaries are ill-configured.
     this.bucketBoundaryArray = ExplicitBucketHistogramUtils.createBoundaryArray(bucketBoundaries);
@@ -40,12 +35,6 @@ public List<Double> getBucketBoundaries() {
     return bucketBoundaries;
   }
 
-  @Override
-  @Nullable
-  public AggregationTemporality getConfiguredTemporality() {
-    return temporality;
-  }
-
   @Override
   @SuppressWarnings("unchecked")
   public <T> Aggregator<T> createAggregator(
@@ -62,6 +51,6 @@ public <T> Aggregator<T> createAggregator(
 
   @Override
   public String toString() {
-    return "ExplicitBucketHistogramAggregation(" + temporality + ")";
+    return "ExplicitBucketHistogramAggregation(" + bucketBoundaries.toString() + ")";
   }
 }

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/view/SumAggregation.java

@@ -8,29 +8,18 @@
 import io.opentelemetry.sdk.common.Clock;
 import io.opentelemetry.sdk.internal.RandomSupplier;
 import io.opentelemetry.sdk.metrics.common.InstrumentDescriptor;
-import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.exemplar.ExemplarFilter;
 import io.opentelemetry.sdk.metrics.exemplar.ExemplarReservoir;
 import io.opentelemetry.sdk.metrics.internal.aggregator.Aggregator;
 import io.opentelemetry.sdk.metrics.internal.aggregator.DoubleSumAggregator;
 import io.opentelemetry.sdk.metrics.internal.aggregator.LongSumAggregator;
 import java.util.function.Supplier;
-import javax.annotation.Nullable;
 
 /** A sum aggregation configuration. */
 class SumAggregation extends Aggregation {
-  static final SumAggregation DEFAULT = new SumAggregation(null);
+  static final SumAggregation DEFAULT = new SumAggregation();
 
-  @Nullable private final AggregationTemporality temporality;
-
-  SumAggregation(@Nullable AggregationTemporality temporality) {
-    this.temporality = temporality;
-  }
-
-  @Override
-  public AggregationTemporality getConfiguredTemporality() {
-    return temporality;
-  }
+  private SumAggregation() {}
 
   @Override
   @SuppressWarnings("unchecked")
@@ -55,6 +44,6 @@ public <T> Aggregator<T> createAggregator(
 
   @Override
   public String toString() {
-    return "SumAggregation(" + temporality + ")";
+    return "SumAggregation";
   }
 }

sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkDoubleSumObserverTest.java

@@ -11,7 +11,6 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
 import io.opentelemetry.sdk.metrics.common.InstrumentType;
-import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.testing.InMemoryMetricReader;
 import io.opentelemetry.sdk.metrics.view.Aggregation;
 import io.opentelemetry.sdk.metrics.view.InstrumentSelector;
@@ -110,17 +109,15 @@ void collectMetrics_WithOneRecord() {
   @Test
   @SuppressWarnings("unchecked")
   void collectMetrics_DeltaSumAggregator() {
-    InMemoryMetricReader sdkMeterReader = InMemoryMetricReader.create();
+    InMemoryMetricReader sdkMeterReader = InMemoryMetricReader.createDelta();
     SdkMeterProvider sdkMeterProvider =
         sdkMeterProviderBuilder
             .registerMetricReader(sdkMeterReader)
             .registerView(
                 InstrumentSelector.builder()
                     .setInstrumentType(InstrumentType.OBSERVABLE_SUM)
                     .build(),
-                View.builder()
-                    .setAggregation(Aggregation.sum(AggregationTemporality.DELTA))
-                    .build())
+                View.builder().setAggregation(Aggregation.sum()).build())
             .build();
     sdkMeterProvider
         .get(getClass().getName())

sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkDoubleUpDownSumObserverTest.java

@@ -11,7 +11,6 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
 import io.opentelemetry.sdk.metrics.common.InstrumentType;
-import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.testing.InMemoryMetricReader;
 import io.opentelemetry.sdk.metrics.view.Aggregation;
 import io.opentelemetry.sdk.metrics.view.InstrumentSelector;
@@ -106,17 +105,15 @@ void collectMetrics_WithOneRecord() {
   @Test
   @SuppressWarnings("unchecked")
   void collectMetrics_DeltaSumAggregator() {
-    InMemoryMetricReader sdkMeterReader = InMemoryMetricReader.create();
+    InMemoryMetricReader sdkMeterReader = InMemoryMetricReader.createDelta();
     SdkMeterProvider sdkMeterProvider =
         sdkMeterProviderBuilder
             .registerMetricReader(sdkMeterReader)
             .registerView(
                 InstrumentSelector.builder()
                     .setInstrumentType(InstrumentType.OBSERVABLE_UP_DOWN_SUM)
                     .build(),
-                View.builder()
-                    .setAggregation(Aggregation.sum(AggregationTemporality.DELTA))
-                    .build())
+                View.builder().setAggregation(Aggregation.sum()).build())
             .build();
     sdkMeterProvider
         .get(getClass().getName())

sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkLongSumObserverTest.java

@@ -11,7 +11,6 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
 import io.opentelemetry.sdk.metrics.common.InstrumentType;
-import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.testing.InMemoryMetricReader;
 import io.opentelemetry.sdk.metrics.view.Aggregation;
 import io.opentelemetry.sdk.metrics.view.InstrumentSelector;
@@ -104,17 +103,15 @@ void collectMetrics_WithOneRecord() {
   @Test
   @SuppressWarnings("unchecked")
   void collectMetrics_DeltaSumAggregator() {
-    InMemoryMetricReader sdkMeterReader = InMemoryMetricReader.create();
+    InMemoryMetricReader sdkMeterReader = InMemoryMetricReader.createDelta();
     SdkMeterProvider sdkMeterProvider =
         sdkMeterProviderBuilder
             .registerMetricReader(sdkMeterReader)
             .registerView(
                 InstrumentSelector.builder()
                     .setInstrumentType(InstrumentType.OBSERVABLE_SUM)
                     .build(),
-                View.builder()
-                    .setAggregation(Aggregation.sum(AggregationTemporality.DELTA))
-                    .build())
+                View.builder().setAggregation(Aggregation.sum()).build())
             .build();
     sdkMeterProvider
         .get(getClass().getName())