inspectIT#1269: Moved DynamicMultiSpanExporter

heiko-holz · Jan 13, 2022 · ffe5796 · ffe5796
1 parent 7f20156
commit ffe5796
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...re/exporter/DynamicMultiSpanExporter.java → ...entelemetry/DynamicMultiSpanExporter.java b/...re/exporter/DynamicMultiSpanExporter.java → ...entelemetry/DynamicMultiSpanExporter.java
@@ -1,4 +1,4 @@
-package rocks.inspectit.ocelot.core.exporter;
+package rocks.inspectit.ocelot.core.opentelemetry;
 
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.trace.SpanProcessor;

diff --git a/.../src/main/java/rocks/inspectit/ocelot/core/opentelemetry/OpenTelemetryControllerImpl.java b/.../src/main/java/rocks/inspectit/ocelot/core/opentelemetry/OpenTelemetryControllerImpl.java
@@ -37,7 +37,6 @@
 import rocks.inspectit.ocelot.config.model.InspectitConfig;
 import rocks.inspectit.ocelot.core.config.InspectitConfigChangedEvent;
 import rocks.inspectit.ocelot.core.config.InspectitEnvironment;
-import rocks.inspectit.ocelot.core.exporter.DynamicMultiSpanExporter;
 import rocks.inspectit.ocelot.core.exporter.DynamicallyActivatableMetricsExporterService;
 import rocks.inspectit.ocelot.core.exporter.DynamicallyActivatableTraceExporterService;
 import rocks.inspectit.ocelot.core.utils.OpenCensusShimUtils;
@@ -130,6 +129,8 @@ public class OpenTelemetryControllerImpl implements IOpenTelemetryController {
     /**
      * The {@link MeterProviderImpl} that wraps {@link SdkMeterProvider}
      */
+    @VisibleForTesting
+    @Getter(AccessLevel.PACKAGE)
     private MeterProviderImpl meterProvider;
 
     @Autowired
@@ -485,7 +486,7 @@ public boolean registerTraceExporterService(DynamicallyActivatableTraceExporterS
     private boolean unregisterTraceExporterService(String serviceName) {
         // unregister the service by removing it from the map of registered services and from the spanExporter
         // evaluates to true when a service with the  given name was previously registered
-        if (null != registeredTraceExportServices.remove(serviceName) & (spanExporter == null || !spanExporter.unregisterSpanExporter(serviceName))) {
+        if (null != registeredTraceExportServices.remove(serviceName) & (spanExporter == null || spanExporter.unregisterSpanExporter(serviceName))) {
             notifyTracingSettingsChanged();
             return true;
         } else {