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

Jump to bottom

Enable Data Contract Serialization for Remoting Exceptions #629

Merged
merged 9 commits into from
Nov 9, 2023
Merged

Enable Data Contract Serialization for Remoting Exceptions #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c47dba0
Enable Data Contract Serialization for Remoting Exceptions
Pr1ynka Nov 3, 2023
76b031a
Merge branch 'main' into fix/enableDataContractSerialization
Pr1ynka Nov 6, 2023
634555f
Make updates to the correct files
Pr1ynka Nov 7, 2023
ed488a8
Add setting during initialization
Pr1ynka Nov 8, 2023
6480f71
Proposed change to not break secure remoting
Pr1ynka Nov 8, 2023
63fd063
Using TryLoadForm to get default settings
Pr1ynka Nov 8, 2023
f7c595c
bug fix, add missing semicolon
Pr1ynka Nov 8, 2023
eb67d40
Update src/Hosting.Services.Remoting/RemotingListenerBuilder.cs
K-Cully Nov 9, 2023
6e641f6
Update src/Services.Remoting/Client/OmexServiceProxyFactory.cs
K-Cully Nov 9, 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
9 changes: 9 additions & 0 deletions src/Hosting.Services.Remoting/RemotingListenerBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@ protected RemotingListenerBuilder(
string name,
FabricTransportRemotingListenerSettings? settings = null)
{
if (settings == null)
Pr1ynka marked this conversation as resolved.
Show resolved Hide resolved
{
if (!FabricTransportRemotingListenerSettings.TryLoadFrom("TransportSettings", out settings))
{
settings = new FabricTransportRemotingListenerSettings();
}
}

settings.ExceptionSerializationTechnique = FabricTransportRemotingListenerSettings.ExceptionSerialization.Default;
Name = name;
Settings = settings;
}
Expand Down
16 changes: 14 additions & 2 deletions src/Services.Remoting/Client/OmexServiceProxyFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using Microsoft.ServiceFabric.Services.Remoting.Client;
using Microsoft.ServiceFabric.Services.Remoting.FabricTransport;
using Microsoft.ServiceFabric.Services.Remoting.FabricTransport.Runtime;
using Microsoft.ServiceFabric.Services.Remoting.V2.FabricTransport.Client;

namespace Microsoft.Omex.Extensions.Services.Remoting.Client
Expand All @@ -20,16 +21,27 @@ namespace Microsoft.Omex.Extensions.Services.Remoting.Client
public static class OmexServiceProxyFactory
{
private static ServiceProxyFactory s_serviceProxyFactory = new(handler =>
new OmexServiceRemotingClientFactory(
{
FabricTransportRemotingSettings remotingSettings;
if (!FabricTransportRemotingSettings.TryLoadFrom("TransportSettings", out remotingSettings))
{
remotingSettings = new FabricTransportRemotingSettings();
}

remotingSettings.ExceptionDeserializationTechnique = FabricTransportRemotingSettings.ExceptionDeserialization.Default;
return new OmexServiceRemotingClientFactory(
new FabricTransportServiceRemotingClientFactory(
remotingCallbackMessageHandler: handler)));
remotingCallbackMessageHandler: handler,
remotingSettings: remotingSettings));
});

/// <summary>
/// Binds custom transport settings to the service proxy factory.
/// If non-default secure remoting configuration is required, call this before calling OmexServiceProxyFactory.Instance.
/// </summary>
public static void WithCustomTransportSettings(FabricTransportRemotingSettings transportSettings)
{
transportSettings.ExceptionDeserializationTechnique = FabricTransportRemotingSettings.ExceptionDeserialization.Default;
Pr1ynka marked this conversation as resolved.
Show resolved Hide resolved
s_serviceProxyFactory = new ServiceProxyFactory(handler =>
new OmexServiceRemotingClientFactory(
new FabricTransportServiceRemotingClientFactory(
Expand Down