move important user-facing classes out of 'internal' package.

Author: breedx-splk

aws-resources/build.gradle.kts

@@ -8,8 +8,11 @@ description = "OpenTelemetry AWS Resources Support"
 otelJava.moduleName.set("io.opentelemetry.contrib.aws.resource")
 
 dependencies {
-  api("io.opentelemetry:opentelemetry-api")
+  compileOnly("com.google.auto.service:auto-service")
   compileOnly("io.opentelemetry:opentelemetry-api-incubator")
+
+  annotationProcessor("com.google.auto.service:auto-service")
+  api("io.opentelemetry:opentelemetry-api")
   api("io.opentelemetry:opentelemetry-sdk")
 
   implementation("io.opentelemetry.semconv:opentelemetry-semconv")

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/internal/AwsResourceDetector.java

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.contrib.aws.resource.internal;
 
+import com.google.auto.service.AutoService;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.contrib.aws.resource.BeanstalkResource;
 import io.opentelemetry.contrib.aws.resource.Ec2Resource;
@@ -15,6 +16,7 @@
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.resources.ResourceBuilder;
 
+@AutoService(ComponentProvider.class)
 public class AwsResourceDetector implements ComponentProvider<Resource> {
 
   @Override

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/OpampClient.java renamed to opamp-client/src/main/java/io/opentelemetry/opamp/client/OpampClient.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.opamp.client.internal;
+package io.opentelemetry.opamp.client;
 
 import io.opentelemetry.opamp.client.internal.response.MessageData;
 import java.io.Closeable;

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/OpampClientBuilder.java renamed to opamp-client/src/main/java/io/opentelemetry/opamp/client/OpampClientBuilder.java

@@ -3,15 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.opamp.client.internal;
+package io.opentelemetry.opamp.client;
 
 import com.github.f4b6a3.uuid.UuidCreator;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.opamp.client.internal.connectivity.http.OkHttpSender;
 import io.opentelemetry.opamp.client.internal.impl.OpampClientImpl;
 import io.opentelemetry.opamp.client.internal.impl.OpampClientState;
 import io.opentelemetry.opamp.client.internal.request.service.HttpRequestService;
-import io.opentelemetry.opamp.client.internal.request.service.RequestService;
+import io.opentelemetry.opamp.client.request.service.RequestService;
 import io.opentelemetry.opamp.client.internal.request.service.WebSocketRequestService;
 import io.opentelemetry.opamp.client.internal.state.State;
 import java.nio.ByteBuffer;

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImpl.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.opamp.client.internal.impl;
 
-import io.opentelemetry.opamp.client.internal.OpampClient;
+import io.opentelemetry.opamp.client.OpampClient;
 import io.opentelemetry.opamp.client.internal.impl.recipe.AgentToServerAppenders;
 import io.opentelemetry.opamp.client.internal.impl.recipe.RecipeManager;
 import io.opentelemetry.opamp.client.internal.impl.recipe.RequestRecipe;
@@ -19,7 +19,7 @@
 import io.opentelemetry.opamp.client.internal.impl.recipe.appenders.SequenceNumberAppender;
 import io.opentelemetry.opamp.client.internal.request.Field;
 import io.opentelemetry.opamp.client.internal.request.Request;
-import io.opentelemetry.opamp.client.internal.request.service.RequestService;
+import io.opentelemetry.opamp.client.request.service.RequestService;
 import io.opentelemetry.opamp.client.internal.response.MessageData;
 import io.opentelemetry.opamp.client.internal.response.OpampServerResponseException;
 import io.opentelemetry.opamp.client.internal.response.Response;

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestService.java

@@ -14,6 +14,7 @@
 import io.opentelemetry.opamp.client.internal.request.delay.RetryPeriodicDelay;
 import io.opentelemetry.opamp.client.internal.response.OpampServerResponseException;
 import io.opentelemetry.opamp.client.internal.response.Response;
+import io.opentelemetry.opamp.client.request.service.RequestService;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Objects;

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/request/service/WebSocketRequestService.java

@@ -13,6 +13,7 @@
 import io.opentelemetry.opamp.client.internal.request.delay.RetryPeriodicDelay;
 import io.opentelemetry.opamp.client.internal.response.OpampServerResponseException;
 import io.opentelemetry.opamp.client.internal.response.Response;
+import io.opentelemetry.opamp.client.request.service.RequestService;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.time.Duration;

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/response/MessageData.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.opamp.client.internal.response;
 
 import com.google.auto.value.AutoValue;
-import io.opentelemetry.opamp.client.internal.OpampClient;
+import io.opentelemetry.opamp.client.OpampClient;
 import javax.annotation.Nullable;
 import opamp.proto.AgentRemoteConfig;
 

opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/request/service/RequestService.java renamed to opamp-client/src/main/java/io/opentelemetry/opamp/client/request/service/RequestService.java

@@ -3,10 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.opamp.client.internal.request.service;
+package io.opentelemetry.opamp.client.request.service;
 
-import io.opentelemetry.opamp.client.internal.OpampClient;
+import io.opentelemetry.opamp.client.OpampClient;
 import io.opentelemetry.opamp.client.internal.request.Request;
+import io.opentelemetry.opamp.client.internal.request.service.HttpRequestService;
+import io.opentelemetry.opamp.client.internal.request.service.WebSocketRequestService;
 import io.opentelemetry.opamp.client.internal.response.Response;
 import java.util.function.Supplier;
 

opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImplTest.java

@@ -12,11 +12,11 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
-import io.opentelemetry.opamp.client.internal.OpampClient;
+import io.opentelemetry.opamp.client.OpampClient;
 import io.opentelemetry.opamp.client.internal.connectivity.http.OkHttpSender;
 import io.opentelemetry.opamp.client.internal.request.Request;
 import io.opentelemetry.opamp.client.internal.request.service.HttpRequestService;
-import io.opentelemetry.opamp.client.internal.request.service.RequestService;
+import io.opentelemetry.opamp.client.request.service.RequestService;
 import io.opentelemetry.opamp.client.internal.response.MessageData;
 import io.opentelemetry.opamp.client.internal.state.State;
 import java.io.IOException;