From a51d0f902a0c145a47b8b3c940b32b4429f818bb Mon Sep 17 00:00:00 2001
From: jwatson <jwatson@newrelic.com>
Date: Tue, 14 Jul 2020 13:12:21 -0700
Subject: [PATCH] move the ViewRegistry up one package, and clean up the
 visibility of other classes

---
 .../sdk/metrics/InstrumentDescriptor.java           |  2 +-
 .../sdk/metrics/MeterProviderSharedState.java       |  2 +-
 .../opentelemetry/sdk/metrics/MeterSdkProvider.java |  1 -
 .../io/opentelemetry/sdk/metrics/ViewRegistry.java  | 13 ++++++++-----
 .../sdk/metrics/{view => }/ViewRegistryTest.java    |  9 ++++-----
 5 files changed, 14 insertions(+), 13 deletions(-)
 rename sdk/src/test/java/io/opentelemetry/sdk/metrics/{view => }/ViewRegistryTest.java (95%)

diff --git a/sdk/src/main/java/io/opentelemetry/sdk/metrics/InstrumentDescriptor.java b/sdk/src/main/java/io/opentelemetry/sdk/metrics/InstrumentDescriptor.java
index 3b68010e272..d6e78b94147 100644
--- a/sdk/src/main/java/io/opentelemetry/sdk/metrics/InstrumentDescriptor.java
+++ b/sdk/src/main/java/io/opentelemetry/sdk/metrics/InstrumentDescriptor.java
@@ -26,7 +26,7 @@
 @AutoValue
 @Immutable
 abstract class InstrumentDescriptor {
-  public static InstrumentDescriptor create(
+  static InstrumentDescriptor create(
       String name,
       String description,
       String unit,
diff --git a/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterProviderSharedState.java b/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterProviderSharedState.java
index 6a219ee72a7..7aebe9b9518 100644
--- a/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterProviderSharedState.java
+++ b/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterProviderSharedState.java
@@ -28,7 +28,7 @@ static MeterProviderSharedState create(Clock clock, Resource resource) {
     return new AutoValue_MeterProviderSharedState(clock, resource);
   }
 
-  public abstract Clock getClock();
+  abstract Clock getClock();
 
   abstract Resource getResource();
 }
diff --git a/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterSdkProvider.java b/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterSdkProvider.java
index bd3fa8b04e2..992ac48c185 100644
--- a/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterSdkProvider.java
+++ b/sdk/src/main/java/io/opentelemetry/sdk/metrics/MeterSdkProvider.java
@@ -24,7 +24,6 @@
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.export.MetricProducer;
 import io.opentelemetry.sdk.metrics.view.InstrumentSelector;
-import io.opentelemetry.sdk.metrics.view.ViewRegistry;
 import io.opentelemetry.sdk.metrics.view.ViewSpecification;
 import io.opentelemetry.sdk.resources.EnvVarResource;
 import io.opentelemetry.sdk.resources.Resource;
diff --git a/sdk/src/main/java/io/opentelemetry/sdk/metrics/ViewRegistry.java b/sdk/src/main/java/io/opentelemetry/sdk/metrics/ViewRegistry.java
index acc62208b4f..5727c28182f 100644
--- a/sdk/src/main/java/io/opentelemetry/sdk/metrics/ViewRegistry.java
+++ b/sdk/src/main/java/io/opentelemetry/sdk/metrics/ViewRegistry.java
@@ -18,6 +18,8 @@
 
 import io.opentelemetry.sdk.metrics.view.Aggregation;
 import io.opentelemetry.sdk.metrics.view.Aggregations;
+import io.opentelemetry.sdk.metrics.view.InstrumentSelector;
+import io.opentelemetry.sdk.metrics.view.ViewSpecification;
 import io.opentelemetry.sdk.metrics.view.ViewSpecification.Temporality;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -41,11 +43,11 @@
  */
 class ViewRegistry {
 
-  public static final ViewSpecification CUMULATIVE_SUM =
+  private static final ViewSpecification CUMULATIVE_SUM =
       ViewSpecification.create(Aggregations.sum(), Temporality.CUMULATIVE);
-  public static final ViewSpecification DELTA_SUMMARY =
+  private static final ViewSpecification DELTA_SUMMARY =
       ViewSpecification.create(Aggregations.minMaxSumCount(), Temporality.DELTA);
-  public static final ViewSpecification CUMULATIVE_LAST_VALUE =
+  private static final ViewSpecification CUMULATIVE_LAST_VALUE =
       ViewSpecification.create(Aggregations.lastValue(), Temporality.CUMULATIVE);
 
   private final Map<InstrumentSelector, ViewSpecification> configuration =
@@ -92,6 +94,8 @@ private static ViewSpecification getDefaultSpecification(InstrumentDescriptor de
       case COUNTER:
       case UP_DOWN_COUNTER:
         return CUMULATIVE_SUM;
+        // TODO: Revisit the batcher used here for value observers,
+        // currently this does not remove duplicate records in the same cycle.
       case VALUE_OBSERVER:
       case VALUE_RECORDER:
         return DELTA_SUMMARY;
@@ -102,8 +106,7 @@ private static ViewSpecification getDefaultSpecification(InstrumentDescriptor de
     throw new IllegalArgumentException("Unknown descriptor type: " + descriptor.getType());
   }
 
-  /** todo: javadoc me. */
-  public void registerView(InstrumentSelector selector, ViewSpecification specification) {
+  void registerView(InstrumentSelector selector, ViewSpecification specification) {
     configuration.put(selector, specification);
   }
 }
diff --git a/sdk/src/test/java/io/opentelemetry/sdk/metrics/view/ViewRegistryTest.java b/sdk/src/test/java/io/opentelemetry/sdk/metrics/ViewRegistryTest.java
similarity index 95%
rename from sdk/src/test/java/io/opentelemetry/sdk/metrics/view/ViewRegistryTest.java
rename to sdk/src/test/java/io/opentelemetry/sdk/metrics/ViewRegistryTest.java
index 0e5c8d488c3..a5901c0b12a 100644
--- a/sdk/src/test/java/io/opentelemetry/sdk/metrics/view/ViewRegistryTest.java
+++ b/sdk/src/test/java/io/opentelemetry/sdk/metrics/ViewRegistryTest.java
@@ -14,17 +14,13 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.sdk.metrics.view;
+package io.opentelemetry.sdk.metrics;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
 import io.opentelemetry.common.Labels;
 import io.opentelemetry.sdk.internal.TestClock;
-import io.opentelemetry.sdk.metrics.Batcher;
-import io.opentelemetry.sdk.metrics.InstrumentDescriptor;
-import io.opentelemetry.sdk.metrics.MeterProviderSharedState;
-import io.opentelemetry.sdk.metrics.MeterSharedState;
 import io.opentelemetry.sdk.metrics.aggregator.DoubleLastValueAggregator;
 import io.opentelemetry.sdk.metrics.aggregator.DoubleMinMaxSumCount;
 import io.opentelemetry.sdk.metrics.aggregator.DoubleSumAggregator;
@@ -33,6 +29,9 @@
 import io.opentelemetry.sdk.metrics.aggregator.LongSumAggregator;
 import io.opentelemetry.sdk.metrics.common.InstrumentType;
 import io.opentelemetry.sdk.metrics.common.InstrumentValueType;
+import io.opentelemetry.sdk.metrics.view.Aggregations;
+import io.opentelemetry.sdk.metrics.view.InstrumentSelector;
+import io.opentelemetry.sdk.metrics.view.ViewSpecification;
 import io.opentelemetry.sdk.metrics.view.ViewSpecification.Temporality;
 import org.junit.Before;
 import org.junit.Test;