Make MetricData factories internal (#4257)

open-telemetry · Mar 11, 2022 · 26c0429 · 26c0429
1 parent 7ae6904
commit 26c0429
Show file tree

Hide file tree

Showing 29 changed files with 321 additions and 279 deletions.
diff --git a/...c/test/java/io/opentelemetry/exporter/logging/otlp/OtlpJsonLoggingMetricExporterTest.java b/...c/test/java/io/opentelemetry/exporter/logging/otlp/OtlpJsonLoggingMetricExporterTest.java
@@ -16,6 +16,7 @@
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.export.MetricExporter;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableDoublePointData;
+import io.opentelemetry.sdk.metrics.internal.data.ImmutableMetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSumData;
 import io.opentelemetry.sdk.resources.Resource;
 import java.util.Arrays;
@@ -32,7 +33,7 @@ class OtlpJsonLoggingMetricExporterTest {
       Resource.create(Attributes.builder().put("key", "value").build());
 
   private static final MetricData METRIC1 =
-      MetricData.createDoubleSum(
+      ImmutableMetricData.createDoubleSum(
           RESOURCE,
           InstrumentationLibraryInfo.create("instrumentation", "1"),
           "metric1",
@@ -46,7 +47,7 @@ class OtlpJsonLoggingMetricExporterTest {
                       1, 2, Attributes.of(stringKey("cat"), "meow"), 4))));
 
   private static final MetricData METRIC2 =
-      MetricData.createDoubleSum(
+      ImmutableMetricData.createDoubleSum(
           RESOURCE,
           InstrumentationLibraryInfo.create("instrumentation2", "2"),
           "metric2",

diff --git a/...rs/logging/src/test/java/io/opentelemetry/exporter/logging/LoggingMetricExporterTest.java b/...rs/logging/src/test/java/io/opentelemetry/exporter/logging/LoggingMetricExporterTest.java
@@ -12,9 +12,9 @@
 import io.opentelemetry.internal.testing.slf4j.SuppressLogger;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
-import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableDoublePointData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableLongPointData;
+import io.opentelemetry.sdk.metrics.internal.data.ImmutableMetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSumData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSummaryData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSummaryPointData;
@@ -63,7 +63,7 @@ void testExport() {
         InstrumentationLibraryInfo.create("manualInstrumentation", "1.0");
     exporter.export(
         Arrays.asList(
-            MetricData.createDoubleSummary(
+            ImmutableMetricData.createDoubleSummary(
                 resource,
                 instrumentationLibraryInfo,
                 "measureOne",
@@ -80,7 +80,7 @@ void testExport() {
                             Arrays.asList(
                                 ImmutableValueAtQuantile.create(0.0, 25),
                                 ImmutableValueAtQuantile.create(1.0, 433)))))),
-            MetricData.createLongSum(
+            ImmutableMetricData.createLongSum(
                 resource,
                 instrumentationLibraryInfo,
                 "counterOne",
@@ -95,7 +95,7 @@ void testExport() {
                             nowEpochNanos + 245,
                             Attributes.of(stringKey("z"), "y", stringKey("x"), "w"),
                             1010)))),
-            MetricData.createDoubleSum(
+            ImmutableMetricData.createDoubleSum(
                 resource,
                 instrumentationLibraryInfo,
                 "observedValue",

diff --git a/...src/test/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterTest.java b/...src/test/java/io/opentelemetry/exporter/otlp/http/metrics/OtlpHttpMetricExporterTest.java
@@ -34,6 +34,7 @@
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableLongPointData;
+import io.opentelemetry.sdk.metrics.internal.data.ImmutableMetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSumData;
 import io.opentelemetry.sdk.resources.Resource;
 import java.io.ByteArrayOutputStream;
@@ -323,7 +324,7 @@ private static <T extends Message> HttpResponse buildResponse(HttpStatus httpSta
   private static MetricData generateFakeMetric() {
     long startNs = TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis());
     long endNs = startNs + TimeUnit.MILLISECONDS.toNanos(900);
-    return MetricData.createLongSum(
+    return ImmutableMetricData.createLongSum(
         Resource.empty(),
         InstrumentationLibraryInfo.empty(),
         "name",

diff --git a/...est/java/io/opentelemetry/exporter/internal/otlp/metrics/MetricsRequestMarshalerTest.java b/...est/java/io/opentelemetry/exporter/internal/otlp/metrics/MetricsRequestMarshalerTest.java
@@ -52,6 +52,7 @@
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableHistogramPointData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableLongExemplarData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableLongPointData;
+import io.opentelemetry.sdk.metrics.internal.data.ImmutableMetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSumData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSummaryData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSummaryPointData;
@@ -462,7 +463,7 @@ void exponentialHistogramDataPoints() {
   void toProtoMetric_monotonic() {
     assertThat(
             toProtoMetric(
-                MetricData.createLongSum(
+                ImmutableMetricData.createLongSum(
                     Resource.empty(),
                     InstrumentationLibraryInfo.empty(),
                     "name",
@@ -497,7 +498,7 @@ void toProtoMetric_monotonic() {
                 .build());
     assertThat(
             toProtoMetric(
-                MetricData.createDoubleSum(
+                ImmutableMetricData.createDoubleSum(
                     Resource.empty(),
                     InstrumentationLibraryInfo.empty(),
                     "name",
@@ -536,7 +537,7 @@ void toProtoMetric_monotonic() {
   void toProtoMetric_nonMonotonic() {
     assertThat(
             toProtoMetric(
-                MetricData.createLongSum(
+                ImmutableMetricData.createLongSum(
                     Resource.empty(),
                     InstrumentationLibraryInfo.empty(),
                     "name",
@@ -571,7 +572,7 @@ void toProtoMetric_nonMonotonic() {
                 .build());
     assertThat(
             toProtoMetric(
-                MetricData.createDoubleSum(
+                ImmutableMetricData.createDoubleSum(
                     Resource.empty(),
                     InstrumentationLibraryInfo.empty(),
                     "name",
@@ -610,7 +611,7 @@ void toProtoMetric_nonMonotonic() {
   void toProtoMetric_gauges() {
     assertThat(
             toProtoMetric(
-                MetricData.createLongGauge(
+                ImmutableMetricData.createLongGauge(
                     Resource.empty(),
                     InstrumentationLibraryInfo.empty(),
                     "name",
@@ -641,7 +642,7 @@ void toProtoMetric_gauges() {
                 .build());
     assertThat(
             toProtoMetric(
-                MetricData.createDoubleGauge(
+                ImmutableMetricData.createDoubleGauge(
                     Resource.empty(),
                     InstrumentationLibraryInfo.empty(),
                     "name",
@@ -676,7 +677,7 @@ void toProtoMetric_gauges() {
   void toProtoMetric_summary() {
     assertThat(
             toProtoMetric(
-                MetricData.createDoubleSummary(
+                ImmutableMetricData.createDoubleSummary(
                     Resource.empty(),
                     InstrumentationLibraryInfo.empty(),
                     "name",
@@ -731,7 +732,7 @@ void toProtoMetric_summary() {
   void toProtoMetric_histogram() {
     assertThat(
             toProtoMetric(
-                MetricData.createDoubleHistogram(
+                ImmutableMetricData.createDoubleHistogram(
                     Resource.empty(),
                     InstrumentationLibraryInfo.empty(),
                     "name",
@@ -777,7 +778,7 @@ void toProtoMetric_histogram() {
   void toProtoMetric_exponentialHistogram() {
     assertThat(
             toProtoMetric(
-                MetricData.createExponentialHistogram(
+                ImmutableMetricData.createExponentialHistogram(
                     Resource.empty(),
                     InstrumentationLibraryInfo.empty(),
                     "name",
@@ -882,7 +883,7 @@ void protoResourceMetrics() {
     assertThat(
             toProtoResourceMetrics(
                 ImmutableList.of(
-                    MetricData.createDoubleSum(
+                    ImmutableMetricData.createDoubleSum(
                         resource,
                         instrumentationLibraryInfo,
                         "name",
@@ -893,7 +894,7 @@ void protoResourceMetrics() {
                             AggregationTemporality.CUMULATIVE,
                             Collections.singletonList(
                                 ImmutableDoublePointData.create(123, 456, KV_ATTR, 5.0)))),
-                    MetricData.createDoubleSum(
+                    ImmutableMetricData.createDoubleSum(
                         resource,
                         instrumentationLibraryInfo,
                         "name",
@@ -904,7 +905,7 @@ void protoResourceMetrics() {
                             AggregationTemporality.CUMULATIVE,
                             Collections.singletonList(
                                 ImmutableDoublePointData.create(123, 456, KV_ATTR, 5.0)))),
-                    MetricData.createDoubleSum(
+                    ImmutableMetricData.createDoubleSum(
                         Resource.empty(),
                         instrumentationLibraryInfo,
                         "name",
@@ -915,7 +916,7 @@ void protoResourceMetrics() {
                             AggregationTemporality.CUMULATIVE,
                             Collections.singletonList(
                                 ImmutableDoublePointData.create(123, 456, KV_ATTR, 5.0)))),
-                    MetricData.createDoubleSum(
+                    ImmutableMetricData.createDoubleSum(
                         Resource.empty(),
                         InstrumentationLibraryInfo.empty(),
                         "name",

diff --git a/...rics/src/test/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterTest.java b/...rics/src/test/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcMetricExporterTest.java
@@ -23,6 +23,7 @@
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableLongPointData;
+import io.opentelemetry.sdk.metrics.internal.data.ImmutableMetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSumData;
 import io.opentelemetry.sdk.resources.Resource;
 import java.time.Duration;
@@ -110,7 +111,7 @@ public TelemetryExporter<MetricData> build() {
   protected MetricData generateFakeTelemetry() {
     long startNs = TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis());
     long endNs = startNs + TimeUnit.MILLISECONDS.toNanos(900);
-    return MetricData.createLongSum(
+    return ImmutableMetricData.createLongSum(
         Resource.empty(),
         InstrumentationLibraryInfo.empty(),
         "name",

diff --git a/...rpcNetty/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyMetricExporterTest.java b/...rpcNetty/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyMetricExporterTest.java
@@ -23,6 +23,7 @@
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableLongPointData;
+import io.opentelemetry.sdk.metrics.internal.data.ImmutableMetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSumData;
 import io.opentelemetry.sdk.resources.Resource;
 import java.time.Duration;
@@ -110,7 +111,7 @@ public TelemetryExporter<MetricData> build() {
   protected MetricData generateFakeTelemetry() {
     long startNs = TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis());
     long endNs = startNs + TimeUnit.MILLISECONDS.toNanos(900);
-    return MetricData.createLongSum(
+    return ImmutableMetricData.createLongSum(
         Resource.empty(),
         InstrumentationLibraryInfo.empty(),
         "name",

diff --git a/...ed/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyShadedMetricExporterTest.java b/...ed/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcNettyShadedMetricExporterTest.java
@@ -21,6 +21,7 @@
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableLongPointData;
+import io.opentelemetry.sdk.metrics.internal.data.ImmutableMetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSumData;
 import io.opentelemetry.sdk.resources.Resource;
 import java.time.Duration;
@@ -99,7 +100,7 @@ public TelemetryExporter<MetricData> build() {
   protected MetricData generateFakeTelemetry() {
     long startNs = TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis());
     long endNs = startNs + TimeUnit.MILLISECONDS.toNanos(900);
-    return MetricData.createLongSum(
+    return ImmutableMetricData.createLongSum(
         Resource.empty(),
         InstrumentationLibraryInfo.empty(),
         "name",

diff --git a/...cOkhttp/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcOkHttpMetricExporterTest.java b/...cOkhttp/java/io/opentelemetry/exporter/otlp/metrics/OtlpGrpcOkHttpMetricExporterTest.java
@@ -21,6 +21,7 @@
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableLongPointData;
+import io.opentelemetry.sdk.metrics.internal.data.ImmutableMetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSumData;
 import io.opentelemetry.sdk.resources.Resource;
 import java.time.Duration;
@@ -99,7 +100,7 @@ public TelemetryExporter<MetricData> build() {
   protected MetricData generateFakeTelemetry() {
     long startNs = TimeUnit.MILLISECONDS.toNanos(System.currentTimeMillis());
     long endNs = startNs + TimeUnit.MILLISECONDS.toNanos(900);
-    return MetricData.createLongSum(
+    return ImmutableMetricData.createLongSum(
         Resource.empty(),
         InstrumentationLibraryInfo.empty(),
         "name",

diff --git a/...ters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/MetricAdapterTest.java b/...ters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/MetricAdapterTest.java
@@ -23,6 +23,7 @@
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableHistogramPointData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableLongExemplarData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableLongPointData;
+import io.opentelemetry.sdk.metrics.internal.data.ImmutableMetricData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSumData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSummaryData;
 import io.opentelemetry.sdk.metrics.internal.data.ImmutableSummaryPointData;
@@ -49,7 +50,7 @@ class MetricAdapterTest {
   private static final Attributes KP_VP_ATTR = Attributes.of(stringKey("kp"), "vp");
 
   private static final MetricData MONOTONIC_CUMULATIVE_DOUBLE_SUM =
-      MetricData.createDoubleSum(
+      ImmutableMetricData.createDoubleSum(
           Resource.create(Attributes.of(stringKey("kr"), "vr")),
           InstrumentationLibraryInfo.create("full", "version"),
           "instrument.name",
@@ -62,7 +63,7 @@ class MetricAdapterTest {
                   ImmutableDoublePointData.create(
                       1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5))));
   private static final MetricData NON_MONOTONIC_CUMULATIVE_DOUBLE_SUM =
-      MetricData.createDoubleSum(
+      ImmutableMetricData.createDoubleSum(
           Resource.create(Attributes.of(stringKey("kr"), "vr")),
           InstrumentationLibraryInfo.create("full", "version"),
           "instrument.name",
@@ -75,7 +76,7 @@ class MetricAdapterTest {
                   ImmutableDoublePointData.create(
                       1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5))));
   private static final MetricData MONOTONIC_DELTA_DOUBLE_SUM =
-      MetricData.createDoubleSum(
+      ImmutableMetricData.createDoubleSum(
           Resource.create(Attributes.of(stringKey("kr"), "vr")),
           InstrumentationLibraryInfo.create("full", "version"),
           "instrument.name",
@@ -88,7 +89,7 @@ class MetricAdapterTest {
                   ImmutableDoublePointData.create(
                       1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5))));
   private static final MetricData NON_MONOTONIC_DELTA_DOUBLE_SUM =
-      MetricData.createDoubleSum(
+      ImmutableMetricData.createDoubleSum(
           Resource.create(Attributes.of(stringKey("kr"), "vr")),
           InstrumentationLibraryInfo.create("full", "version"),
           "instrument.name",
@@ -101,7 +102,7 @@ class MetricAdapterTest {
                   ImmutableDoublePointData.create(
                       1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5))));
   private static final MetricData MONOTONIC_CUMULATIVE_LONG_SUM =
-      MetricData.createLongSum(
+      ImmutableMetricData.createLongSum(
           Resource.create(Attributes.of(stringKey("kr"), "vr")),
           InstrumentationLibraryInfo.create("full", "version"),
           "instrument.name",
@@ -114,7 +115,7 @@ class MetricAdapterTest {
                   ImmutableLongPointData.create(
                       1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5))));
   private static final MetricData NON_MONOTONIC_CUMULATIVE_LONG_SUM =
-      MetricData.createLongSum(
+      ImmutableMetricData.createLongSum(
           Resource.create(Attributes.of(stringKey("kr"), "vr")),
           InstrumentationLibraryInfo.create("full", "version"),
           "instrument.name",
@@ -127,7 +128,7 @@ class MetricAdapterTest {
                   ImmutableLongPointData.create(
                       1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5))));
   private static final MetricData MONOTONIC_DELTA_LONG_SUM =
-      MetricData.createLongSum(
+      ImmutableMetricData.createLongSum(
           Resource.create(Attributes.of(stringKey("kr"), "vr")),
           InstrumentationLibraryInfo.create("full", "version"),
           "instrument.name",
@@ -140,7 +141,7 @@ class MetricAdapterTest {
                   ImmutableLongPointData.create(
                       1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5))));
   private static final MetricData NON_MONOTONIC_DELTA_LONG_SUM =
-      MetricData.createLongSum(
+      ImmutableMetricData.createLongSum(
           Resource.create(Attributes.of(stringKey("kr"), "vr")),
           InstrumentationLibraryInfo.create("full", "version"),
           "instrument.name",
@@ -154,7 +155,7 @@ class MetricAdapterTest {
                       1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5))));
 
   private static final MetricData DOUBLE_GAUGE =
-      MetricData.createDoubleGauge(
+      ImmutableMetricData.createDoubleGauge(
           Resource.create(Attributes.of(stringKey("kr"), "vr")),
           InstrumentationLibraryInfo.create("full", "version"),
           "instrument.name",
@@ -165,7 +166,7 @@ class MetricAdapterTest {
                   ImmutableDoublePointData.create(
                       1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5))));
   private static final MetricData LONG_GAUGE =
-      MetricData.createLongGauge(
+      ImmutableMetricData.createLongGauge(
           Resource.create(Attributes.of(stringKey("kr"), "vr")),
           InstrumentationLibraryInfo.create("full", "version"),
           "instrument.name",
@@ -176,7 +177,7 @@ class MetricAdapterTest {
                   ImmutableLongPointData.create(
                       1633947011000000000L, 1633950672000000000L, KP_VP_ATTR, 5))));
   private static final MetricData SUMMARY =
-      MetricData.createDoubleSummary(
+      ImmutableMetricData.createDoubleSummary(
           Resource.create(Attributes.of(stringKey("kr"), "vr")),
           InstrumentationLibraryInfo.create("full", "version"),
           "instrument.name",
@@ -194,7 +195,7 @@ class MetricAdapterTest {
                           ImmutableValueAtQuantile.create(0.9, 0.1),
                           ImmutableValueAtQuantile.create(0.99, 0.3))))));
   private static final MetricData HISTOGRAM =
-      MetricData.createDoubleHistogram(
+      ImmutableMetricData.createDoubleHistogram(
           Resource.create(Attributes.of(stringKey("kr"), "vr")),
           InstrumentationLibraryInfo.create("full", "version"),
           "instrument.name",