Renames WavefrontOtelSpanHandler to WavefrontOtelSpanExporter (#101)

Author: marcingrzejszczak

micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/src/main/java/io/micrometer/tracing/reporter/wavefront/WavefrontOtelSpanHandler.java renamed to micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/src/main/java/io/micrometer/tracing/reporter/wavefront/WavefrontOtelSpanExporter.java

@@ -15,29 +15,29 @@
  */
 package io.micrometer.tracing.reporter.wavefront;
 
-import java.util.Collection;
-
 import io.micrometer.tracing.TraceContext;
 import io.micrometer.tracing.otel.bridge.OtelFinishedSpan;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 
+import java.util.Collection;
+
 /**
  * A {@link SpanExporter} that sends spans to Wavefront.
  *
  * @author Marcin Grzejszczak
  * @since 1.0.0
  */
-public class WavefrontOtelSpanHandler implements SpanExporter {
+public class WavefrontOtelSpanExporter implements SpanExporter {
 
     private final WavefrontSpanHandler spanHandler;
 
     /**
-     * Creates a new instance of {@link WavefrontOtelSpanHandler}.
+     * Creates a new instance of {@link WavefrontOtelSpanExporter}.
      * @param spanHandler wavefront span handler
      */
-    public WavefrontOtelSpanHandler(WavefrontSpanHandler spanHandler) {
+    public WavefrontOtelSpanExporter(WavefrontSpanHandler spanHandler) {
         this.spanHandler = spanHandler;
     }
 

micrometer-tracing-tests/micrometer-tracing-integration-test/src/main/java/io/micrometer/tracing/test/reporter/wavefront/WavefrontOtelSetup.java

@@ -50,7 +50,7 @@
 import io.micrometer.tracing.otel.bridge.OtelPropagator;
 import io.micrometer.tracing.otel.bridge.OtelTracer;
 import io.micrometer.tracing.propagation.Propagator;
-import io.micrometer.tracing.reporter.wavefront.WavefrontOtelSpanHandler;
+import io.micrometer.tracing.reporter.wavefront.WavefrontOtelSpanExporter;
 import io.micrometer.tracing.reporter.wavefront.WavefrontSpanHandler;
 import io.micrometer.tracing.test.reporter.BuildingBlocks;
 import io.opentelemetry.api.trace.Tracer;
@@ -120,7 +120,7 @@ public static class Builder {
 
         private Function<MeterRegistry, WavefrontSpanHandler> wavefrontSpanHandler;
 
-        private Function<WavefrontOtelSpanHandler, SdkTracerProvider> sdkTracerProvider;
+        private Function<WavefrontOtelSpanExporter, SdkTracerProvider> sdkTracerProvider;
 
         private Function<SdkTracerProvider, OpenTelemetrySdk> openTelemetrySdk;
 
@@ -154,7 +154,7 @@ public Builder(String server, String token) {
         @SuppressWarnings("rawtypes")
         public static class OtelBuildingBlocks implements BuildingBlocks {
 
-            private final WavefrontOtelSpanHandler wavefrontOTelSpanHandler;
+            private final WavefrontOtelSpanExporter wavefrontOTelSpanExporter;
 
             private final OtelTracer otelTracer;
 
@@ -170,19 +170,19 @@ public static class OtelBuildingBlocks implements BuildingBlocks {
 
             /**
              * Creates a new instance of {@link OtelBuildingBlocks}.
-             * @param wavefrontOTelSpanHandler span handler
+             * @param wavefrontOTelSpanExporter span handler
              * @param otelTracer otel tracer
              * @param propagator otel propagator
              * @param httpServerHandler otel http server handler
              * @param httpClientHandler otel http client handler
              * @param customizers observation customizers
              * @param arrayListSpanProcessor array list span processor
              */
-            public OtelBuildingBlocks(WavefrontOtelSpanHandler wavefrontOTelSpanHandler, OtelTracer otelTracer,
+            public OtelBuildingBlocks(WavefrontOtelSpanExporter wavefrontOTelSpanExporter, OtelTracer otelTracer,
                     OtelPropagator propagator, HttpServerHandler httpServerHandler, HttpClientHandler httpClientHandler,
                     BiConsumer<BuildingBlocks, Deque<ObservationHandler<? extends Observation.Context>>> customizers,
                     ArrayListSpanProcessor arrayListSpanProcessor) {
-                this.wavefrontOTelSpanHandler = wavefrontOTelSpanHandler;
+                this.wavefrontOTelSpanExporter = wavefrontOTelSpanExporter;
                 this.otelTracer = otelTracer;
                 this.propagator = propagator;
                 this.httpServerHandler = httpServerHandler;
@@ -269,7 +269,7 @@ public Builder wavefrontSpanHandler(Function<MeterRegistry, WavefrontSpanHandler
          * @param sdkTracerProvider sdk tracer provider function
          * @return this for chaining
          */
-        public Builder sdkTracerProvider(Function<WavefrontOtelSpanHandler, SdkTracerProvider> sdkTracerProvider) {
+        public Builder sdkTracerProvider(Function<WavefrontOtelSpanExporter, SdkTracerProvider> sdkTracerProvider) {
             this.sdkTracerProvider = sdkTracerProvider;
             return this;
         }
@@ -364,11 +364,11 @@ public Builder closingFunction(Consumer<Builder.OtelBuildingBlocks> closingFunct
          */
         public WavefrontOtelSetup register(ObservationRegistry observationRegistry, MeterRegistry meterRegistry) {
             WavefrontSpanHandler wavefrontSpanHandler = wavefrontSpanHandlerOrMock(meterRegistry);
-            WavefrontOtelSpanHandler wavefrontOTelSpanHandler = wavefrontOtelSpanHandler(wavefrontSpanHandler);
+            WavefrontOtelSpanExporter wavefrontOTelSpanExporter = wavefrontOtelSpanHandler(wavefrontSpanHandler);
             ArrayListSpanProcessor arrayListSpanProcessor = new ArrayListSpanProcessor();
             SdkTracerProvider sdkTracerProvider = this.sdkTracerProvider != null
-                    ? this.sdkTracerProvider.apply(wavefrontOTelSpanHandler)
-                    : sdkTracerProvider(wavefrontOTelSpanHandler, arrayListSpanProcessor);
+                    ? this.sdkTracerProvider.apply(wavefrontOTelSpanExporter)
+                    : sdkTracerProvider(wavefrontOTelSpanExporter, arrayListSpanProcessor);
             OpenTelemetrySdk openTelemetrySdk = this.openTelemetrySdk != null
                     ? this.openTelemetrySdk.apply(sdkTracerProvider) : openTelemetrySdk(sdkTracerProvider);
             io.opentelemetry.api.trace.Tracer tracer = this.tracer != null ? this.tracer.apply(openTelemetrySdk)
@@ -381,7 +381,7 @@ public WavefrontOtelSetup register(ObservationRegistry observationRegistry, Mete
                     ? this.httpServerHandler.apply(openTelemetrySdk) : httpServerHandler(openTelemetrySdk);
             HttpClientHandler httpClientHandler = this.httpClientHandler != null
                     ? this.httpClientHandler.apply(openTelemetrySdk) : httpClientHandler(openTelemetrySdk);
-            OtelBuildingBlocks otelBuildingBlocks = new OtelBuildingBlocks(wavefrontOTelSpanHandler, otelTracer,
+            OtelBuildingBlocks otelBuildingBlocks = new OtelBuildingBlocks(wavefrontOTelSpanExporter, otelTracer,
                     new OtelPropagator(propagators(Collections.singletonList(B3Propagator.injectingMultiHeaders())),
                             tracer),
                     httpServerHandler, httpClientHandler, customizers, arrayListSpanProcessor);
@@ -414,11 +414,11 @@ private WavefrontSpanHandler wavefrontSpanHandler(MeterRegistry meterRegistry) {
                     new ApplicationTags.Builder(this.applicationName, this.serviceName).build(), new HashSet<>());
         }
 
-        private static WavefrontOtelSpanHandler wavefrontOtelSpanHandler(WavefrontSpanHandler handler) {
-            return new WavefrontOtelSpanHandler(handler);
+        private static WavefrontOtelSpanExporter wavefrontOtelSpanHandler(WavefrontSpanHandler handler) {
+            return new WavefrontOtelSpanExporter(handler);
         }
 
-        private static SdkTracerProvider sdkTracerProvider(WavefrontOtelSpanHandler spanHandler,
+        private static SdkTracerProvider sdkTracerProvider(WavefrontOtelSpanExporter spanHandler,
                 ArrayListSpanProcessor arrayListSpanProcessor) {
             return SdkTracerProvider.builder().setSampler(io.opentelemetry.sdk.trace.samplers.Sampler.alwaysOn())
                     .addSpanProcessor(arrayListSpanProcessor).addSpanProcessor(SimpleSpanProcessor.create(spanHandler))
@@ -452,7 +452,7 @@ private static HttpClientHandler httpClientHandler(OpenTelemetrySdk openTelemetr
 
         private static Consumer<OtelBuildingBlocks> closingFunction() {
             return deps -> {
-                WavefrontOtelSpanHandler reporter = deps.wavefrontOTelSpanHandler;
+                WavefrontOtelSpanExporter reporter = deps.wavefrontOTelSpanExporter;
                 reporter.flush();
                 reporter.close();
             };