Skip to content

Commit

Permalink
apply feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidmrdavid
davidmrdavid committed Jun 17, 2024
1 parent f31cad9 commit 43f63fc
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 53 deletions.
29 changes: 0 additions & 29 deletions src/WebJobs.Extensions.DurableTask/DurableTaskExtension.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1487,35 +1487,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,
Expand Down
46 changes: 23 additions & 23 deletions src/WebJobs.Extensions.DurableTask/EndToEndTraceHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,23 +59,23 @@ public static string LocalSlotName

#pragma warning disable SA1117 // Parameters should be on same line or separate lines

private string SanitizeString(string? rawPayload, out string iloggerPayload, bool isReplay = false)
private void SanitizeString(string? rawPayload, out string iloggerString, out string durableKustoTableString, bool isReplay = false)
{
if (isReplay)
{
iloggerPayload = rawPayload ?? "(replay)";
return "(replay)";
iloggerString = rawPayload ?? "(replay)";
durableKustoTableString = "(replay)";
}

string payload = rawPayload ?? "(null)";
int numCharacters = payload.Length;
string sanitizedPayload = $"(Redacted {numCharacters} characters)";

iloggerPayload = this.shouldTraceRawData ? payload : sanitizedPayload;
return sanitizedPayload;
iloggerString = this.shouldTraceRawData ? payload : sanitizedPayload;
durableKustoTableString = sanitizedPayload;
}

private string SanitizeException(Exception? exception, out string iloggerExceptionString, bool isReplay = false)
private void SanitizeException(Exception? exception, out string iloggerExceptionString, out string durableKustoTableString, bool isReplay = false)
{
string exceptionString = exception != null ? exception.ToString() : string.Empty;
if (exception is OrchestrationFailureException orchestrationFailureException)
Expand All @@ -88,10 +88,10 @@ private string SanitizeException(Exception? exception, out string iloggerExcepti

if (isReplay)
{
return "(replay)";
durableKustoTableString = "(replay)";
}

return sanitizedString;
durableKustoTableString = sanitizedString;
}

public void ExtensionInformationalEvent(
Expand Down Expand Up @@ -171,7 +171,7 @@ public void FunctionStarting(
bool isReplay,
int taskEventId = -1)
{
string sanitizedInput = this.SanitizeString(input, out string loggerInput, isReplay: isReplay);
this.SanitizeString(input, out string loggerInput, out string sanitizedInput, isReplay: isReplay);

if (this.ShouldLogEvent(isReplay))
{
Expand Down Expand Up @@ -259,7 +259,7 @@ public void FunctionCompleted(
bool isReplay,
int taskEventId = -1)
{
string sanitizedOutput = this.SanitizeString(output, out string loggerOutput, isReplay: isReplay);
this.SanitizeString(output, out string loggerOutput, out string sanitizedOutput, isReplay: isReplay);

if (this.ShouldLogEvent(isReplay))
{
Expand Down Expand Up @@ -289,7 +289,7 @@ public void FunctionTerminated(
string instanceId,
string reason)
{
string sanitizedReason = this.SanitizeString(reason, out string loggerReason);
this.SanitizeString(reason, out string loggerReason, out string sanitizedReason);

FunctionType functionType = FunctionType.Orchestrator;

Expand All @@ -316,7 +316,7 @@ public void SuspendingOrchestration(
string instanceId,
string reason)
{
string sanitizedReason = this.SanitizeString(reason, out string loggerReason);
this.SanitizeString(reason, out string loggerReason, out string sanitizedReason);

FunctionType functionType = FunctionType.Orchestrator;

Expand All @@ -343,7 +343,7 @@ public void ResumingOrchestration(
string instanceId,
string reason)
{
string sanitizedReason = this.SanitizeString(reason, out string loggerReason);
this.SanitizeString(reason, out string loggerReason, out string sanitizedReason);

FunctionType functionType = FunctionType.Orchestrator;

Expand All @@ -370,7 +370,7 @@ public void FunctionRewound(
string instanceId,
string reason)
{
string sanitizedReason = this.SanitizeString(reason, out string loggerReason);
this.SanitizeString(reason, out string loggerReason, out string sanitizedReason);

FunctionType functionType = FunctionType.Orchestrator;

Expand Down Expand Up @@ -400,7 +400,7 @@ public void FunctionFailed(
bool isReplay,
int taskEventId = -1)
{
string sanitizedReason = this.SanitizeException(exception, out string loggerReason, isReplay);
this.SanitizeException(exception, out string loggerReason, out string sanitizedReason, isReplay);
this.FunctionFailed(hubName, functionName, instanceId, loggerReason, sanitizedReason, functionType, isReplay, taskEventId);
}

Expand Down Expand Up @@ -470,8 +470,8 @@ public void OperationCompleted(
double duration,
bool isReplay)
{
string sanitizedInput = this.SanitizeString(input, out string loggerInput);
string sanitizedOutput = this.SanitizeString(output, out string loggerOutput);
this.SanitizeString(input, out string loggerInput, out string sanitizedInput);
this.SanitizeString(output, out string loggerOutput, out string sanitizedOutput);

if (this.ShouldLogEvent(isReplay))
{
Expand Down Expand Up @@ -508,8 +508,8 @@ public void OperationFailed(
double duration,
bool isReplay)
{
string sanitizedInput = this.SanitizeString(input, out string loggerInput);
string sanitizedException = this.SanitizeException(exception, out string loggerException, isReplay);
this.SanitizeString(input, out string loggerInput, out string sanitizedInput);
this.SanitizeException(exception, out string loggerException, out string sanitizedException, isReplay);
this.OperationFailed(hubName, functionName, instanceId, operationId, operationName, sanitizedInput, loggerInput, sanitizedException, loggerException, duration, isReplay);
}

Expand All @@ -524,8 +524,8 @@ public void OperationFailed(
double duration,
bool isReplay)
{
string sanitizedInput = this.SanitizeString(input, out string loggerInput);
string sanitizedException = this.SanitizeString(exception, out string loggerException);
this.SanitizeString(input, out string loggerInput, out string sanitizedInput);
this.SanitizeString(exception, out string loggerException, out string sanitizedException);
this.OperationFailed(hubName, functionName, instanceId, operationId, operationName, sanitizedInput, loggerInput, sanitizedException, loggerException, duration, isReplay);
}

Expand Down Expand Up @@ -574,7 +574,7 @@ public void ExternalEventRaised(
string input,
bool isReplay)
{
string sanitizedInput = this.SanitizeString(input, out string _);
this.SanitizeString(input, out string _, out string sanitizedInput);

if (this.ShouldLogEvent(isReplay))
{
Expand Down Expand Up @@ -693,7 +693,7 @@ public void EntityResponseReceived(
string result,
bool isReplay)
{
string sanitizedResult = this.SanitizeString(result, out string _);
this.SanitizeString(result, out string _, out string sanitizedResult);

if (this.ShouldLogEvent(isReplay))
{
Expand Down
2 changes: 1 addition & 1 deletion src/WebJobs.Extensions.DurableTask/Listener/TaskEntityShim.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ private async Task ProcessOperationRequestAsync(RequestMessage request)
this.context.InstanceId,
request.Id.ToString(),
request.Operation,
this.Config.GetIntputOutputTrace(this.context.RawInput),
this.context.RawInput,
exception,
stopwatch.Elapsed.TotalMilliseconds,
isReplay: false);
Expand Down

0 comments on commit 43f63fc

Please sign in to comment.