Skip to content

[OpAMP] Clean up internal directory and namespace #3612

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
Kielek merged 2 commits into from
Dec 12, 2025
Merged

[OpAMP] Clean up internal directory and namespace #3612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa134cf
Clean up internal directory and namespace
stevejgordon Dec 12, 2025
5349ca1
Update src/OpenTelemetry.OpAmp.Client/CHANGELOG.md
stevejgordon Dec 12, 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
12 changes: 6 additions & 6 deletions src/OpenTelemetry.OpAmp.Client/.publicApi/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
OpenTelemetry.OpAmp.Client.Internal.Listeners.IOpAmpListener<TMessage>
OpenTelemetry.OpAmp.Client.Internal.Listeners.IOpAmpListener<TMessage>.HandleMessage(TMessage! message) -> void
OpenTelemetry.OpAmp.Client.Internal.Listeners.OpAmpMessage
OpenTelemetry.OpAmp.Client.Internal.Listeners.OpAmpMessage.OpAmpMessage() -> void
OpenTelemetry.OpAmp.Client.Listeners.IOpAmpListener<TMessage>
OpenTelemetry.OpAmp.Client.Listeners.IOpAmpListener<TMessage>.HandleMessage(TMessage! message) -> void
OpenTelemetry.OpAmp.Client.Messages.OpAmpMessage
OpenTelemetry.OpAmp.Client.Messages.OpAmpMessage.OpAmpMessage() -> void
OpenTelemetry.OpAmp.Client.OpAmpClient
OpenTelemetry.OpAmp.Client.OpAmpClient.Dispose() -> void
OpenTelemetry.OpAmp.Client.OpAmpClient.OpAmpClient(System.Action<OpenTelemetry.OpAmp.Client.Settings.OpAmpClientSettings!>? configure = null) -> void
OpenTelemetry.OpAmp.Client.OpAmpClient.StartAsync(System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
OpenTelemetry.OpAmp.Client.OpAmpClient.StopAsync(System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task!
OpenTelemetry.OpAmp.Client.OpAmpClient.Subscribe<T>(OpenTelemetry.OpAmp.Client.Internal.Listeners.IOpAmpListener<T!>! listener) -> void
OpenTelemetry.OpAmp.Client.OpAmpClient.Unsubscribe<T>(OpenTelemetry.OpAmp.Client.Internal.Listeners.IOpAmpListener<T!>! listener) -> void
OpenTelemetry.OpAmp.Client.OpAmpClient.Subscribe<T>(OpenTelemetry.OpAmp.Client.Listeners.IOpAmpListener<T!>! listener) -> void
OpenTelemetry.OpAmp.Client.OpAmpClient.Unsubscribe<T>(OpenTelemetry.OpAmp.Client.Listeners.IOpAmpListener<T!>! listener) -> void
OpenTelemetry.OpAmp.Client.Settings.AnyValueUnion
OpenTelemetry.OpAmp.Client.Settings.AnyValueUnion.AnyValueUnion() -> void
OpenTelemetry.OpAmp.Client.Settings.AnyValueUnion.BoolValue.get -> bool?
Expand Down
2 changes: 2 additions & 0 deletions src/OpenTelemetry.OpAmp.Client/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
([#3589](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3589))
* Add support for subscribing and unsubscribing to messages from the OpAMP server.
([#3593](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3593))
* Clean up directories and namespaces for public API.
([#3612](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3612))

## 0.1.0-alpha.3

Expand Down
3 changes: 2 additions & 1 deletion src/OpenTelemetry.OpAmp.Client/Internal/FrameProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
using System.Collections.Concurrent;
using OpAmp.Proto.V1;
using OpenTelemetry.Internal;
using OpenTelemetry.OpAmp.Client.Internal.Listeners;
using OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;
using OpenTelemetry.OpAmp.Client.Internal.Utils;
using OpenTelemetry.OpAmp.Client.Listeners;
using OpenTelemetry.OpAmp.Client.Messages;

namespace OpenTelemetry.OpAmp.Client.Internal;

Expand Down
1 change: 1 addition & 0 deletions ...rs/Messages/AgentIdentificationMessage.cs → ...al/Messages/AgentIdentificationMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

using OpAmp.Proto.V1;
using OpenTelemetry.OpAmp.Client.Messages;

namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;

Expand Down
1 change: 1 addition & 0 deletions ...Listeners/Messages/CapabilitiesMessage.cs → .../Internal/Messages/CapabilitiesMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

using OpAmp.Proto.V1;
using OpenTelemetry.OpAmp.Client.Messages;

namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;

Expand Down
1 change: 1 addition & 0 deletions ...rnal/Listeners/Messages/CommandMessage.cs → ...lient/Internal/Messages/CommandMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

using OpAmp.Proto.V1;
using OpenTelemetry.OpAmp.Client.Messages;

namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;

Expand Down
1 change: 1 addition & 0 deletions ...ers/Messages/ConnectionSettingsMessage.cs → ...nal/Messages/ConnectionSettingsMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

using OpAmp.Proto.V1;
using OpenTelemetry.OpAmp.Client.Messages;

namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;

Expand Down
1 change: 1 addition & 0 deletions ...ers/Messages/CustomCapabilitiesMessage.cs → ...nal/Messages/CustomCapabilitiesMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

using OpAmp.Proto.V1;
using OpenTelemetry.OpAmp.Client.Messages;

namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;

Expand Down
1 change: 1 addition & 0 deletions ...isteners/Messages/CustomMessageMessage.cs → ...Internal/Messages/CustomMessageMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

using OpAmp.Proto.V1;
using OpenTelemetry.OpAmp.Client.Messages;

namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;

Expand Down
1 change: 1 addition & 0 deletions ...isteners/Messages/ErrorResponseMessage.cs → ...Internal/Messages/ErrorResponseMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

using OpAmp.Proto.V1;
using OpenTelemetry.OpAmp.Client.Messages;

namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;

Expand Down
1 change: 1 addition & 0 deletions ...ternal/Listeners/Messages/FlagsMessage.cs → ....Client/Internal/Messages/FlagsMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

using OpAmp.Proto.V1;
using OpenTelemetry.OpAmp.Client.Messages;

namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;

Expand Down
1 change: 1 addition & 0 deletions ...ners/Messages/PackagesAvailableMessage.cs → ...rnal/Messages/PackagesAvailableMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

using OpAmp.Proto.V1;
using OpenTelemetry.OpAmp.Client.Messages;

namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;

Expand Down
1 change: 1 addition & 0 deletions ...Listeners/Messages/RemoteConfigMessage.cs → .../Internal/Messages/RemoteConfigMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

using OpAmp.Proto.V1;
using OpenTelemetry.OpAmp.Client.Messages;

namespace OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;

Expand Down
2 changes: 1 addition & 1 deletion src/OpenTelemetry.OpAmp.Client/Internal/Services/Heartbeat/HeartbeatService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

using OpenTelemetry.OpAmp.Client.Internal.Listeners;
using OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;
using OpenTelemetry.OpAmp.Client.Listeners;
using OpenTelemetry.OpAmp.Client.Settings;

namespace OpenTelemetry.OpAmp.Client.Internal.Services.Heartbeat;
Expand Down
4 changes: 3 additions & 1 deletion ...ient/Internal/Listeners/IOpAmpListener.cs → ....OpAmp.Client/Listeners/IOpAmpListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

namespace OpenTelemetry.OpAmp.Client.Internal.Listeners;
using OpenTelemetry.OpAmp.Client.Messages;

namespace OpenTelemetry.OpAmp.Client.Listeners;

/// <summary>
/// A listener capable of handling OpAMP messages of a specific type.
Expand Down
2 changes: 1 addition & 1 deletion ...Client/Internal/Listeners/OpAmpMessage.cs → ...try.OpAmp.Client/Messages/OpAmpMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

namespace OpenTelemetry.OpAmp.Client.Internal.Listeners;
namespace OpenTelemetry.OpAmp.Client.Messages;

/// <summary>
/// Base type for OpAMP messages.
Expand Down
3 changes: 2 additions & 1 deletion src/OpenTelemetry.OpAmp.Client/OpAmpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@

using OpenTelemetry.Internal;
using OpenTelemetry.OpAmp.Client.Internal;
using OpenTelemetry.OpAmp.Client.Internal.Listeners;
using OpenTelemetry.OpAmp.Client.Internal.Services;
using OpenTelemetry.OpAmp.Client.Internal.Services.Heartbeat;
using OpenTelemetry.OpAmp.Client.Internal.Transport;
using OpenTelemetry.OpAmp.Client.Internal.Transport.Http;
using OpenTelemetry.OpAmp.Client.Internal.Transport.WebSocket;
using OpenTelemetry.OpAmp.Client.Listeners;
using OpenTelemetry.OpAmp.Client.Messages;
using OpenTelemetry.OpAmp.Client.Settings;

namespace OpenTelemetry.OpAmp.Client;
Expand Down
2 changes: 1 addition & 1 deletion test/OpenTelemetry.OpAmp.Client.Tests/Mocks/MockListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// SPDX-License-Identifier: Apache-2.0

using System.Collections.Concurrent;
using OpenTelemetry.OpAmp.Client.Internal.Listeners;
using OpenTelemetry.OpAmp.Client.Internal.Listeners.Messages;
using OpenTelemetry.OpAmp.Client.Listeners;

namespace OpenTelemetry.OpAmp.Client.Tests.Mocks;

Expand Down