Skip to content

Commit

Permalink
[wcf] Streamline the exposed public interface (breaking change) (#1376)
Browse files Browse the repository at this point in the history
Co-authored-by: Piotr Kiełkowicz <[email protected]>
  • Loading branch information
repl-chris and Kielek authored Oct 2, 2023
1 parent 8c2ae31 commit 4c5d646
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 17 deletions.
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
([#1344](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1344))
* Fixed span hierarchy when hosted in ASP.NET
([#1342](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1342))
* **Breaking Change** `TelemetryClientMessageInspector` and `TelemetryDispatchMessageInspector`
changed from public to internal
([#1376](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1376))

## 1.0.0-rc.12

Expand Down
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
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
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
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

0 comments on commit 4c5d646

Please sign in to comment.