Skip to content
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

[wcf] Streamline the exposed public interface (breaking change) #1376

Merged
merged 6 commits into from
Oct 2, 2023
Merged

[wcf] Streamline the exposed public interface (breaking change) #1376

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed84e3f
Change the message inspectors to be internal-only
repl-chris Sep 27, 2023
da2a7f2
Update src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md
repl-chris Sep 27, 2023
97c6958
Fix missed namespace update
repl-chris Sep 27, 2023
76dff81
Merge branch 'StreamlinePublicInterface' of https://github.com/repl-c…
repl-chris Sep 27, 2023
5066936
Merge branch 'main' into StreamlinePublicInterface
Kielek Sep 28, 2023
046f9ba
Follow conventions in CHANGELOG
repl-chris Oct 2, 2023
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
6 changes: 0 additions & 6 deletions src/OpenTelemetry.Instrumentation.Wcf/.publicApi/net462/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,12 @@ const OpenTelemetry.Instrumentation.Wcf.WcfEnrichEventNames.AfterReceiveReply =
const OpenTelemetry.Instrumentation.Wcf.WcfEnrichEventNames.AfterReceiveRequest = "AfterReceiveRequest" -> string
const OpenTelemetry.Instrumentation.Wcf.WcfEnrichEventNames.BeforeSendReply = "BeforeSendReply" -> string
const OpenTelemetry.Instrumentation.Wcf.WcfEnrichEventNames.BeforeSendRequest = "BeforeSendRequest" -> string
OpenTelemetry.Instrumentation.Wcf.TelemetryClientMessageInspector
OpenTelemetry.Instrumentation.Wcf.TelemetryClientMessageInspector.AfterReceiveReply(ref System.ServiceModel.Channels.Message reply, object correlationState) -> void
OpenTelemetry.Instrumentation.Wcf.TelemetryClientMessageInspector.BeforeSendRequest(ref System.ServiceModel.Channels.Message request, System.ServiceModel.IClientChannel channel) -> object
OpenTelemetry.Instrumentation.Wcf.TelemetryContractBehaviorAttribute
OpenTelemetry.Instrumentation.Wcf.TelemetryContractBehaviorAttribute.AddBindingParameters(System.ServiceModel.Description.ContractDescription contractDescription, System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Channels.BindingParameterCollection bindingParameters) -> void
OpenTelemetry.Instrumentation.Wcf.TelemetryContractBehaviorAttribute.ApplyClientBehavior(System.ServiceModel.Description.ContractDescription contractDescription, System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Dispatcher.ClientRuntime clientRuntime) -> void
OpenTelemetry.Instrumentation.Wcf.TelemetryContractBehaviorAttribute.ApplyDispatchBehavior(System.ServiceModel.Description.ContractDescription contractDescription, System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Dispatcher.DispatchRuntime dispatchRuntime) -> void
OpenTelemetry.Instrumentation.Wcf.TelemetryContractBehaviorAttribute.TelemetryContractBehaviorAttribute() -> void
OpenTelemetry.Instrumentation.Wcf.TelemetryContractBehaviorAttribute.Validate(System.ServiceModel.Description.ContractDescription contractDescription, System.ServiceModel.Description.ServiceEndpoint endpoint) -> void
OpenTelemetry.Instrumentation.Wcf.TelemetryDispatchMessageInspector
OpenTelemetry.Instrumentation.Wcf.TelemetryDispatchMessageInspector.AfterReceiveRequest(ref System.ServiceModel.Channels.Message request, System.ServiceModel.IClientChannel channel, System.ServiceModel.InstanceContext instanceContext) -> object
OpenTelemetry.Instrumentation.Wcf.TelemetryDispatchMessageInspector.BeforeSendReply(ref System.ServiceModel.Channels.Message reply, object correlationState) -> void
OpenTelemetry.Instrumentation.Wcf.TelemetryEndpointBehavior
OpenTelemetry.Instrumentation.Wcf.TelemetryEndpointBehavior.AddBindingParameters(System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Channels.BindingParameterCollection bindingParameters) -> void
OpenTelemetry.Instrumentation.Wcf.TelemetryEndpointBehavior.ApplyClientBehavior(System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Dispatcher.ClientRuntime clientRuntime) -> void
Expand Down
3 changes: 0 additions & 3 deletions src/OpenTelemetry.Instrumentation.Wcf/.publicApi/netstandard2.0/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
const OpenTelemetry.Instrumentation.Wcf.WcfEnrichEventNames.AfterReceiveReply = "AfterReceiveReply" -> string
const OpenTelemetry.Instrumentation.Wcf.WcfEnrichEventNames.BeforeSendRequest = "BeforeSendRequest" -> string
OpenTelemetry.Instrumentation.Wcf.TelemetryClientMessageInspector
OpenTelemetry.Instrumentation.Wcf.TelemetryClientMessageInspector.AfterReceiveReply(ref System.ServiceModel.Channels.Message reply, object correlationState) -> void
OpenTelemetry.Instrumentation.Wcf.TelemetryClientMessageInspector.BeforeSendRequest(ref System.ServiceModel.Channels.Message request, System.ServiceModel.IClientChannel channel) -> object
OpenTelemetry.Instrumentation.Wcf.TelemetryContractBehaviorAttribute
OpenTelemetry.Instrumentation.Wcf.TelemetryContractBehaviorAttribute.AddBindingParameters(System.ServiceModel.Description.ContractDescription contractDescription, System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Channels.BindingParameterCollection bindingParameters) -> void
OpenTelemetry.Instrumentation.Wcf.TelemetryContractBehaviorAttribute.ApplyClientBehavior(System.ServiceModel.Description.ContractDescription contractDescription, System.ServiceModel.Description.ServiceEndpoint endpoint, System.ServiceModel.Dispatcher.ClientRuntime clientRuntime) -> void
Expand Down
3 changes: 3 additions & 0 deletions src/OpenTelemetry.Instrumentation.Wcf/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

* BREAKING: `TelemetryClientMessageInspector` and `TelemetryDispatchMessageInspector`
CodeBlanch marked this conversation as resolved.
Show resolved Hide resolved
changed from public to internal
([#1376](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1376))
* Update OpenTelemetry SDK version to `1.6.0`.
([#1344](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1344))
* Fixed span hierarchy when hosted in ASP.NET
Expand Down
5 changes: 2 additions & 3 deletions ...on.Wcf/TelemetryClientMessageInspector.cs → ...tation/TelemetryClientMessageInspector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,14 @@
using System.ServiceModel;
using System.ServiceModel.Channels;
using System.ServiceModel.Dispatcher;
using OpenTelemetry.Instrumentation.Wcf.Implementation;
using OpenTelemetry.Internal;

namespace OpenTelemetry.Instrumentation.Wcf;
namespace OpenTelemetry.Instrumentation.Wcf.Implementation;

/// <summary>
/// An <see cref="IClientMessageInspector"/> implementation which adds telemetry to outgoing requests.
/// </summary>
public class TelemetryClientMessageInspector : IClientMessageInspector
internal class TelemetryClientMessageInspector : IClientMessageInspector
{
private readonly IDictionary<string, ActionMetadata> actionMappings;

Expand Down
5 changes: 2 additions & 3 deletions ....Wcf/TelemetryDispatchMessageInspector.cs → ...tion/TelemetryDispatchMessageInspector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,15 @@
using System.ServiceModel.Channels;
using System.ServiceModel.Dispatcher;
using OpenTelemetry.Context.Propagation;
using OpenTelemetry.Instrumentation.Wcf.Implementation;
using OpenTelemetry.Internal;
using OpenTelemetry.Trace;

namespace OpenTelemetry.Instrumentation.Wcf;
namespace OpenTelemetry.Instrumentation.Wcf.Implementation;

/// <summary>
/// An <see cref="IDispatchMessageInspector"/> implementation which adds telemetry to incoming requests.
/// </summary>
public class TelemetryDispatchMessageInspector : IDispatchMessageInspector
internal class TelemetryDispatchMessageInspector : IDispatchMessageInspector
{
private readonly IDictionary<string, ActionMetadata> actionMappings;

Expand Down
1 change: 1 addition & 0 deletions src/OpenTelemetry.Instrumentation.Wcf/TelemetryContractBehaviorAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
using System.ServiceModel.Channels;
using System.ServiceModel.Description;
using System.ServiceModel.Dispatcher;
using OpenTelemetry.Instrumentation.Wcf.Implementation;
using OpenTelemetry.Internal;

namespace OpenTelemetry.Instrumentation.Wcf;
Expand Down
3 changes: 1 addition & 2 deletions src/OpenTelemetry.Instrumentation.Wcf/TelemetryServiceBehavior.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
namespace OpenTelemetry.Instrumentation.Wcf;

/// <summary>
/// An <see cref="IServiceBehavior"/> implementation to add the
/// <see cref="TelemetryDispatchMessageInspector"/> to service operations.
/// An <see cref="IServiceBehavior"/> implementation to add the telemetry to service operations.
/// </summary>
public class TelemetryServiceBehavior : IServiceBehavior
{
Expand Down
Loading