Skip to content

Commit 095a4db

Browse files
authored
[OpAmp] Move important user-facing classes out of 'internal' package. (open-telemetry#2249)
1 parent a7f075f commit 095a4db

File tree

10 files changed

+17
-16
lines changed

10 files changed

+17
-16
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.opamp.client.internal;
6+
package io.opentelemetry.opamp.client;
77

88
import io.opentelemetry.opamp.client.internal.response.MessageData;
99
import java.io.Closeable;
Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.opamp.client.internal;
6+
package io.opentelemetry.opamp.client;
77

88
import com.github.f4b6a3.uuid.UuidCreator;
99
import com.google.errorprone.annotations.CanIgnoreReturnValue;
1010
import io.opentelemetry.opamp.client.internal.connectivity.http.OkHttpSender;
1111
import io.opentelemetry.opamp.client.internal.impl.OpampClientImpl;
1212
import io.opentelemetry.opamp.client.internal.impl.OpampClientState;
1313
import io.opentelemetry.opamp.client.internal.request.service.HttpRequestService;
14-
import io.opentelemetry.opamp.client.internal.request.service.RequestService;
1514
import io.opentelemetry.opamp.client.internal.request.service.WebSocketRequestService;
1615
import io.opentelemetry.opamp.client.internal.state.State;
16+
import io.opentelemetry.opamp.client.request.service.RequestService;
1717
import java.nio.ByteBuffer;
1818
import java.util.ArrayList;
1919
import java.util.HashMap;
@@ -28,12 +28,7 @@
2828
import opamp.proto.KeyValue;
2929
import opamp.proto.RemoteConfigStatus;
3030

31-
/**
32-
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
33-
* any time.
34-
*
35-
* <p>Builds an {@link OpampClient} instance.
36-
*/
31+
/** Builds an {@link OpampClient} instance. */
3732
public final class OpampClientBuilder {
3833
private final Map<String, AnyValue> identifyingAttributes = new HashMap<>();
3934
private final Map<String, AnyValue> nonIdentifyingAttributes = new HashMap<>();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package io.opentelemetry.opamp.client.internal.impl;
77

8-
import io.opentelemetry.opamp.client.internal.OpampClient;
8+
import io.opentelemetry.opamp.client.OpampClient;
99
import io.opentelemetry.opamp.client.internal.impl.recipe.AgentToServerAppenders;
1010
import io.opentelemetry.opamp.client.internal.impl.recipe.RecipeManager;
1111
import io.opentelemetry.opamp.client.internal.impl.recipe.RequestRecipe;
@@ -19,12 +19,12 @@
1919
import io.opentelemetry.opamp.client.internal.impl.recipe.appenders.SequenceNumberAppender;
2020
import io.opentelemetry.opamp.client.internal.request.Field;
2121
import io.opentelemetry.opamp.client.internal.request.Request;
22-
import io.opentelemetry.opamp.client.internal.request.service.RequestService;
2322
import io.opentelemetry.opamp.client.internal.response.MessageData;
2423
import io.opentelemetry.opamp.client.internal.response.OpampServerResponseException;
2524
import io.opentelemetry.opamp.client.internal.response.Response;
2625
import io.opentelemetry.opamp.client.internal.state.ObservableState;
2726
import io.opentelemetry.opamp.client.internal.state.State;
27+
import io.opentelemetry.opamp.client.request.service.RequestService;
2828
import java.util.ArrayList;
2929
import java.util.Collections;
3030
import java.util.List;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import io.opentelemetry.opamp.client.internal.request.delay.RetryPeriodicDelay;
1515
import io.opentelemetry.opamp.client.internal.response.OpampServerResponseException;
1616
import io.opentelemetry.opamp.client.internal.response.Response;
17+
import io.opentelemetry.opamp.client.request.service.RequestService;
1718
import java.io.IOException;
1819
import java.time.Duration;
1920
import java.util.Objects;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import io.opentelemetry.opamp.client.internal.request.delay.RetryPeriodicDelay;
1414
import io.opentelemetry.opamp.client.internal.response.OpampServerResponseException;
1515
import io.opentelemetry.opamp.client.internal.response.Response;
16+
import io.opentelemetry.opamp.client.request.service.RequestService;
1617
import java.io.ByteArrayOutputStream;
1718
import java.io.IOException;
1819
import java.time.Duration;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package io.opentelemetry.opamp.client.internal.response;
77

88
import com.google.auto.value.AutoValue;
9-
import io.opentelemetry.opamp.client.internal.OpampClient;
9+
import io.opentelemetry.opamp.client.OpampClient;
1010
import javax.annotation.Nullable;
1111
import opamp.proto.AgentRemoteConfig;
1212

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.opamp.client.internal.request.service;
6+
package io.opentelemetry.opamp.client.request.service;
77

8-
import io.opentelemetry.opamp.client.internal.OpampClient;
8+
import io.opentelemetry.opamp.client.OpampClient;
99
import io.opentelemetry.opamp.client.internal.request.Request;
10+
import io.opentelemetry.opamp.client.internal.request.service.HttpRequestService;
11+
import io.opentelemetry.opamp.client.internal.request.service.WebSocketRequestService;
1012
import io.opentelemetry.opamp.client.internal.response.Response;
1113
import java.util.function.Supplier;
1214

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
import static org.mockito.Mockito.spy;
1313
import static org.mockito.Mockito.verify;
1414

15-
import io.opentelemetry.opamp.client.internal.OpampClient;
15+
import io.opentelemetry.opamp.client.OpampClient;
1616
import io.opentelemetry.opamp.client.internal.connectivity.http.OkHttpSender;
1717
import io.opentelemetry.opamp.client.internal.request.Request;
1818
import io.opentelemetry.opamp.client.internal.request.service.HttpRequestService;
19-
import io.opentelemetry.opamp.client.internal.request.service.RequestService;
2019
import io.opentelemetry.opamp.client.internal.response.MessageData;
2120
import io.opentelemetry.opamp.client.internal.state.State;
21+
import io.opentelemetry.opamp.client.request.service.RequestService;
2222
import java.io.IOException;
2323
import java.time.Duration;
2424
import java.util.ArrayList;

opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestServiceTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import io.opentelemetry.opamp.client.internal.request.Request;
2222
import io.opentelemetry.opamp.client.internal.request.delay.PeriodicDelay;
2323
import io.opentelemetry.opamp.client.internal.response.Response;
24+
import io.opentelemetry.opamp.client.request.service.RequestService;
2425
import java.io.ByteArrayInputStream;
2526
import java.time.Duration;
2627
import java.util.ArrayList;

opamp-client/src/test/java/io/opentelemetry/opamp/client/internal/request/service/WebSocketRequestServiceTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import io.opentelemetry.opamp.client.internal.request.Request;
2424
import io.opentelemetry.opamp.client.internal.response.OpampServerResponseException;
2525
import io.opentelemetry.opamp.client.internal.response.Response;
26+
import io.opentelemetry.opamp.client.request.service.RequestService;
2627
import java.io.ByteArrayOutputStream;
2728
import java.io.IOException;
2829
import java.time.Duration;

0 commit comments

Comments
 (0)