Skip to content

Commit 88b610c

Browse files
authored
Remove quotes around fields in KubernetesEventGenerator (#9475)
* Remove quotes around columns * Change NormalizeString signature * Remove trailing whitespace
1 parent 0cf8bb0 commit 88b610c

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/WebJobs.Script.WebHost/Diagnostics/KubernetesEventGenerator.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ public override void LogFunctionTraceEvent(LogLevel level, string subscriptionId
3333
traceLog.Add("FunctionName", functionName);
3434
traceLog.Add("EventName", eventName);
3535
traceLog.Add("Source", source);
36-
traceLog.Add("Details", NormalizeString(details));
37-
traceLog.Add("Summary", NormalizeString(summary));
36+
traceLog.Add("Details", NormalizeString(details, addEnclosingQuotes: false));
37+
traceLog.Add("Summary", NormalizeString(summary, addEnclosingQuotes: false));
3838
traceLog.Add("HostVersion", ScriptHost.Version);
3939
traceLog.Add("EventTimeStamp", eventTimestamp.ToString(EventTimestampFormat));
4040
traceLog.Add("ExceptionType", exceptionType);
41-
traceLog.Add("ExceptionMessage", NormalizeString(exceptionMessage));
41+
traceLog.Add("ExceptionMessage", NormalizeString(exceptionMessage, addEnclosingQuotes: false));
4242
traceLog.Add("FunctionInvocationId", functionInvocationId);
4343
traceLog.Add("HostInstanceId", hostInstanceId);
4444
traceLog.Add("ActivityId", activityId);

src/WebJobs.Script.WebHost/Diagnostics/LinuxEventGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public abstract class LinuxEventGenerator : IEventGenerator
1717
public static readonly string FunctionsDetailsCategory = "functionsdetails";
1818
public static readonly string FunctionsExecutionEventsCategory = "functionexecutionevents";
1919

20-
internal static string NormalizeString(string value)
20+
internal static string NormalizeString(string value, bool addEnclosingQuotes = true)
2121
{
2222
// Need to remove newlines for csv output
2323
value = value.Replace(Environment.NewLine, " ");
@@ -34,7 +34,7 @@ internal static string NormalizeString(string value)
3434
// our delimiter ',', before writing the value we
3535
// enclose in quotes. This allows us to define matching
3636
// groups based on quotes for these values.
37-
return $"\"{value}\"";
37+
return addEnclosingQuotes ? $"\"{value}\"" : value;
3838
}
3939

4040
/// <summary>

test/WebJobs.Script.Tests/Diagnostics/KubernetesEventGeneratorTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ public void ParseLogEvents(LogLevel level, string subscriptionId, string appName
4747
p => Assert.Equal(functionName, p.Value),
4848
p => Assert.Equal(eventName, p.Value),
4949
p => Assert.Equal(source, p.Value),
50-
p => Assert.Equal(LinuxEventGenerator.NormalizeString(details), p.Value.ToString()),
51-
p => Assert.Equal(LinuxEventGenerator.NormalizeString(summary), p.Value.ToString()),
50+
p => Assert.Equal(LinuxEventGenerator.NormalizeString(details, addEnclosingQuotes: false), p.Value.ToString()),
51+
p => Assert.Equal(LinuxEventGenerator.NormalizeString(summary, addEnclosingQuotes: false), p.Value.ToString()),
5252
p => Assert.Equal(ScriptHost.Version, p.Value),
5353
p => Assert.True(DateTime.TryParse(p.Value.ToString(), out dt)),
5454
p => Assert.Equal(exceptionType, p.Value.ToString()),
55-
p => Assert.Equal(LinuxEventGenerator.NormalizeString(exceptionMessage), p.Value.ToString()),
55+
p => Assert.Equal(LinuxEventGenerator.NormalizeString(exceptionMessage, addEnclosingQuotes: false), p.Value.ToString()),
5656
p => Assert.Equal(functionInvocationId, p.Value.ToString()),
5757
p => Assert.Equal(hostInstanceId, p.Value.ToString()),
5858
p => Assert.Equal(activityId, p.Value),

0 commit comments

Comments
 (0)