Remove duplicate binding data upon detecting capability

Azure · Sep 5, 2019 · f6aeef8 · f6aeef8
1 parent 6bc641f
commit f6aeef8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/WebJobs.Script/Rpc/LanguageWorkerChannel.cs b/src/WebJobs.Script/Rpc/LanguageWorkerChannel.cs
@@ -7,10 +7,10 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reactive.Concurrency;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
+using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.Azure.WebJobs.Script.Description;
 using Microsoft.Azure.WebJobs.Script.Diagnostics;
 using Microsoft.Azure.WebJobs.Script.Eventing;
@@ -311,6 +311,10 @@ internal void SendInvocationRequest(ScriptInvocationContext context)
  {
  if (pair.Value != null)
  {
+ if ((pair.Value is DefaultHttpRequest) && IsTriggerMetadataPopulatedByWorker())
+ {
+ continue;
+ }
  invocationRequest.TriggerMetadata.Add(pair.Key, pair.Value.ToRpc(_workerChannelLogger, _workerCapabilities));
  }
  }
@@ -429,5 +433,10 @@ public void Dispose()
  _disposing = true;
  Dispose(true);
  }
+
+ private bool IsTriggerMetadataPopulatedByWorker()
+ {
+ return !string.IsNullOrEmpty(_workerCapabilities.GetCapabilityState(LanguageWorkerConstants.RpcHttpTriggerMetadataRemoved));
+ }
  }
 }
diff --git a/src/WebJobs.Script/Rpc/LanguageWorkerConstants.cs b/src/WebJobs.Script/Rpc/LanguageWorkerConstants.cs
@@ -52,6 +52,7 @@ public static class LanguageWorkerConstants
  public const string RawHttpBodyBytes = "RawHttpBodyBytes";
  public const string TypedDataCollection = "TypedDataCollection";
  public const string RpcHttpBodyOnly = "RpcHttpBodyOnly";
+ public const string RpcHttpTriggerMetadataRemoved = "RpcHttpTriggerMetadataRemoved";
 
  // Thresholds
  public const int WorkerRestartErrorIntervalThresholdInMinutes = 30;