Rename

Author: anuraaga

sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/BatchSpanProcessor.java

@@ -161,7 +161,7 @@ public String toString() {
   // the data.
   private static final class Worker implements Runnable {
 
-    private final SpanProcessorMetrics spanProcessorMetrics;
+    private final SpanProcessorInstrumentation spanProcessorInstrumentation;
 
     private final SpanExporter spanExporter;
     private final long scheduleDelayNanos;
@@ -201,17 +201,17 @@ private Worker(
       this.queue = queue;
       this.signal = new ArrayBlockingQueue<>(1);
 
-      spanProcessorMetrics =
-          SpanProcessorMetrics.get(telemetryVersion, COMPONENT_ID, meterProvider);
+      spanProcessorInstrumentation =
+          SpanProcessorInstrumentation.get(telemetryVersion, COMPONENT_ID, meterProvider);
       this.maxQueueSize = maxQueueSize;
 
       this.batch = new ArrayList<>(this.maxExportBatchSize);
     }
 
     private void addSpan(ReadableSpan span) {
-      spanProcessorMetrics.buildQueueMetricsOnce(maxQueueSize, queue::size);
+      spanProcessorInstrumentation.buildQueueMetricsOnce(maxQueueSize, queue::size);
       if (!queue.offer(span)) {
-        spanProcessorMetrics.dropSpans(1);
+        spanProcessorInstrumentation.dropSpans(1);
       } else {
         if (queueSize.incrementAndGet() >= spansNeeded.get()) {
           signal.offer(true);
@@ -332,7 +332,7 @@ private void exportCurrentBatch() {
         logger.log(Level.WARNING, "Exporter threw an Exception", t);
         error = t.getClass().getName();
       } finally {
-        spanProcessorMetrics.finishSpans(batch.size(), error);
+        spanProcessorInstrumentation.finishSpans(batch.size(), error);
         batch.clear();
       }
     }

…e/export/LegacySpanProcessorMetrics.java …/LegacySpanProcessorInstrumentation.javasdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/LegacySpanProcessorMetrics.java renamed to sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/LegacySpanProcessorInstrumentation.java sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/LegacySpanProcessorMetrics.java renamed to sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/LegacySpanProcessorInstrumentation.java

@@ -15,7 +15,7 @@
 import javax.annotation.Nullable;
 
 /** Span processor metrics defined before they were standardized in semconv. */
-final class LegacySpanProcessorMetrics implements SpanProcessorMetrics {
+final class LegacySpanProcessorInstrumentation implements SpanProcessorInstrumentation {
   private static final AttributeKey<String> SPAN_PROCESSOR_TYPE_LABEL =
       AttributeKey.stringKey("processorType");
   private static final AttributeKey<Boolean> SPAN_PROCESSOR_DROPPED_LABEL =
@@ -33,7 +33,7 @@ final class LegacySpanProcessorMetrics implements SpanProcessorMetrics {
   @Nullable private Meter meter;
   @Nullable private volatile LongCounter processedSpans;
 
-  LegacySpanProcessorMetrics(Supplier<MeterProvider> meterProvider) {
+  LegacySpanProcessorInstrumentation(Supplier<MeterProvider> meterProvider) {
     this.meterProvider = meterProvider;
 
     standardAttrs =

…/export/SemConvSpanProcessorMetrics.java …SemConvSpanProcessorInstrumentation.javasdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SemConvSpanProcessorMetrics.java renamed to sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SemConvSpanProcessorInstrumentation.java sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SemConvSpanProcessorMetrics.java renamed to sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SemConvSpanProcessorInstrumentation.java

@@ -20,7 +20,7 @@
  * href="https://opentelemetry.io/docs/specs/semconv/otel/sdk-metrics/#span-metrics">semantic
  * conventions</a>.
  */
-final class SemConvSpanProcessorMetrics implements SpanProcessorMetrics {
+final class SemConvSpanProcessorInstrumentation implements SpanProcessorInstrumentation {
 
   private final Object lock = new Object();
   private final AtomicBoolean builtQueueMetrics = new AtomicBoolean(false);
@@ -32,7 +32,8 @@ final class SemConvSpanProcessorMetrics implements SpanProcessorMetrics {
   @Nullable private Meter meter;
   @Nullable private volatile LongCounter processedSpans;
 
-  SemConvSpanProcessorMetrics(ComponentId componentId, Supplier<MeterProvider> meterProvider) {
+  SemConvSpanProcessorInstrumentation(
+      ComponentId componentId, Supplier<MeterProvider> meterProvider) {
     this.meterProvider = meterProvider;
 
     standardAttrs =

sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SimpleSpanProcessor.java

@@ -46,7 +46,7 @@ public final class SimpleSpanProcessor implements SpanProcessor {
   private final Set<CompletableResultCode> pendingExports =
       Collections.newSetFromMap(new ConcurrentHashMap<>());
   private final AtomicBoolean isShutdown = new AtomicBoolean(false);
-  private final SpanProcessorMetrics spanProcessorMetrics;
+  private final SpanProcessorInstrumentation spanProcessorInstrumentation;
 
   private final Object exporterLock = new Object();
 
@@ -81,8 +81,9 @@ public static SimpleSpanProcessorBuilder builder(SpanExporter exporter) {
       Supplier<MeterProvider> meterProvider) {
     this.spanExporter = requireNonNull(spanExporter, "spanExporter");
     this.exportUnsampledSpans = exportUnsampledSpans;
-    spanProcessorMetrics =
-        SpanProcessorMetrics.get(InternalTelemetryVersion.LATEST, COMPONENT_ID, meterProvider);
+    spanProcessorInstrumentation =
+        SpanProcessorInstrumentation.get(
+            InternalTelemetryVersion.LATEST, COMPONENT_ID, meterProvider);
   }
 
   @Override
@@ -119,7 +120,7 @@ public void onEnd(ReadableSpan span) {
                   error = "export_failed";
                 }
               }
-              spanProcessorMetrics.finishSpans(1, error);
+              spanProcessorInstrumentation.finishSpans(1, error);
             });
       } catch (RuntimeException e) {
         logger.log(Level.WARNING, "Exporter threw an Exception", e);

…k/trace/export/SpanProcessorMetrics.java …export/SpanProcessorInstrumentation.javasdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SpanProcessorMetrics.java renamed to sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SpanProcessorInstrumentation.java sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SpanProcessorMetrics.java renamed to sdk/trace/src/main/java/io/opentelemetry/sdk/trace/export/SpanProcessorInstrumentation.java

@@ -12,17 +12,17 @@
 import javax.annotation.Nullable;
 
 /** Metrics exported by span processors. */
-interface SpanProcessorMetrics {
+interface SpanProcessorInstrumentation {
 
-  static SpanProcessorMetrics get(
+  static SpanProcessorInstrumentation get(
       InternalTelemetryVersion telemetryVersion,
       ComponentId componentId,
       Supplier<MeterProvider> meterProvider) {
     switch (telemetryVersion) {
       case LEGACY:
-        return new LegacySpanProcessorMetrics(meterProvider);
+        return new LegacySpanProcessorInstrumentation(meterProvider);
       default:
-        return new SemConvSpanProcessorMetrics(componentId, meterProvider);
+        return new SemConvSpanProcessorInstrumentation(componentId, meterProvider);
     }
   }