From feedef236676edf08387b0064f8deb210cf5d7d8 Mon Sep 17 00:00:00 2001
From: Bogdan Drutu <bogdandrutu@gmail.com>
Date: Wed, 9 Dec 2020 20:19:31 -0800
Subject: [PATCH] Rename accumulator to processor to match Go (#2255)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
---
 .../AbstractAsynchronousInstrument.java       | 48 +++++++++----------
 .../sdk/metrics/AbstractInstrument.java       |  2 +-
 .../AbstractSynchronousInstrument.java        | 15 +++---
 .../sdk/metrics/DoubleCounterSdk.java         | 12 ++---
 .../sdk/metrics/DoubleSumObserverSdk.java     |  4 +-
 .../sdk/metrics/DoubleUpDownCounterSdk.java   | 12 ++---
 .../metrics/DoubleUpDownSumObserverSdk.java   |  4 +-
 .../sdk/metrics/DoubleValueObserverSdk.java   |  4 +-
 .../sdk/metrics/DoubleValueRecorderSdk.java   | 12 ++---
 ...umulator.java => InstrumentProcessor.java} | 18 +++----
 .../sdk/metrics/LongCounterSdk.java           | 13 +++--
 .../sdk/metrics/LongSumObserverSdk.java       |  4 +-
 .../sdk/metrics/LongUpDownCounterSdk.java     | 12 ++---
 .../sdk/metrics/LongUpDownSumObserverSdk.java |  4 +-
 .../sdk/metrics/LongValueObserverSdk.java     |  4 +-
 .../sdk/metrics/LongValueRecorderSdk.java     | 12 ++---
 .../opentelemetry/sdk/metrics/MeterSdk.java   |  5 +-
 .../sdk/metrics/ViewRegistry.java             |  8 ++--
 .../sdk/metrics/ViewRegistryTest.java         | 16 +++----
 19 files changed, 103 insertions(+), 106 deletions(-)
 rename sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/{InstrumentAccumulator.java => InstrumentProcessor.java} (94%)

diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractAsynchronousInstrument.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractAsynchronousInstrument.java
index cd13ddbccf..5239820709 100644
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractAsynchronousInstrument.java
+++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractAsynchronousInstrument.java
@@ -18,15 +18,15 @@ abstract class AbstractAsynchronousInstrument<T extends AsynchronousInstrument.R
     extends AbstractInstrument implements AsynchronousInstrument<T> {
   @Nullable private final Callback<T> metricUpdater;
   private final ReentrantLock collectLock = new ReentrantLock();
-  private final InstrumentAccumulator instrumentAccumulator;
+  private final InstrumentProcessor instrumentProcessor;
 
   AbstractAsynchronousInstrument(
       InstrumentDescriptor descriptor,
-      InstrumentAccumulator instrumentAccumulator,
+      InstrumentProcessor instrumentProcessor,
       @Nullable Callback<T> metricUpdater) {
     super(descriptor);
     this.metricUpdater = metricUpdater;
-    this.instrumentAccumulator = instrumentAccumulator;
+    this.instrumentProcessor = instrumentProcessor;
   }
 
   @Override
@@ -36,14 +36,14 @@ abstract class AbstractAsynchronousInstrument<T extends AsynchronousInstrument.R
     }
     collectLock.lock();
     try {
-      metricUpdater.update(newResult(instrumentAccumulator));
-      return instrumentAccumulator.completeCollectionCycle();
+      metricUpdater.update(newResult(instrumentProcessor));
+      return instrumentProcessor.completeCollectionCycle();
     } finally {
       collectLock.unlock();
     }
   }
 
-  abstract T newResult(InstrumentAccumulator instrumentAccumulator);
+  abstract T newResult(InstrumentProcessor instrumentProcessor);
 
   abstract static class Builder<B extends AbstractInstrument.Builder<?>>
       extends AbstractInstrument.Builder<B> {
@@ -60,29 +60,29 @@ abstract class AbstractAsynchronousInstrument<T extends AsynchronousInstrument.R
       extends AbstractAsynchronousInstrument<LongResult> {
     AbstractLongAsynchronousInstrument(
         InstrumentDescriptor descriptor,
-        InstrumentAccumulator instrumentAccumulator,
+        InstrumentProcessor instrumentProcessor,
         @Nullable Callback<LongResult> metricUpdater) {
-      super(descriptor, instrumentAccumulator, metricUpdater);
+      super(descriptor, instrumentProcessor, metricUpdater);
     }
 
     @Override
-    LongResultSdk newResult(InstrumentAccumulator instrumentAccumulator) {
-      return new LongResultSdk(instrumentAccumulator);
+    LongResultSdk newResult(InstrumentProcessor instrumentProcessor) {
+      return new LongResultSdk(instrumentProcessor);
     }
 
     private static final class LongResultSdk implements LongResult {
 
-      private final InstrumentAccumulator instrumentAccumulator;
+      private final InstrumentProcessor instrumentProcessor;
 
-      private LongResultSdk(InstrumentAccumulator instrumentAccumulator) {
-        this.instrumentAccumulator = instrumentAccumulator;
+      private LongResultSdk(InstrumentProcessor instrumentProcessor) {
+        this.instrumentProcessor = instrumentProcessor;
       }
 
       @Override
       public void observe(long sum, Labels labels) {
-        Aggregator aggregator = instrumentAccumulator.getAggregator();
+        Aggregator aggregator = instrumentProcessor.getAggregator();
         aggregator.recordLong(sum);
-        instrumentAccumulator.batch(labels, aggregator, /* mappedAggregator= */ false);
+        instrumentProcessor.batch(labels, aggregator, /* mappedAggregator= */ false);
       }
     }
   }
@@ -91,29 +91,29 @@ abstract class AbstractAsynchronousInstrument<T extends AsynchronousInstrument.R
       extends AbstractAsynchronousInstrument<DoubleResult> {
     AbstractDoubleAsynchronousInstrument(
         InstrumentDescriptor descriptor,
-        InstrumentAccumulator instrumentAccumulator,
+        InstrumentProcessor instrumentProcessor,
         @Nullable Callback<DoubleResult> metricUpdater) {
-      super(descriptor, instrumentAccumulator, metricUpdater);
+      super(descriptor, instrumentProcessor, metricUpdater);
     }
 
     @Override
-    DoubleResultSdk newResult(InstrumentAccumulator instrumentAccumulator) {
-      return new DoubleResultSdk(instrumentAccumulator);
+    DoubleResultSdk newResult(InstrumentProcessor instrumentProcessor) {
+      return new DoubleResultSdk(instrumentProcessor);
     }
 
     private static final class DoubleResultSdk implements DoubleResult {
 
-      private final InstrumentAccumulator instrumentAccumulator;
+      private final InstrumentProcessor instrumentProcessor;
 
-      private DoubleResultSdk(InstrumentAccumulator instrumentAccumulator) {
-        this.instrumentAccumulator = instrumentAccumulator;
+      private DoubleResultSdk(InstrumentProcessor instrumentProcessor) {
+        this.instrumentProcessor = instrumentProcessor;
       }
 
       @Override
       public void observe(double sum, Labels labels) {
-        Aggregator aggregator = instrumentAccumulator.getAggregator();
+        Aggregator aggregator = instrumentProcessor.getAggregator();
         aggregator.recordDouble(sum);
-        instrumentAccumulator.batch(labels, aggregator, /* mappedAggregator= */ false);
+        instrumentProcessor.batch(labels, aggregator, /* mappedAggregator= */ false);
       }
     }
   }
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java
index 58ba2f10d9..2483268a06 100644
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java
+++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractInstrument.java
@@ -101,7 +101,7 @@ abstract class AbstractInstrument implements Instrument {
       return meterSharedState.getInstrumentRegistry().register(instrument);
     }
 
-    protected InstrumentAccumulator getBatcher(InstrumentDescriptor descriptor) {
+    protected InstrumentProcessor getBatcher(InstrumentDescriptor descriptor) {
       return meterSdk.createBatcher(descriptor, meterProviderSharedState, meterSharedState);
     }
   }
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractSynchronousInstrument.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractSynchronousInstrument.java
index ed55ed7771..04b7ad11f2 100644
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractSynchronousInstrument.java
+++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/AbstractSynchronousInstrument.java
@@ -17,14 +17,14 @@ abstract class AbstractSynchronousInstrument<B extends AbstractBoundInstrument>
     extends AbstractInstrument {
   private final ConcurrentHashMap<Labels, B> boundLabels;
   private final ReentrantLock collectLock;
-  private final InstrumentAccumulator instrumentAccumulator;
+  private final InstrumentProcessor instrumentProcessor;
 
   AbstractSynchronousInstrument(
-      InstrumentDescriptor descriptor, InstrumentAccumulator instrumentAccumulator) {
+      InstrumentDescriptor descriptor, InstrumentProcessor instrumentProcessor) {
     super(descriptor);
     boundLabels = new ConcurrentHashMap<>();
     collectLock = new ReentrantLock();
-    this.instrumentAccumulator = instrumentAccumulator;
+    this.instrumentProcessor = instrumentProcessor;
   }
 
   public B bind(Labels labels) {
@@ -36,7 +36,7 @@ abstract class AbstractSynchronousInstrument<B extends AbstractBoundInstrument>
     }
 
     // Missing entry or no longer mapped, try to add a new entry.
-    binding = newBinding(instrumentAccumulator);
+    binding = newBinding(instrumentProcessor);
     while (true) {
       B oldBound = boundLabels.putIfAbsent(labels, binding);
       if (oldBound != null) {
@@ -68,14 +68,13 @@ abstract class AbstractSynchronousInstrument<B extends AbstractBoundInstrument>
           // acquire but because we requested a specific value only one will succeed.
           boundLabels.remove(entry.getKey(), entry.getValue());
         }
-        instrumentAccumulator.batch(
-            entry.getKey(), entry.getValue().getAggregator(), !unmappedEntry);
+        instrumentProcessor.batch(entry.getKey(), entry.getValue().getAggregator(), !unmappedEntry);
       }
-      return instrumentAccumulator.completeCollectionCycle();
+      return instrumentProcessor.completeCollectionCycle();
     } finally {
       collectLock.unlock();
     }
   }
 
-  abstract B newBinding(InstrumentAccumulator instrumentAccumulator);
+  abstract B newBinding(InstrumentProcessor instrumentProcessor);
 }
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java
index 05a8bafd1a..994b0ee0b0 100644
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java
+++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleCounterSdk.java
@@ -15,8 +15,8 @@ final class DoubleCounterSdk extends AbstractSynchronousInstrument<BoundInstrume
     implements DoubleCounter {
 
   private DoubleCounterSdk(
-      InstrumentDescriptor descriptor, InstrumentAccumulator instrumentAccumulator) {
-    super(descriptor, instrumentAccumulator);
+      InstrumentDescriptor descriptor, InstrumentProcessor instrumentProcessor) {
+    super(descriptor, instrumentProcessor);
   }
 
   @Override
@@ -35,15 +35,15 @@ final class DoubleCounterSdk extends AbstractSynchronousInstrument<BoundInstrume
   }
 
   @Override
-  BoundInstrument newBinding(InstrumentAccumulator instrumentAccumulator) {
-    return new BoundInstrument(instrumentAccumulator);
+  BoundInstrument newBinding(InstrumentProcessor instrumentProcessor) {
+    return new BoundInstrument(instrumentProcessor);
   }
 
   static final class BoundInstrument extends AbstractBoundInstrument
       implements DoubleCounter.BoundDoubleCounter {
 
-    BoundInstrument(InstrumentAccumulator instrumentAccumulator) {
-      super(instrumentAccumulator.getAggregator());
+    BoundInstrument(InstrumentProcessor instrumentProcessor) {
+      super(instrumentProcessor.getAggregator());
     }
 
     @Override
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleSumObserverSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleSumObserverSdk.java
index d2579957e3..ab9601e6ae 100644
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleSumObserverSdk.java
+++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleSumObserverSdk.java
@@ -16,9 +16,9 @@ final class DoubleSumObserverSdk extends AbstractDoubleAsynchronousInstrument
 
   DoubleSumObserverSdk(
       InstrumentDescriptor descriptor,
-      InstrumentAccumulator instrumentAccumulator,
+      InstrumentProcessor instrumentProcessor,
       @Nullable Callback<DoubleResult> metricUpdater) {
-    super(descriptor, instrumentAccumulator, metricUpdater);
+    super(descriptor, instrumentProcessor, metricUpdater);
   }
 
   static final class Builder
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdk.java
index 9b6fd39e0e..240238a296 100644
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdk.java
+++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownCounterSdk.java
@@ -15,8 +15,8 @@ final class DoubleUpDownCounterSdk extends AbstractSynchronousInstrument<BoundIn
     implements DoubleUpDownCounter {
 
   private DoubleUpDownCounterSdk(
-      InstrumentDescriptor descriptor, InstrumentAccumulator instrumentAccumulator) {
-    super(descriptor, instrumentAccumulator);
+      InstrumentDescriptor descriptor, InstrumentProcessor instrumentProcessor) {
+    super(descriptor, instrumentProcessor);
   }
 
   @Override
@@ -32,15 +32,15 @@ final class DoubleUpDownCounterSdk extends AbstractSynchronousInstrument<BoundIn
   }
 
   @Override
-  BoundInstrument newBinding(InstrumentAccumulator instrumentAccumulator) {
-    return new BoundInstrument(instrumentAccumulator);
+  BoundInstrument newBinding(InstrumentProcessor instrumentProcessor) {
+    return new BoundInstrument(instrumentProcessor);
   }
 
   static final class BoundInstrument extends AbstractBoundInstrument
       implements BoundDoubleUpDownCounter {
 
-    BoundInstrument(InstrumentAccumulator instrumentAccumulator) {
-      super(instrumentAccumulator.getAggregator());
+    BoundInstrument(InstrumentProcessor instrumentProcessor) {
+      super(instrumentProcessor.getAggregator());
     }
 
     @Override
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownSumObserverSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownSumObserverSdk.java
index bcb93ff18b..f29eaad80f 100644
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownSumObserverSdk.java
+++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleUpDownSumObserverSdk.java
@@ -16,9 +16,9 @@ final class DoubleUpDownSumObserverSdk extends AbstractDoubleAsynchronousInstrum
 
   DoubleUpDownSumObserverSdk(
       InstrumentDescriptor descriptor,
-      InstrumentAccumulator instrumentAccumulator,
+      InstrumentProcessor instrumentProcessor,
       @Nullable Callback<DoubleResult> metricUpdater) {
-    super(descriptor, instrumentAccumulator, metricUpdater);
+    super(descriptor, instrumentProcessor, metricUpdater);
   }
 
   static final class Builder
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdk.java
index e016b4c884..785a410f43 100644
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdk.java
+++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueObserverSdk.java
@@ -16,9 +16,9 @@ final class DoubleValueObserverSdk extends AbstractDoubleAsynchronousInstrument
 
   DoubleValueObserverSdk(
       InstrumentDescriptor descriptor,
-      InstrumentAccumulator instrumentAccumulator,
+      InstrumentProcessor instrumentProcessor,
       @Nullable Callback<DoubleResult> metricUpdater) {
-    super(descriptor, instrumentAccumulator, metricUpdater);
+    super(descriptor, instrumentProcessor, metricUpdater);
   }
 
   static final class Builder
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdk.java
index 09c2f91897..b512a453a6 100644
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdk.java
+++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/DoubleValueRecorderSdk.java
@@ -15,8 +15,8 @@ final class DoubleValueRecorderSdk extends AbstractSynchronousInstrument<BoundIn
     implements DoubleValueRecorder {
 
   private DoubleValueRecorderSdk(
-      InstrumentDescriptor descriptor, InstrumentAccumulator instrumentAccumulator) {
-    super(descriptor, instrumentAccumulator);
+      InstrumentDescriptor descriptor, InstrumentProcessor instrumentProcessor) {
+    super(descriptor, instrumentProcessor);
   }
 
   @Override
@@ -32,15 +32,15 @@ final class DoubleValueRecorderSdk extends AbstractSynchronousInstrument<BoundIn
   }
 
   @Override
-  BoundInstrument newBinding(InstrumentAccumulator instrumentAccumulator) {
-    return new BoundInstrument(instrumentAccumulator);
+  BoundInstrument newBinding(InstrumentProcessor instrumentProcessor) {
+    return new BoundInstrument(instrumentProcessor);
   }
 
   static final class BoundInstrument extends AbstractBoundInstrument
       implements BoundDoubleValueRecorder {
 
-    BoundInstrument(InstrumentAccumulator instrumentAccumulator) {
-      super(instrumentAccumulator.getAggregator());
+    BoundInstrument(InstrumentProcessor instrumentProcessor) {
+      super(instrumentProcessor.getAggregator());
     }
 
     @Override
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/InstrumentAccumulator.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/InstrumentProcessor.java
similarity index 94%
rename from sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/InstrumentAccumulator.java
rename to sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/InstrumentProcessor.java
index f8347c0645..e6fe749c85 100644
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/InstrumentAccumulator.java
+++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/InstrumentProcessor.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.Objects;
 
 /**
- * An {@code InstrumentAccumulator} represents an internal instance of an {@code Accumulator} for a
+ * An {@code InstrumentProcessor} represents an internal instance of an {@code Accumulator} for a
  * specific {code Instrument}. It records individual measurements (via the {@code Aggregator}). It
  * batches together {@code Aggregator}s for the similar sets of labels.
  *
@@ -29,7 +29,7 @@ import java.util.Objects;
  * cycle must be protected by a lock. A collection cycle is defined by multiple calls to {@link
  * #batch(Labels, Aggregator, boolean)} followed by one {@link #completeCollectionCycle()};
  */
-final class InstrumentAccumulator {
+final class InstrumentProcessor {
   private final InstrumentDescriptor descriptor;
   private final Aggregation aggregation;
   private final Resource resource;
@@ -45,12 +45,12 @@ final class InstrumentAccumulator {
    * aggregation. "Cumulative" means that all metrics that are generated will be considered for the
    * lifetime of the Instrument being aggregated.
    */
-  static InstrumentAccumulator getCumulativeAllLabels(
+  static InstrumentProcessor getCumulativeAllLabels(
       InstrumentDescriptor descriptor,
       MeterProviderSharedState meterProviderSharedState,
       MeterSharedState meterSharedState,
       Aggregation aggregation) {
-    return new InstrumentAccumulator(
+    return new InstrumentProcessor(
         descriptor,
         aggregation,
         meterProviderSharedState.getResource(),
@@ -64,12 +64,12 @@ final class InstrumentAccumulator {
    * aggregation. "Delta" means that all metrics that are generated are only for the most recent
    * collection interval.
    */
-  static InstrumentAccumulator getDeltaAllLabels(
+  static InstrumentProcessor getDeltaAllLabels(
       InstrumentDescriptor descriptor,
       MeterProviderSharedState meterProviderSharedState,
       MeterSharedState meterSharedState,
       Aggregation aggregation) {
-    return new InstrumentAccumulator(
+    return new InstrumentProcessor(
         descriptor,
         aggregation,
         meterProviderSharedState.getResource(),
@@ -78,7 +78,7 @@ final class InstrumentAccumulator {
         /* delta= */ true);
   }
 
-  private InstrumentAccumulator(
+  private InstrumentProcessor(
       InstrumentDescriptor descriptor,
       Aggregation aggregation,
       Resource resource,
@@ -113,7 +113,7 @@ final class InstrumentAccumulator {
    * @param aggregator the {@link Aggregator} used to aggregate individual events for the given
    *     {@code LabelSetSdk}.
    * @param mappedAggregator {@code true} if the {@code Aggregator} is still in used by a binding.
-   *     If {@code false} the {@code Batcher} can reuse the {@code Aggregator} instance.
+   *     If {@code false} the {@code InstrumentProcessor} can reuse the {@code Aggregator} instance.
    */
   void batch(Labels labelSet, Aggregator aggregator, boolean mappedAggregator) {
     if (!aggregator.hasRecordings()) {
@@ -183,7 +183,7 @@ final class InstrumentAccumulator {
       return false;
     }
 
-    InstrumentAccumulator allLabels = (InstrumentAccumulator) o;
+    InstrumentProcessor allLabels = (InstrumentProcessor) o;
 
     if (startEpochNanos != allLabels.startEpochNanos) {
       return false;
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java
index 74863694b5..3d2e3cdfc6 100644
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java
+++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongCounterSdk.java
@@ -14,9 +14,8 @@ import io.opentelemetry.sdk.metrics.common.InstrumentValueType;
 final class LongCounterSdk extends AbstractSynchronousInstrument<BoundInstrument>
     implements LongCounter {
 
-  private LongCounterSdk(
-      InstrumentDescriptor descriptor, InstrumentAccumulator instrumentAccumulator) {
-    super(descriptor, instrumentAccumulator);
+  private LongCounterSdk(InstrumentDescriptor descriptor, InstrumentProcessor instrumentProcessor) {
+    super(descriptor, instrumentProcessor);
   }
 
   @Override
@@ -35,15 +34,15 @@ final class LongCounterSdk extends AbstractSynchronousInstrument<BoundInstrument
   }
 
   @Override
-  BoundInstrument newBinding(InstrumentAccumulator instrumentAccumulator) {
-    return new BoundInstrument(instrumentAccumulator);
+  BoundInstrument newBinding(InstrumentProcessor instrumentProcessor) {
+    return new BoundInstrument(instrumentProcessor);
   }
 
   static final class BoundInstrument extends AbstractBoundInstrument
       implements LongCounter.BoundLongCounter {
 
-    BoundInstrument(InstrumentAccumulator instrumentAccumulator) {
-      super(instrumentAccumulator.getAggregator());
+    BoundInstrument(InstrumentProcessor instrumentProcessor) {
+      super(instrumentProcessor.getAggregator());
     }
 
     @Override
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongSumObserverSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongSumObserverSdk.java
index 4f651e4e04..98b1c8769c 100644
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongSumObserverSdk.java
+++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongSumObserverSdk.java
@@ -15,9 +15,9 @@ final class LongSumObserverSdk extends AbstractLongAsynchronousInstrument
     implements LongSumObserver {
   LongSumObserverSdk(
       InstrumentDescriptor descriptor,
-      InstrumentAccumulator instrumentAccumulator,
+      InstrumentProcessor instrumentProcessor,
       @Nullable Callback<LongResult> metricUpdater) {
-    super(descriptor, instrumentAccumulator, metricUpdater);
+    super(descriptor, instrumentProcessor, metricUpdater);
   }
 
   static final class Builder
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdk.java
index defe1c13dd..f18354dbff 100644
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdk.java
+++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownCounterSdk.java
@@ -15,8 +15,8 @@ final class LongUpDownCounterSdk extends AbstractSynchronousInstrument<BoundInst
     implements LongUpDownCounter {
 
   private LongUpDownCounterSdk(
-      InstrumentDescriptor descriptor, InstrumentAccumulator instrumentAccumulator) {
-    super(descriptor, instrumentAccumulator);
+      InstrumentDescriptor descriptor, InstrumentProcessor instrumentProcessor) {
+    super(descriptor, instrumentProcessor);
   }
 
   @Override
@@ -32,15 +32,15 @@ final class LongUpDownCounterSdk extends AbstractSynchronousInstrument<BoundInst
   }
 
   @Override
-  BoundInstrument newBinding(InstrumentAccumulator instrumentAccumulator) {
-    return new BoundInstrument(instrumentAccumulator);
+  BoundInstrument newBinding(InstrumentProcessor instrumentProcessor) {
+    return new BoundInstrument(instrumentProcessor);
   }
 
   static final class BoundInstrument extends AbstractBoundInstrument
       implements BoundLongUpDownCounter {
 
-    BoundInstrument(InstrumentAccumulator instrumentAccumulator) {
-      super(instrumentAccumulator.getAggregator());
+    BoundInstrument(InstrumentProcessor instrumentProcessor) {
+      super(instrumentProcessor.getAggregator());
     }
 
     @Override
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownSumObserverSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownSumObserverSdk.java
index 8a30186a14..20958f2372 100644
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownSumObserverSdk.java
+++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongUpDownSumObserverSdk.java
@@ -15,9 +15,9 @@ final class LongUpDownSumObserverSdk extends AbstractLongAsynchronousInstrument
     implements LongUpDownSumObserver {
   LongUpDownSumObserverSdk(
       InstrumentDescriptor descriptor,
-      InstrumentAccumulator instrumentAccumulator,
+      InstrumentProcessor instrumentProcessor,
       @Nullable Callback<LongResult> metricUpdater) {
-    super(descriptor, instrumentAccumulator, metricUpdater);
+    super(descriptor, instrumentProcessor, metricUpdater);
   }
 
   static final class Builder
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueObserverSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueObserverSdk.java
index f6e55bd7d1..aa98af7a96 100644
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueObserverSdk.java
+++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueObserverSdk.java
@@ -16,9 +16,9 @@ final class LongValueObserverSdk extends AbstractLongAsynchronousInstrument
 
   LongValueObserverSdk(
       InstrumentDescriptor descriptor,
-      InstrumentAccumulator instrumentAccumulator,
+      InstrumentProcessor instrumentProcessor,
       @Nullable Callback<LongResult> metricUpdater) {
-    super(descriptor, instrumentAccumulator, metricUpdater);
+    super(descriptor, instrumentProcessor, metricUpdater);
   }
 
   static final class Builder
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdk.java
index 0d687f4aa1..02871f65db 100644
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdk.java
+++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/LongValueRecorderSdk.java
@@ -15,8 +15,8 @@ final class LongValueRecorderSdk extends AbstractSynchronousInstrument<BoundInst
     implements LongValueRecorder {
 
   private LongValueRecorderSdk(
-      InstrumentDescriptor descriptor, InstrumentAccumulator instrumentAccumulator) {
-    super(descriptor, instrumentAccumulator);
+      InstrumentDescriptor descriptor, InstrumentProcessor instrumentProcessor) {
+    super(descriptor, instrumentProcessor);
   }
 
   @Override
@@ -32,15 +32,15 @@ final class LongValueRecorderSdk extends AbstractSynchronousInstrument<BoundInst
   }
 
   @Override
-  BoundInstrument newBinding(InstrumentAccumulator instrumentAccumulator) {
-    return new BoundInstrument(instrumentAccumulator);
+  BoundInstrument newBinding(InstrumentProcessor instrumentProcessor) {
+    return new BoundInstrument(instrumentProcessor);
   }
 
   static final class BoundInstrument extends AbstractBoundInstrument
       implements BoundLongValueRecorder {
 
-    BoundInstrument(InstrumentAccumulator instrumentAccumulator) {
-      super(instrumentAccumulator.getAggregator());
+    BoundInstrument(InstrumentProcessor instrumentProcessor) {
+      super(instrumentProcessor.getAggregator());
     }
 
     @Override
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/MeterSdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/MeterSdk.java
index 2e5acc7ce9..5a85e326db 100644
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/MeterSdk.java
+++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/MeterSdk.java
@@ -113,10 +113,9 @@ final class MeterSdk implements Meter {
   }
 
   /**
-   * Creates a {@link InstrumentAccumulator}, by using the {@link ViewRegistry} to do the actual
-   * work.
+   * Creates a {@link InstrumentProcessor}, by using the {@link ViewRegistry} to do the actual work.
    */
-  InstrumentAccumulator createBatcher(
+  InstrumentProcessor createBatcher(
       InstrumentDescriptor descriptor,
       MeterProviderSharedState meterProviderSharedState,
       MeterSharedState meterSharedState) {
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/ViewRegistry.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/ViewRegistry.java
index 055b1f768e..b50fad4d45 100644
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/ViewRegistry.java
+++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/ViewRegistry.java
@@ -44,8 +44,8 @@ class ViewRegistry {
     aggregationChooser.addView(selector, specification);
   }
 
-  /** Create a new {@link InstrumentAccumulator} for use in metric recording aggregation. */
-  InstrumentAccumulator createBatcher(
+  /** Create a new {@link InstrumentProcessor} for use in metric recording aggregation. */
+  InstrumentProcessor createBatcher(
       MeterProviderSharedState meterProviderSharedState,
       MeterSharedState meterSharedState,
       InstrumentDescriptor descriptor) {
@@ -55,10 +55,10 @@ class ViewRegistry {
     Aggregation aggregation = specification.aggregation();
 
     if (Temporality.CUMULATIVE == specification.temporality()) {
-      return InstrumentAccumulator.getCumulativeAllLabels(
+      return InstrumentProcessor.getCumulativeAllLabels(
           descriptor, meterProviderSharedState, meterSharedState, aggregation);
     } else if (Temporality.DELTA == specification.temporality()) {
-      return InstrumentAccumulator.getDeltaAllLabels(
+      return InstrumentProcessor.getDeltaAllLabels(
           descriptor, meterProviderSharedState, meterSharedState, aggregation);
     }
     throw new IllegalStateException("unsupported Temporality: " + specification.temporality());
diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/ViewRegistryTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/ViewRegistryTest.java
index de43119e67..1429d8e0c7 100644
--- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/ViewRegistryTest.java
+++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/ViewRegistryTest.java
@@ -55,17 +55,17 @@ class ViewRegistryTest {
     AggregationConfiguration specification =
         AggregationConfiguration.create(
             Aggregations.count(), AggregationConfiguration.Temporality.CUMULATIVE);
-    InstrumentAccumulator expectedInstrumentAccumulator =
-        InstrumentAccumulator.getCumulativeAllLabels(
+    InstrumentProcessor expectedInstrumentProcessor =
+        InstrumentProcessor.getCumulativeAllLabels(
             descriptor, providerSharedState, meterSharedState, Aggregations.count());
 
     when(chooser.chooseAggregation(descriptor)).thenReturn(specification);
 
-    InstrumentAccumulator result =
+    InstrumentProcessor result =
         viewRegistry.createBatcher(providerSharedState, meterSharedState, descriptor);
 
     assertThat(result.generatesDeltas()).isFalse();
-    assertThat(result).isEqualTo(expectedInstrumentAccumulator);
+    assertThat(result).isEqualTo(expectedInstrumentProcessor);
 
     assertThat(result).isNotNull();
   }
@@ -87,17 +87,17 @@ class ViewRegistryTest {
     AggregationConfiguration specification =
         AggregationConfiguration.create(
             Aggregations.count(), AggregationConfiguration.Temporality.DELTA);
-    InstrumentAccumulator expectedInstrumentAccumulator =
-        InstrumentAccumulator.getDeltaAllLabels(
+    InstrumentProcessor expectedInstrumentProcessor =
+        InstrumentProcessor.getDeltaAllLabels(
             descriptor, providerSharedState, meterSharedState, Aggregations.count());
 
     when(chooser.chooseAggregation(descriptor)).thenReturn(specification);
 
-    InstrumentAccumulator result =
+    InstrumentProcessor result =
         viewRegistry.createBatcher(providerSharedState, meterSharedState, descriptor);
 
     assertThat(result.generatesDeltas()).isTrue();
-    assertThat(result).isEqualTo(expectedInstrumentAccumulator);
+    assertThat(result).isEqualTo(expectedInstrumentProcessor);
 
     assertThat(result).isNotNull();
   }