Skip to content

[OpAmp] Move important user-facing classes out of 'internal' package. #2249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 12, 2025
Merged

[OpAmp] Move important user-facing classes out of 'internal' package. #2249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b703560
move important user-facing classes out of 'internal' package.
breedx-splk Sep 11, 2025
37db48a
remove warning
breedx-splk Sep 11, 2025
b378ed0
revert accidental commit
breedx-splk Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ry/opamp/client/internal/OpampClient.java → ...entelemetry/opamp/client/OpampClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 3 additions & 8 deletions ...p/client/internal/OpampClientBuilder.java → ...etry/opamp/client/OpampClientBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
* 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.internal.request.service.WebSocketRequestService;
import io.opentelemetry.opamp.client.internal.state.State;
import io.opentelemetry.opamp.client.request.service.RequestService;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.HashMap;
Expand All @@ -28,12 +28,7 @@
import opamp.proto.KeyValue;
import opamp.proto.RemoteConfigStatus;

/**
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
* any time.
*
* <p>Builds an {@link OpampClient} instance.
*/
/** Builds an {@link OpampClient} instance. */
public final class OpampClientBuilder {
private final Map<String, AnyValue> identifyingAttributes = new HashMap<>();
private final Map<String, AnyValue> nonIdentifyingAttributes = new HashMap<>();
Expand Down
4 changes: 2 additions & 2 deletions opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -19,12 +19,12 @@
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.internal.response.MessageData;
import io.opentelemetry.opamp.client.internal.response.OpampServerResponseException;
import io.opentelemetry.opamp.client.internal.response.Response;
import io.opentelemetry.opamp.client.internal.state.ObservableState;
import io.opentelemetry.opamp.client.internal.state.State;
import io.opentelemetry.opamp.client.request.service.RequestService;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
Expand Down
1 change: 1 addition & 0 deletions .../main/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions .../java/io/opentelemetry/opamp/client/internal/request/service/WebSocketRequestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion opamp-client/src/main/java/io/opentelemetry/opamp/client/internal/response/MessageData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 4 additions & 2 deletions ...ernal/request/service/RequestService.java → ...lient/request/service/RequestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...client/src/test/java/io/opentelemetry/opamp/client/internal/impl/OpampClientImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
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.internal.response.MessageData;
import io.opentelemetry.opamp.client.internal.state.State;
import io.opentelemetry.opamp.client.request.service.RequestService;
import java.io.IOException;
import java.time.Duration;
import java.util.ArrayList;
Expand Down
1 change: 1 addition & 0 deletions ...t/java/io/opentelemetry/opamp/client/internal/request/service/HttpRequestServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import io.opentelemetry.opamp.client.internal.request.Request;
import io.opentelemetry.opamp.client.internal.request.delay.PeriodicDelay;
import io.opentelemetry.opamp.client.internal.response.Response;
import io.opentelemetry.opamp.client.request.service.RequestService;
import java.io.ByteArrayInputStream;
import java.time.Duration;
import java.util.ArrayList;
Expand Down
1 change: 1 addition & 0 deletions ...a/io/opentelemetry/opamp/client/internal/request/service/WebSocketRequestServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import io.opentelemetry.opamp.client.internal.request.Request;
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;
Expand Down
Loading