Rename Metrics Plugin Packages (opensearch-project#344)

* Rename all Metrics Plugin packages from com.amazon to org.opensearch Signed-off-by: Kai Sternad <[email protected]>
kmssap · Sep 28, 2022 · e662d9c · e662d9c
1 parent c1ef1fb
commit e662d9c
Show file tree

Hide file tree

Showing 18 changed files with 77 additions and 88 deletions.
diff --git a/.../otelmetrics/OTelMetricsRawProcessor.java → .../otelmetrics/OTelMetricsRawProcessor.java b/.../otelmetrics/OTelMetricsRawProcessor.java → .../otelmetrics/OTelMetricsRawProcessor.java
@@ -3,8 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.plugins.processor.otelmetrics;
+package org.opensearch.dataprepper.plugins.processor.otelmetrics;
 
+import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
+import io.opentelemetry.proto.metrics.v1.InstrumentationLibraryMetrics;
+import io.opentelemetry.proto.metrics.v1.ResourceMetrics;
+import io.opentelemetry.proto.metrics.v1.ScopeMetrics;
 import com.amazon.dataprepper.model.annotations.DataPrepperPlugin;
 import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor;
 import com.amazon.dataprepper.model.configuration.PluginSetting;
@@ -18,10 +22,6 @@
 import com.amazon.dataprepper.model.processor.Processor;
 import com.amazon.dataprepper.model.record.Record;
 import com.amazon.dataprepper.plugins.otel.codec.OTelProtoCodec;
-import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
-import io.opentelemetry.proto.metrics.v1.InstrumentationLibraryMetrics;
-import io.opentelemetry.proto.metrics.v1.ResourceMetrics;
-import io.opentelemetry.proto.metrics.v1.ScopeMetrics;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...etrics/OtelMetricsRawProcessorConfig.java → ...etrics/OtelMetricsRawProcessorConfig.java b/...etrics/OtelMetricsRawProcessorConfig.java → ...etrics/OtelMetricsRawProcessorConfig.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.plugins.processor.otelmetrics;
+package org.opensearch.dataprepper.plugins.processor.otelmetrics;
 
 public class OtelMetricsRawProcessorConfig {
 

diff --git a/...etricsPluginExponentialHistogramTest.java → ...etricsPluginExponentialHistogramTest.java b/...etricsPluginExponentialHistogramTest.java → ...etricsPluginExponentialHistogramTest.java
@@ -3,13 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.plugins.processor.otelmetrics;
+package org.opensearch.dataprepper.plugins.processor.otelmetrics;
 
-import com.amazon.dataprepper.model.configuration.PluginSetting;
-import com.amazon.dataprepper.model.metric.Bucket;
-import com.amazon.dataprepper.model.metric.DefaultBucket;
-import com.amazon.dataprepper.model.metric.Metric;
-import com.amazon.dataprepper.model.record.Record;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
@@ -27,7 +22,11 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-
+import com.amazon.dataprepper.model.configuration.PluginSetting;
+import com.amazon.dataprepper.model.metric.Bucket;
+import com.amazon.dataprepper.model.metric.DefaultBucket;
+import com.amazon.dataprepper.model.metric.Metric;
+import com.amazon.dataprepper.model.record.Record;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

diff --git a/...r/otelmetrics/MetricsPluginGaugeTest.java → ...r/otelmetrics/MetricsPluginGaugeTest.java b/...r/otelmetrics/MetricsPluginGaugeTest.java → ...r/otelmetrics/MetricsPluginGaugeTest.java
@@ -3,11 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.plugins.processor.otelmetrics;
+package org.opensearch.dataprepper.plugins.processor.otelmetrics;
 
-import com.amazon.dataprepper.model.configuration.PluginSetting;
-import com.amazon.dataprepper.model.metric.Metric;
-import com.amazon.dataprepper.model.record.Record;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.protobuf.ByteString;
@@ -28,7 +25,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
-
+import com.amazon.dataprepper.model.configuration.PluginSetting;
+import com.amazon.dataprepper.model.metric.Metric;
+import com.amazon.dataprepper.model.record.Record;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;

diff --git a/...elmetrics/MetricsPluginHistogramTest.java → ...elmetrics/MetricsPluginHistogramTest.java b/...elmetrics/MetricsPluginHistogramTest.java → ...elmetrics/MetricsPluginHistogramTest.java
@@ -3,13 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.plugins.processor.otelmetrics;
+package org.opensearch.dataprepper.plugins.processor.otelmetrics;
 
-import com.amazon.dataprepper.model.configuration.PluginSetting;
-import com.amazon.dataprepper.model.metric.Bucket;
-import com.amazon.dataprepper.model.metric.DefaultBucket;
-import com.amazon.dataprepper.model.metric.Metric;
-import com.amazon.dataprepper.model.record.Record;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
@@ -25,7 +20,11 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-
+import com.amazon.dataprepper.model.configuration.PluginSetting;
+import com.amazon.dataprepper.model.metric.Bucket;
+import com.amazon.dataprepper.model.metric.DefaultBucket;
+import com.amazon.dataprepper.model.metric.Metric;
+import com.amazon.dataprepper.model.record.Record;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

diff --git a/...sor/otelmetrics/MetricsPluginSumTest.java → ...sor/otelmetrics/MetricsPluginSumTest.java b/...sor/otelmetrics/MetricsPluginSumTest.java → ...sor/otelmetrics/MetricsPluginSumTest.java
@@ -3,11 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.plugins.processor.otelmetrics;
+package org.opensearch.dataprepper.plugins.processor.otelmetrics;
 
-import com.amazon.dataprepper.model.configuration.PluginSetting;
-import com.amazon.dataprepper.model.event.Event;
-import com.amazon.dataprepper.model.record.Record;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
@@ -26,7 +23,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
-
+import com.amazon.dataprepper.model.configuration.PluginSetting;
+import com.amazon.dataprepper.model.event.Event;
+import com.amazon.dataprepper.model.record.Record;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

diff --git a/...otelmetrics/MetricsPluginSummaryTest.java → ...otelmetrics/MetricsPluginSummaryTest.java b/...otelmetrics/MetricsPluginSummaryTest.java → ...otelmetrics/MetricsPluginSummaryTest.java
@@ -3,11 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.plugins.processor.otelmetrics;
+package org.opensearch.dataprepper.plugins.processor.otelmetrics;
 
-import com.amazon.dataprepper.model.configuration.PluginSetting;
-import com.amazon.dataprepper.model.event.Event;
-import com.amazon.dataprepper.model.record.Record;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
@@ -23,7 +20,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
-
+import com.amazon.dataprepper.model.configuration.PluginSetting;
+import com.amazon.dataprepper.model.event.Event;
+import com.amazon.dataprepper.model.record.Record;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

diff --git a/...cs/OtelMetricsRawProcessorConfigTest.java → ...cs/OtelMetricsRawProcessorConfigTest.java b/...cs/OtelMetricsRawProcessorConfigTest.java → ...cs/OtelMetricsRawProcessorConfigTest.java
@@ -4,7 +4,7 @@
  */
 
 
-package com.amazon.dataprepper.plugins.processor.otelmetrics;
+package org.opensearch.dataprepper.plugins.processor.otelmetrics;
 
 import org.junit.jupiter.api.Test;
 

diff --git a/...per/plugins/health/HealthGrpcService.java → ...per/plugins/health/HealthGrpcService.java b/...per/plugins/health/HealthGrpcService.java → ...per/plugins/health/HealthGrpcService.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.plugins.health;
+package org.opensearch.dataprepper.plugins.health;
 
 import io.grpc.health.v1.HealthCheckRequest;
 import io.grpc.health.v1.HealthCheckResponse;

diff --git a/...e/otelmetrics/OTelMetricsGrpcService.java → ...e/otelmetrics/OTelMetricsGrpcService.java b/...e/otelmetrics/OTelMetricsGrpcService.java → ...e/otelmetrics/OTelMetricsGrpcService.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.plugins.source.otelmetrics;
+package org.opensearch.dataprepper.plugins.source.otelmetrics;
 
 import com.amazon.dataprepper.metrics.PluginMetrics;
 import com.amazon.dataprepper.model.buffer.Buffer;
@@ -15,7 +15,6 @@
 import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
 import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceResponse;
 import io.opentelemetry.proto.collector.metrics.v1.MetricsServiceGrpc;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...source/otelmetrics/OTelMetricsSource.java → ...source/otelmetrics/OTelMetricsSource.java b/...source/otelmetrics/OTelMetricsSource.java → ...source/otelmetrics/OTelMetricsSource.java
@@ -3,22 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.plugins.source.otelmetrics;
+package org.opensearch.dataprepper.plugins.source.otelmetrics;
 
-import org.opensearch.dataprepper.armeria.authentication.GrpcAuthenticationProvider;
-import com.amazon.dataprepper.metrics.PluginMetrics;
-import com.amazon.dataprepper.model.annotations.DataPrepperPlugin;
-import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor;
-import com.amazon.dataprepper.model.buffer.Buffer;
 import com.amazon.dataprepper.model.configuration.PluginModel;
-import com.amazon.dataprepper.model.configuration.PluginSetting;
-import com.amazon.dataprepper.model.plugin.PluginFactory;
-import com.amazon.dataprepper.model.record.Record;
-import com.amazon.dataprepper.model.source.Source;
-import org.opensearch.dataprepper.plugins.certificate.CertificateProvider;
-import org.opensearch.dataprepper.plugins.certificate.model.Certificate;
-import com.amazon.dataprepper.plugins.health.HealthGrpcService;
-import com.amazon.dataprepper.plugins.source.otelmetrics.certificate.CertificateProviderFactory;
 import com.linecorp.armeria.server.HttpService;
 import com.linecorp.armeria.server.Server;
 import com.linecorp.armeria.server.ServerBuilder;
@@ -29,7 +16,20 @@
 import io.grpc.ServerInterceptors;
 import io.grpc.protobuf.services.ProtoReflectionService;
 import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
+import org.opensearch.dataprepper.armeria.authentication.GrpcAuthenticationProvider;
+import com.amazon.dataprepper.metrics.PluginMetrics;
+import com.amazon.dataprepper.model.annotations.DataPrepperPlugin;
+import com.amazon.dataprepper.model.annotations.DataPrepperPluginConstructor;
+import com.amazon.dataprepper.model.buffer.Buffer;
 
+import com.amazon.dataprepper.model.configuration.PluginSetting;
+import com.amazon.dataprepper.model.plugin.PluginFactory;
+import com.amazon.dataprepper.model.source.Source;
+import com.amazon.dataprepper.model.record.Record;
+import org.opensearch.dataprepper.plugins.certificate.CertificateProvider;
+import org.opensearch.dataprepper.plugins.certificate.model.Certificate;
+import org.opensearch.dataprepper.plugins.health.HealthGrpcService;
+import org.opensearch.dataprepper.plugins.source.otelmetrics.certificate.CertificateProviderFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/.../otelmetrics/OTelMetricsSourceConfig.java → .../otelmetrics/OTelMetricsSourceConfig.java b/.../otelmetrics/OTelMetricsSourceConfig.java → .../otelmetrics/OTelMetricsSourceConfig.java
@@ -3,10 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.plugins.source.otelmetrics;
+package org.opensearch.dataprepper.plugins.source.otelmetrics;
 
 import com.amazon.dataprepper.model.configuration.PluginModel;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.StringUtils;
 

diff --git a/...rtificate/CertificateProviderFactory.java → ...rtificate/CertificateProviderFactory.java b/...rtificate/CertificateProviderFactory.java → ...rtificate/CertificateProviderFactory.java
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.plugins.source.otelmetrics.certificate;
+package org.opensearch.dataprepper.plugins.source.otelmetrics.certificate;
 
 import org.opensearch.dataprepper.plugins.certificate.CertificateProvider;
 import org.opensearch.dataprepper.plugins.certificate.acm.ACMCertificateProvider;
 import org.opensearch.dataprepper.plugins.certificate.file.FileCertificateProvider;
 import org.opensearch.dataprepper.plugins.certificate.s3.S3CertificateProvider;
-import com.amazon.dataprepper.plugins.source.otelmetrics.OTelMetricsSourceConfig;
+import org.opensearch.dataprepper.plugins.source.otelmetrics.OTelMetricsSourceConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;

diff --git a/...plugins/health/HealthGrpcServiceTest.java → ...plugins/health/HealthGrpcServiceTest.java b/...plugins/health/HealthGrpcServiceTest.java → ...plugins/health/HealthGrpcServiceTest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.plugins.health;
+package org.opensearch.dataprepper.plugins.health;
 
 import io.grpc.ManagedChannel;
 import io.grpc.Server;

diff --git a/...elmetrics/OTelMetricsGrpcServiceTest.java → ...elmetrics/OTelMetricsGrpcServiceTest.java b/...elmetrics/OTelMetricsGrpcServiceTest.java → ...elmetrics/OTelMetricsGrpcServiceTest.java
@@ -3,12 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.plugins.source.otelmetrics;
+package org.opensearch.dataprepper.plugins.source.otelmetrics;
 
-import com.amazon.dataprepper.metrics.PluginMetrics;
-import com.amazon.dataprepper.model.buffer.Buffer;
-import com.amazon.dataprepper.model.configuration.PluginSetting;
-import com.amazon.dataprepper.model.record.Record;
 import io.grpc.stub.StreamObserver;
 import io.micrometer.core.instrument.Counter;
 import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
@@ -23,7 +19,10 @@
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-
+import com.amazon.dataprepper.metrics.PluginMetrics;
+import com.amazon.dataprepper.model.buffer.Buffer;
+import com.amazon.dataprepper.model.configuration.PluginSetting;
+import com.amazon.dataprepper.model.record.Record;
 import java.util.Collections;
 import java.util.concurrent.TimeoutException;
 

diff --git a/...ce/otelmetrics/OTelMetricsSourceTest.java → ...ce/otelmetrics/OTelMetricsSourceTest.java b/...ce/otelmetrics/OTelMetricsSourceTest.java → ...ce/otelmetrics/OTelMetricsSourceTest.java
@@ -3,22 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.plugins.source.otelmetrics;
+package org.opensearch.dataprepper.plugins.source.otelmetrics;
 
-
-import org.opensearch.dataprepper.armeria.authentication.GrpcAuthenticationProvider;
 import com.amazon.dataprepper.metrics.PluginMetrics;
 import com.amazon.dataprepper.model.configuration.PluginModel;
 import com.amazon.dataprepper.model.configuration.PluginSetting;
 import com.amazon.dataprepper.model.plugin.PluginFactory;
 import com.amazon.dataprepper.model.record.Record;
-
-import org.opensearch.dataprepper.plugins.GrpcBasicAuthenticationProvider;
-import org.opensearch.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer;
-import org.opensearch.dataprepper.plugins.certificate.CertificateProvider;
-import org.opensearch.dataprepper.plugins.certificate.model.Certificate;
-import com.amazon.dataprepper.plugins.health.HealthGrpcService;
-import com.amazon.dataprepper.plugins.source.otelmetrics.certificate.CertificateProviderFactory;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.util.JsonFormat;
@@ -53,6 +44,13 @@
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.dataprepper.armeria.authentication.GrpcAuthenticationProvider;
+import org.opensearch.dataprepper.plugins.GrpcBasicAuthenticationProvider;
+import org.opensearch.dataprepper.plugins.buffer.blockingbuffer.BlockingBuffer;
+import org.opensearch.dataprepper.plugins.certificate.CertificateProvider;
+import org.opensearch.dataprepper.plugins.certificate.model.Certificate;
+import org.opensearch.dataprepper.plugins.health.HealthGrpcService;
+import org.opensearch.dataprepper.plugins.source.otelmetrics.certificate.CertificateProviderFactory;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -68,7 +66,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static com.amazon.dataprepper.plugins.source.otelmetrics.OTelMetricsSourceConfig.SSL;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
@@ -88,6 +85,7 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.opensearch.dataprepper.plugins.source.otelmetrics.OTelMetricsSourceConfig.SSL;
 
 @ExtendWith(MockitoExtension.class)
 public class OTelMetricsSourceTest {

diff --git a/...metrics/OtelMetricsSourceConfigTests.java → ...metrics/OtelMetricsSourceConfigTests.java b/...metrics/OtelMetricsSourceConfigTests.java → ...metrics/OtelMetricsSourceConfigTests.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.amazon.dataprepper.plugins.source.otelmetrics;
+package org.opensearch.dataprepper.plugins.source.otelmetrics;
 
 import com.amazon.dataprepper.model.configuration.PluginSetting;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -12,15 +12,15 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.amazon.dataprepper.plugins.source.otelmetrics.OTelMetricsSourceConfig.DEFAULT_MAX_CONNECTION_COUNT;
-import static com.amazon.dataprepper.plugins.source.otelmetrics.OTelMetricsSourceConfig.DEFAULT_PORT;
-import static com.amazon.dataprepper.plugins.source.otelmetrics.OTelMetricsSourceConfig.DEFAULT_REQUEST_TIMEOUT_MS;
-import static com.amazon.dataprepper.plugins.source.otelmetrics.OTelMetricsSourceConfig.DEFAULT_THREAD_COUNT;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opensearch.dataprepper.plugins.source.otelmetrics.OTelMetricsSourceConfig.DEFAULT_MAX_CONNECTION_COUNT;
+import static org.opensearch.dataprepper.plugins.source.otelmetrics.OTelMetricsSourceConfig.DEFAULT_PORT;
+import static org.opensearch.dataprepper.plugins.source.otelmetrics.OTelMetricsSourceConfig.DEFAULT_REQUEST_TIMEOUT_MS;
+import static org.opensearch.dataprepper.plugins.source.otelmetrics.OTelMetricsSourceConfig.DEFAULT_THREAD_COUNT;
 
 public class OtelMetricsSourceConfigTests {
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
      */
-    package com.amazon.dataprepper.plugins.processor.otelmetrics;
+    package org.opensearch.dataprepper.plugins.processor.otelmetrics;
     import org.junit.jupiter.api.Test;
@@ Expand Down @@