Enable Data Contract Serialization for Remoting Exceptions (#629)

* Enable Data Contract Serialization for Remoting Exceptions * Make updates to the correct files * Add setting during initialization * Proposed change to not break secure remoting * Using TryLoadForm to get default settings * bug fix, add missing semicolon * Update src/Hosting.Services.Remoting/RemotingListenerBuilder.cs * Update src/Services.Remoting/Client/OmexServiceProxyFactory.cs --------- Co-authored-by: Keith Cully <[email protected]>
microsoft · Nov 9, 2023 · 27610b5 · 27610b5
1 parent 7c17193
commit 27610b5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/Hosting.Services.Remoting/RemotingListenerBuilder.cs b/src/Hosting.Services.Remoting/RemotingListenerBuilder.cs
@@ -29,6 +29,15 @@ protected RemotingListenerBuilder(
 			string name,
 			FabricTransportRemotingListenerSettings? settings = null)
 		{
+			if (settings == null)
+			{
+				if (!FabricTransportRemotingListenerSettings.TryLoadFrom("TransportSettings", out settings))
+				{
+					settings = new FabricTransportRemotingListenerSettings();
+				}
+			}
+
+			settings.ExceptionSerializationTechnique = FabricTransportRemotingListenerSettings.ExceptionSerialization.Default;
 			Name = name;
 			Settings = settings;
 		}

diff --git a/src/Services.Remoting/Client/OmexServiceProxyFactory.cs b/src/Services.Remoting/Client/OmexServiceProxyFactory.cs
@@ -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
@@ -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;
 			s_serviceProxyFactory = new ServiceProxyFactory(handler =>
 				new OmexServiceRemotingClientFactory(
 					new FabricTransportServiceRemotingClientFactory(