Fix imports

Signed-off-by: Tomas Longo <tlongo@sternad.de>

Author: TomasLongo

data-prepper-plugins/otel-trace-source/src/main/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceSource.java

@@ -25,7 +25,6 @@
 import org.opensearch.dataprepper.plugins.certificate.model.Certificate;
 import org.opensearch.dataprepper.plugins.codec.CompressionOption;
 import org.opensearch.dataprepper.plugins.source.oteltrace.certificate.CertificateProviderFactory;
-import org.opensearch.dataprepper.model.codec.ByteDecoder;
 import org.opensearch.dataprepper.plugins.otel.codec.OTelTraceDecoder;
 import org.opensearch.dataprepper.plugins.source.oteltrace.grpc.GrpcService;
 import org.opensearch.dataprepper.plugins.source.oteltrace.http.HttpService;

data-prepper-plugins/otel-trace-source/src/main/java/org/opensearch/dataprepper/plugins/source/oteltrace/grpc/GrpcService.java

@@ -14,11 +14,11 @@
 import org.opensearch.dataprepper.model.configuration.PluginSetting;
 import org.opensearch.dataprepper.model.plugin.PluginFactory;
 import org.opensearch.dataprepper.model.record.Record;
-import org.opensearch.dataprepper.plugins.health.HealthGrpcService;
-import org.opensearch.dataprepper.plugins.otel.codec.OTelProtoCodec;
+import org.opensearch.dataprepper.plugins.otel.codec.OTelProtoOpensearchCodec;
+import org.opensearch.dataprepper.plugins.server.HealthGrpcService;
+import org.opensearch.dataprepper.plugins.server.RetryInfoConfig;
 import org.opensearch.dataprepper.plugins.source.oteltrace.OTelTraceGrpcService;
 import org.opensearch.dataprepper.plugins.source.oteltrace.OTelTraceSourceConfig;
-import org.opensearch.dataprepper.plugins.source.oteltrace.RetryInfoConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -60,7 +60,7 @@ public com.linecorp.armeria.server.grpc.GrpcService create(Buffer<Record<Object>
 
         final OTelTraceGrpcService oTelTraceGrpcService = new OTelTraceGrpcService(
                 (int)(oTelTraceSourceConfig.getRequestTimeoutInMillis() * 0.8),
-                new OTelProtoCodec.OTelProtoDecoder(),
+                new OTelProtoOpensearchCodec.OTelProtoDecoder(),
                 buffer,
                 pluginMetrics
         );

data-prepper-plugins/otel-trace-source/src/main/java/org/opensearch/dataprepper/plugins/source/oteltrace/http/ArmeriaHttpService.java

@@ -14,6 +14,7 @@
 import org.opensearch.dataprepper.model.record.Record;
 import org.opensearch.dataprepper.model.trace.Span;
 import org.opensearch.dataprepper.plugins.otel.codec.OTelProtoCodec;
+import org.opensearch.dataprepper.plugins.otel.codec.OTelProtoOpensearchCodec;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -51,7 +52,7 @@ public class ArmeriaHttpService {
 
     public ArmeriaHttpService(Buffer<Record<Object>> buffer, final PluginMetrics pluginMetrics, final int bufferWriteTimeoutInMillis) {
         this.buffer = buffer;
-        this.oTelProtoDecoder = new OTelProtoCodec.OTelProtoDecoder();
+        this.oTelProtoDecoder = new OTelProtoOpensearchCodec.OTelProtoDecoder();
         this.bufferWriteTimeoutInMillis = bufferWriteTimeoutInMillis;
 
         requestsReceivedCounter = pluginMetrics.counter(REQUESTS_RECEIVED);

data-prepper-plugins/otel-trace-source/src/main/java/org/opensearch/dataprepper/plugins/source/oteltrace/http/HttpService.java

@@ -13,8 +13,8 @@
 import org.opensearch.dataprepper.model.plugin.PluginFactory;
 import org.opensearch.dataprepper.model.record.Record;
 import org.opensearch.dataprepper.plugins.codec.CompressionOption;
+import org.opensearch.dataprepper.plugins.server.RetryInfoConfig;
 import org.opensearch.dataprepper.plugins.source.oteltrace.OTelTraceSourceConfig;
-import org.opensearch.dataprepper.plugins.source.oteltrace.RetryInfoConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceSource_GrpcRequestTest.java

@@ -72,6 +72,7 @@
 import org.opensearch.dataprepper.plugins.certificate.CertificateProvider;
 import org.opensearch.dataprepper.plugins.certificate.model.Certificate;
 import org.opensearch.dataprepper.plugins.codec.CompressionOption;
+import org.opensearch.dataprepper.plugins.server.RetryInfoConfig;
 import org.opensearch.dataprepper.plugins.source.oteltrace.certificate.CertificateProviderFactory;
 
 import com.google.protobuf.ByteString;
@@ -111,6 +112,7 @@ class OTelTraceSource_GrpcRequestTest {
     private static final String TEST_PIPELINE_NAME = "test_pipeline";
     private static final RetryInfoConfig TEST_RETRY_INFO = new RetryInfoConfig(Duration.ofMillis(50), Duration.ofMillis(2000));
 
+
     @Mock
     private ServerBuilder serverBuilder;
 

data-prepper-plugins/otel-trace-source/src/test/java/org/opensearch/dataprepper/plugins/source/oteltrace/OTelTraceSource_UnframedRequestsTest.java

@@ -63,7 +63,8 @@
 import org.opensearch.dataprepper.plugins.certificate.CertificateProvider;
 import org.opensearch.dataprepper.plugins.certificate.model.Certificate;
 import org.opensearch.dataprepper.plugins.codec.CompressionOption;
-import org.opensearch.dataprepper.plugins.health.HealthGrpcService;
+import org.opensearch.dataprepper.plugins.server.HealthGrpcService;
+import org.opensearch.dataprepper.plugins.server.RetryInfoConfig;
 import org.opensearch.dataprepper.plugins.source.oteltrace.certificate.CertificateProviderFactory;
 
 import com.fasterxml.jackson.databind.ObjectMapper;