Minimize telemetry surface area (#2844)

src/WebJobs.Extensions.DurableTask/ContextImplementations/DurableEntityContext.cs

@@ -122,13 +122,12 @@ bool IDurableEntityContext.HasState
  public void CaptureInternalError(Exception e, TaskEntityShim shim)
  {
  // first, try to get a quick ETW message out to help us diagnose what happened
- string details = Utils.IsFatal(e) ? e.GetType().Name : e.ToString();
  this.Config.TraceHelper.EntityBatchFailed(
  this.HubName,
  this.Name,
  this.InstanceId,
  shim.TraceFlags,
- details);
+ e);
 
  // then, record the error for additional reporting and tracking in other places
  this.InternalError = ExceptionDispatchInfo.Capture(e);
@@ -180,22 +179,27 @@ public void ThrowApplicationExceptionsIfAny()
  }
  }
 
- public bool ErrorsPresent(out string description)
+ public bool ErrorsPresent(out string error, out string sanitizedError)
  {
  if (this.InternalError != null)
  {
- description = $"Internal error: {this.InternalError.SourceException}";
+ error = $"Internal error: {this.InternalError.SourceException}";
+ sanitizedError = $"Internal error: {this.InternalError.SourceException.GetType().FullName} \n {this.InternalError.SourceException.StackTrace}";
  return true;
  }
  else if (this.ApplicationErrors != null)
  {
  var messages = this.ApplicationErrors.Select(i => $"({i.SourceException.Message})");
- description = $"One or more operations failed: {string.Concat(messages)}";
+ error = $"One or more operations failed: {string.Concat(messages)}";
+
+ string errorTypes = string.Join(", ", this.ApplicationErrors.Select(i => i.SourceException.GetType().FullName));
+ sanitizedError = $"One or more operations failed: {errorTypes}";
  return true;
  }
  else
  {
- description = string.Empty;
+ error = string.Empty;
+ sanitizedError = string.Empty;
  return false;
  }
  }

src/WebJobs.Extensions.DurableTask/ContextImplementations/DurableOrchestrationContext.cs

@@ -781,7 +781,7 @@ internal async Task<TResult> CallDurableTaskFunctionAsync<TResult>(
  operationId,
  operationName,
  input: "(replayed)",
- exception: "(replayed)",
+ exception: exception,
  duration: 0,
  isReplay: true);
  }
@@ -791,7 +791,7 @@ internal async Task<TResult> CallDurableTaskFunctionAsync<TResult>(
  this.Config.Options.HubName,
  functionName,
  this.InstanceId,
- reason: $"(replayed {exception.GetType().Name})",
+ exception: exception,
  functionType: functionType,
  isReplay: true);
  }
@@ -933,7 +933,7 @@ internal void RaiseEvent(string name, string input)
  FunctionType.Orchestrator,
  this.InstanceId,
  name,
- this.Config.GetIntputOutputTrace(responseMessage.Result),
+ responseMessage.Result,
  this.IsReplaying);
  }
  else
@@ -943,7 +943,7 @@ internal void RaiseEvent(string name, string input)
  this.Name,
  this.InstanceId,
  name,
- this.Config.GetIntputOutputTrace(input),
+ input,
  this.IsReplaying);
  }
 

src/WebJobs.Extensions.DurableTask/ContextImplementations/RemoteOrchestratorContext.cs

@@ -64,18 +64,11 @@ internal OrchestratorExecutionResult GetResult()
  return this.executionResult ?? throw new InvalidOperationException($"The execution result has not yet been set using {nameof(this.SetResult)}.");
  }
 
- internal bool TryGetOrchestrationErrorDetails(out string details)
+ internal bool TryGetOrchestrationErrorDetails(out Exception? failure)
  {
- if (this.failure != null)
- {
- details = this.failure.Message;
- return true;
- }
- else
- {
- details = string.Empty;
- return false;
- }
+ bool hasError = this.failure != null;
+ failure = hasError ? this.failure : null;
+ return hasError;
  }
 
  internal void SetResult(IEnumerable<OrchestratorAction> actions, string customStatus)

src/WebJobs.Extensions.DurableTask/DurableTaskExtension.cs

@@ -155,7 +155,7 @@ public DurableTaskExtension(
 
  ILogger logger = loggerFactory.CreateLogger(LoggerCategoryName);
 
- this.TraceHelper = new EndToEndTraceHelper(logger, this.Options.Tracing.TraceReplayEvents);
+ this.TraceHelper = new EndToEndTraceHelper(logger, this.Options.Tracing.TraceReplayEvents, this.Options.Tracing.TraceInputsAndOutputs);
  this.LifeCycleNotificationHelper = lifeCycleNotificationHelper ?? this.CreateLifeCycleNotificationHelper();
  this.durabilityProviderFactory = GetDurabilityProviderFactory(this.Options, logger, orchestrationServiceFactories);
  this.defaultDurabilityProvider = this.durabilityProviderFactory.GetDurabilityProvider();
@@ -1038,7 +1038,7 @@ private async Task EntityMiddleware(DispatchMiddlewareContext dispatchContext, F
  entityContext.HubName,
  entityContext.Name,
  entityContext.InstanceId,
- this.GetIntputOutputTrace(runtimeState.Input),
+ runtimeState.Input,
  FunctionType.Entity,
  isReplay: false);
 
@@ -1064,13 +1064,14 @@ private async Task EntityMiddleware(DispatchMiddlewareContext dispatchContext, F
  await next();
 
  // 5. If there were internal or application errors, trace them for DF
- if (entityContext.ErrorsPresent(out var description))
+ if (entityContext.ErrorsPresent(out string description, out string sanitizedError))
  {
  this.TraceHelper.FunctionFailed(
  entityContext.HubName,
  entityContext.Name,
  entityContext.InstanceId,
  description,
+ sanitizedReason: sanitizedError,
  functionType: FunctionType.Entity,
  isReplay: false);
  }
@@ -1080,7 +1081,7 @@ private async Task EntityMiddleware(DispatchMiddlewareContext dispatchContext, F
  entityContext.HubName,
  entityContext.Name,
  entityContext.InstanceId,
- this.GetIntputOutputTrace(entityContext.State.EntityState),
+ entityContext.State.EntityState,
  continuedAsNew: true,
  functionType: FunctionType.Entity,
  isReplay: false);
@@ -1487,35 +1488,6 @@ bool HasActiveListeners(RegisteredFunctionInfo info)
  return false;
  }
 
- internal string GetIntputOutputTrace(string rawInputOutputData)
- {
- if (this.Options.Tracing.TraceInputsAndOutputs)
- {
- return rawInputOutputData;
- }
- else if (rawInputOutputData == null)
- {
- return "(null)";
- }
- else
- {
- // Azure Storage uses UTF-32 encoding for string payloads
- return "(" + Encoding.UTF32.GetByteCount(rawInputOutputData) + " bytes)";
- }
- }
-
- internal string GetExceptionTrace(string rawExceptionData)
- {
- if (rawExceptionData == null)
- {
- return "(null)";
- }
- else
- {
- return rawExceptionData;
- }
- }
-
  /// <inheritdoc/>
  Task<HttpResponseMessage> IAsyncConverter<HttpRequestMessage, HttpResponseMessage>.ConvertAsync(
  HttpRequestMessage request,