fix rebase

Author: zeitlinger

docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure.txt

@@ -1,2 +1,5 @@
 Comparing source compatibility of opentelemetry-spring-boot-autoconfigure-2.18.0-SNAPSHOT.jar against opentelemetry-spring-boot-autoconfigure-2.17.0.jar
-No changes.
+===  UNCHANGED CLASS: PUBLIC io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	---  REMOVED ANNOTATION: org.springframework.boot.context.properties.EnableConfigurationProperties
+		---  REMOVED ELEMENT: value=io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtlpExporterProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelResourceProperties,io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelSpringProperties (-)

smoke-tests-otel-starter/spring-smoke-testing/src/main/java/io/opentelemetry/spring/smoketest/SpringSmokeTestRunner.java

@@ -7,9 +7,9 @@
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.testing.InstrumentationTestRunner;
-import io.opentelemetry.instrumentation.testing.provider.TestBridgeLogRecordExporterComponentProvider;
-import io.opentelemetry.instrumentation.testing.provider.TestBridgeMetricExporterComponentProvider;
-import io.opentelemetry.instrumentation.testing.provider.TestBridgeSpanExporterComponentProvider;
+import io.opentelemetry.instrumentation.testing.provider.TestLogRecordExporterComponentProvider;
+import io.opentelemetry.instrumentation.testing.provider.TestMetricExporterComponentProvider;
+import io.opentelemetry.instrumentation.testing.provider.TestSpanExporterComponentProvider;
 import io.opentelemetry.sdk.logs.data.LogRecordData;
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.data.MetricData;
@@ -41,9 +41,9 @@ static void resetExporters() {
     testLogRecordExporter = InMemoryLogRecordExporter.create();
 
     // for declarative config
-    TestBridgeLogRecordExporterComponentProvider.setLogRecordExporter(testLogRecordExporter);
-    TestBridgeMetricExporterComponentProvider.setMetricExporter(testMetricExporter);
-    TestBridgeSpanExporterComponentProvider.setSpanExporter(testSpanExporter);
+    TestLogRecordExporterComponentProvider.setLogRecordExporter(testLogRecordExporter);
+    TestMetricExporterComponentProvider.setMetricExporter(testMetricExporter);
+    TestSpanExporterComponentProvider.setSpanExporter(testSpanExporter);
   }
 
   @Override