Move ExponentialHistogram data to internal package.

open-telemetry · Feb 25, 2022 · c7ea71a · c7ea71a
1 parent c053393
commit c7ea71a
Show file tree

Hide file tree

Showing 20 changed files with 56 additions and 34 deletions.
diff --git a/...io/opentelemetry/exporter/internal/otlp/metrics/ExponentialHistogramBucketsMarshaler.java b/...io/opentelemetry/exporter/internal/otlp/metrics/ExponentialHistogramBucketsMarshaler.java
@@ -10,7 +10,7 @@
 import io.opentelemetry.exporter.internal.marshal.Serializer;
 import io.opentelemetry.proto.metrics.v1.internal.ExponentialHistogramDataPoint;
 import io.opentelemetry.sdk.internal.PrimitiveLongList;
-import io.opentelemetry.sdk.metrics.data.ExponentialHistogramBuckets;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ExponentialHistogramBuckets;
 import java.io.IOException;
 import java.util.List;
 

diff --git a/.../opentelemetry/exporter/internal/otlp/metrics/ExponentialHistogramDataPointMarshaler.java b/.../opentelemetry/exporter/internal/otlp/metrics/ExponentialHistogramDataPointMarshaler.java
@@ -10,7 +10,7 @@
 import io.opentelemetry.exporter.internal.marshal.Serializer;
 import io.opentelemetry.exporter.internal.otlp.KeyValueMarshaler;
 import io.opentelemetry.proto.metrics.v1.internal.ExponentialHistogramDataPoint;
-import io.opentelemetry.sdk.metrics.data.ExponentialHistogramPointData;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ExponentialHistogramPointData;
 import java.io.IOException;
 import java.util.Collection;
 

diff --git a/...n/java/io/opentelemetry/exporter/internal/otlp/metrics/ExponentialHistogramMarshaler.java b/...n/java/io/opentelemetry/exporter/internal/otlp/metrics/ExponentialHistogramMarshaler.java
@@ -10,7 +10,7 @@
 import io.opentelemetry.exporter.internal.marshal.ProtoEnumInfo;
 import io.opentelemetry.exporter.internal.marshal.Serializer;
 import io.opentelemetry.proto.metrics.v1.internal.ExponentialHistogram;
-import io.opentelemetry.sdk.metrics.data.ExponentialHistogramData;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ExponentialHistogramData;
 import java.io.IOException;
 
 /**

diff --git a/...est/java/io/opentelemetry/exporter/internal/otlp/metrics/MetricsRequestMarshalerTest.java b/...est/java/io/opentelemetry/exporter/internal/otlp/metrics/MetricsRequestMarshalerTest.java
@@ -48,16 +48,16 @@
 import io.opentelemetry.sdk.metrics.data.DoubleSumData;
 import io.opentelemetry.sdk.metrics.data.DoubleSummaryData;
 import io.opentelemetry.sdk.metrics.data.DoubleSummaryPointData;
-import io.opentelemetry.sdk.metrics.data.ExponentialHistogramBuckets;
-import io.opentelemetry.sdk.metrics.data.ExponentialHistogramData;
-import io.opentelemetry.sdk.metrics.data.ExponentialHistogramPointData;
 import io.opentelemetry.sdk.metrics.data.LongExemplarData;
 import io.opentelemetry.sdk.metrics.data.LongPointData;
 import io.opentelemetry.sdk.metrics.data.LongSumData;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.data.PointData;
 import io.opentelemetry.sdk.metrics.data.ValueAtPercentile;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableGaugeData;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ExponentialHistogramBuckets;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ExponentialHistogramData;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ExponentialHistogramPointData;
 import io.opentelemetry.sdk.resources.Resource;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/...esting/src/main/java/io/opentelemetry/sdk/testing/assertj/ExponentialHistogramAssert.java b/...esting/src/main/java/io/opentelemetry/sdk/testing/assertj/ExponentialHistogramAssert.java
@@ -6,8 +6,8 @@
 package io.opentelemetry.sdk.testing.assertj;
 
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
-import io.opentelemetry.sdk.metrics.data.ExponentialHistogramData;
-import io.opentelemetry.sdk.metrics.data.ExponentialHistogramPointData;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ExponentialHistogramData;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ExponentialHistogramPointData;
 import org.assertj.core.api.AbstractAssert;
 import org.assertj.core.api.AbstractIterableAssert;
 import org.assertj.core.api.Assertions;

diff --git a/...src/main/java/io/opentelemetry/sdk/testing/assertj/ExponentialHistogramBucketsAssert.java b/...src/main/java/io/opentelemetry/sdk/testing/assertj/ExponentialHistogramBucketsAssert.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.sdk.testing.assertj;
 
-import io.opentelemetry.sdk.metrics.data.ExponentialHistogramBuckets;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ExponentialHistogramBuckets;
 import java.util.List;
 import org.assertj.core.api.AbstractAssert;
 import org.assertj.core.api.Assertions;

diff --git a/...c/main/java/io/opentelemetry/sdk/testing/assertj/ExponentialHistogramPointDataAssert.java b/...c/main/java/io/opentelemetry/sdk/testing/assertj/ExponentialHistogramPointDataAssert.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.sdk.testing.assertj;
 
-import io.opentelemetry.sdk.metrics.data.ExponentialHistogramPointData;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ExponentialHistogramPointData;
 import org.assertj.core.api.Assertions;
 
 /** Test assertions for {@link ExponentialHistogramPointData}. */

diff --git a/sdk/metrics-testing/src/main/java/io/opentelemetry/sdk/testing/assertj/MetricAssertions.java b/sdk/metrics-testing/src/main/java/io/opentelemetry/sdk/testing/assertj/MetricAssertions.java
@@ -12,13 +12,13 @@
 import io.opentelemetry.sdk.metrics.data.DoubleSummaryData;
 import io.opentelemetry.sdk.metrics.data.DoubleSummaryPointData;
 import io.opentelemetry.sdk.metrics.data.ExemplarData;
-import io.opentelemetry.sdk.metrics.data.ExponentialHistogramBuckets;
-import io.opentelemetry.sdk.metrics.data.ExponentialHistogramPointData;
 import io.opentelemetry.sdk.metrics.data.GaugeData;
 import io.opentelemetry.sdk.metrics.data.LongPointData;
 import io.opentelemetry.sdk.metrics.data.LongSumData;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.data.PointData;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ExponentialHistogramBuckets;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ExponentialHistogramPointData;
 import org.assertj.core.api.Assertions;
 
 /** Test assertions for data heading to exporters within the Metrics SDK. */

diff --git a/...rics-testing/src/test/java/io/opentelemetry/sdk/testing/assertj/MetricAssertionsTest.java b/...rics-testing/src/test/java/io/opentelemetry/sdk/testing/assertj/MetricAssertionsTest.java
@@ -22,13 +22,13 @@
 import io.opentelemetry.sdk.metrics.data.DoubleSumData;
 import io.opentelemetry.sdk.metrics.data.DoubleSummaryData;
 import io.opentelemetry.sdk.metrics.data.DoubleSummaryPointData;
-import io.opentelemetry.sdk.metrics.data.ExponentialHistogramData;
 import io.opentelemetry.sdk.metrics.data.LongExemplarData;
 import io.opentelemetry.sdk.metrics.data.LongPointData;
 import io.opentelemetry.sdk.metrics.data.LongSumData;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.data.ValueAtPercentile;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableGaugeData;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ExponentialHistogramData;
 import io.opentelemetry.sdk.resources.Resource;
 import java.util.Arrays;
 import java.util.Collections;

diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/MetricData.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/data/MetricData.java
@@ -7,6 +7,8 @@
 
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableGaugeData;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ExponentialHistogramData;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ImmutableExponentialHistogramData;
 import io.opentelemetry.sdk.resources.Resource;
 import javax.annotation.concurrent.Immutable;
 
@@ -322,6 +324,6 @@ default ExponentialHistogramData getExponentialHistogramData() {
     if (getType() == MetricDataType.EXPONENTIAL_HISTOGRAM) {
       return (ExponentialHistogramData) getData();
     }
-    return DoubleExponentialHistogramData.EMPTY;
+    return ImmutableExponentialHistogramData.empty();
   }
 }
diff --git a/...o/opentelemetry/sdk/metrics/internal/aggregator/DoubleExponentialHistogramAggregator.java b/...o/opentelemetry/sdk/metrics/internal/aggregator/DoubleExponentialHistogramAggregator.java
@@ -9,9 +9,9 @@
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.data.ExemplarData;
-import io.opentelemetry.sdk.metrics.data.ExponentialHistogramData;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.exemplar.ExemplarReservoir;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ExponentialHistogramData;
 import io.opentelemetry.sdk.metrics.internal.descriptor.MetricDescriptor;
 import io.opentelemetry.sdk.metrics.internal.state.ExponentialCounterFactory;
 import io.opentelemetry.sdk.resources.Resource;

diff --git a/...a/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleExponentialHistogramBuckets.java b/...a/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleExponentialHistogramBuckets.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.sdk.metrics.internal.aggregator;
 
 import io.opentelemetry.sdk.internal.PrimitiveLongList;
-import io.opentelemetry.sdk.metrics.data.ExponentialHistogramBuckets;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ExponentialHistogramBuckets;
 import io.opentelemetry.sdk.metrics.internal.state.ExponentialCounter;
 import io.opentelemetry.sdk.metrics.internal.state.ExponentialCounterFactory;
 import java.util.Collections;

diff --git a/...trics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/MetricDataUtils.java b/...trics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/MetricDataUtils.java
@@ -10,8 +10,8 @@
 import io.opentelemetry.sdk.metrics.common.InstrumentType;
 import io.opentelemetry.sdk.metrics.data.DoubleHistogramPointData;
 import io.opentelemetry.sdk.metrics.data.DoublePointData;
-import io.opentelemetry.sdk.metrics.data.ExponentialHistogramPointData;
 import io.opentelemetry.sdk.metrics.data.LongPointData;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ExponentialHistogramPointData;
 import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ics/data/ExponentialHistogramBuckets.java → ...istogram/ExponentialHistogramBuckets.java b/...ics/data/ExponentialHistogramBuckets.java → ...istogram/ExponentialHistogramBuckets.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.metrics.data;
+package io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram;
 
 import java.util.List;
 import javax.annotation.concurrent.Immutable;

diff --git a/...etrics/data/ExponentialHistogramData.java → ...alhistogram/ExponentialHistogramData.java b/...etrics/data/ExponentialHistogramData.java → ...alhistogram/ExponentialHistogramData.java
@@ -3,8 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.metrics.data;
+package io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram;
 
+import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
+import io.opentelemetry.sdk.metrics.data.Data;
 import java.util.Collection;
 import javax.annotation.concurrent.Immutable;
 
@@ -30,7 +32,7 @@ public interface ExponentialHistogramData extends Data<ExponentialHistogramPoint
    */
   static ExponentialHistogramData create(
       AggregationTemporality temporality, Collection<ExponentialHistogramPointData> points) {
-    return DoubleExponentialHistogramData.create(temporality, points);
+    return ImmutableExponentialHistogramData.create(temporality, points);
   }
 
   /**

diff --git a/...s/data/ExponentialHistogramPointData.java → ...togram/ExponentialHistogramPointData.java b/...s/data/ExponentialHistogramPointData.java → ...togram/ExponentialHistogramPointData.java
@@ -3,9 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.metrics.data;
+package io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram;
 
 import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.sdk.metrics.data.ExemplarData;
+import io.opentelemetry.sdk.metrics.data.PointData;
 import java.util.List;
 import javax.annotation.concurrent.Immutable;
 
@@ -39,7 +41,7 @@ static ExponentialHistogramPointData create(
       Attributes attributes,
       List<ExemplarData> exemplars) {
 
-    return DoubleExponentialHistogramPointData.create(
+    return ImmutableExponentialHistogramPointData.create(
         scale,
         sum,
         zeroCount,

diff --git a/.../data/DoubleExponentialHistogramData.java → ...am/ImmutableExponentialHistogramData.java b/.../data/DoubleExponentialHistogramData.java → ...am/ImmutableExponentialHistogramData.java
@@ -3,9 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.metrics.data;
+package io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram;
 
 import com.google.auto.value.AutoValue;
+import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import java.util.Collection;
 import java.util.Collections;
 
@@ -17,23 +18,27 @@
  * https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/datamodel.md#exponentialhistogram
  */
 @AutoValue
-abstract class DoubleExponentialHistogramData implements ExponentialHistogramData {
+public abstract class ImmutableExponentialHistogramData implements ExponentialHistogramData {
 
-  static final ExponentialHistogramData EMPTY =
+  private static final ExponentialHistogramData EMPTY =
       ExponentialHistogramData.create(AggregationTemporality.CUMULATIVE, Collections.emptyList());
 
-  DoubleExponentialHistogramData() {}
+  public static ExponentialHistogramData empty() {
+    return EMPTY;
+  }
 
   /**
    * Create a DoubleExponentialHistogramData.
    *
    * @return a DoubleExponentialHistogramData
    */
-  static DoubleExponentialHistogramData create(
+  public static ExponentialHistogramData create(
       AggregationTemporality temporality, Collection<ExponentialHistogramPointData> points) {
-    return new AutoValue_DoubleExponentialHistogramData(temporality, points);
+    return new AutoValue_ImmutableExponentialHistogramData(temporality, points);
   }
 
+  ImmutableExponentialHistogramData() {}
+
   @Override
   public abstract AggregationTemporality getAggregationTemporality();
 

diff --git a/.../DoubleExponentialHistogramPointData.java → ...mutableExponentialHistogramPointData.java b/.../DoubleExponentialHistogramPointData.java → ...mutableExponentialHistogramPointData.java
@@ -3,10 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.metrics.data;
+package io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram;
 
 import com.google.auto.value.AutoValue;
 import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.sdk.metrics.data.ExemplarData;
 import java.util.List;
 import javax.annotation.concurrent.Immutable;
 
@@ -16,16 +17,16 @@
  */
 @AutoValue
 @Immutable
-abstract class DoubleExponentialHistogramPointData implements ExponentialHistogramPointData {
+abstract class ImmutableExponentialHistogramPointData implements ExponentialHistogramPointData {
 
-  DoubleExponentialHistogramPointData() {}
+  ImmutableExponentialHistogramPointData() {}
 
   /**
    * Create a DoubleExponentialHistogramPointData.
    *
    * @return a DoubleExponentialHistogramPointData.
    */
-  static DoubleExponentialHistogramPointData create(
+  static ImmutableExponentialHistogramPointData create(
       int scale,
       double sum,
       long zeroCount,
@@ -38,7 +39,7 @@ static DoubleExponentialHistogramPointData create(
 
     long count = zeroCount + positiveBuckets.getTotalCount() + negativeBuckets.getTotalCount();
 
-    return new AutoValue_DoubleExponentialHistogramPointData(
+    return new AutoValue_ImmutableExponentialHistogramPointData(
         scale,
         sum,
         count,

diff --git a/...in/java/io/opentelemetry/sdk/metrics/internal/data/exponentialhistogram/package-info.java b/...in/java/io/opentelemetry/sdk/metrics/internal/data/exponentialhistogram/package-info.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/** The data format to model exponential histograms for export. */
+@ParametersAreNonnullByDefault
+package io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/...entelemetry/sdk/metrics/internal/aggregator/DoubleExponentialHistogramAggregatorTest.java b/...entelemetry/sdk/metrics/internal/aggregator/DoubleExponentialHistogramAggregatorTest.java
@@ -17,9 +17,9 @@
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.data.DoubleExemplarData;
 import io.opentelemetry.sdk.metrics.data.ExemplarData;
-import io.opentelemetry.sdk.metrics.data.ExponentialHistogramBuckets;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.exemplar.ExemplarReservoir;
+import io.opentelemetry.sdk.metrics.internal.data.exponentialhistogram.ExponentialHistogramBuckets;
 import io.opentelemetry.sdk.metrics.internal.descriptor.MetricDescriptor;
 import io.opentelemetry.sdk.metrics.internal.state.ExponentialCounterFactory;
 import io.opentelemetry.sdk.resources.Resource;