Skip to content

Commit e5ab37d

Browse files
divyagandhisethiyojagad
authored andcommitted
Re enable azure monitor events for linux consumption (#5809)
1 parent 313d29e commit e5ab37d

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private void ConsoleWriter(string evt)
104104

105105
public override void LogAzureMonitorDiagnosticLogEvent(LogLevel level, string resourceId, string operationName, string category, string regionName, string properties)
106106
{
107-
// _writeEvent($"{ScriptConstants.LinuxAzureMonitorEventStreamName} {(int)ToEventLevel(level)},{resourceId},{operationName},{category},{regionName},{NormalizeString(properties)},{_containerName},{TenantId},{DateTime.UtcNow.ToString()}");
107+
_writeEvent($"{ScriptConstants.LinuxAzureMonitorEventStreamName} {(int)ToEventLevel(level)},{resourceId},{operationName},{category},{regionName},{NormalizeString(properties.Replace("'", string.Empty))},{_containerName},{TenantId},{DateTime.UtcNow.ToString()}");
108108
}
109109

110110
public static void LogUnhandledException(Exception e)

src/WebJobs.Script.WebHost/Metrics/LinuxContainerMetricsPublisher.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,6 @@ public void AddFunctionExecutionActivity(string functionName, string invocationI
156156
_logger.LogWarning($"Buffer for function activities is full with {_functionActivities.Count} elements. Dropping current batch of function activities");
157157
DrainActivities(_currentFunctionActivities, _functionActivities);
158158
}
159-
160-
_logger.LogDebug($"Added function activity : {functionName} {invocationId} {concurrency} {executionStage} {success} {executionTimeSpan}");
161159
}
162160

163161
public void AddMemoryActivity(DateTime timeStampUtc, long data)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public void ToEventLevel_ReturnsExpectedValue(LogLevel logLevel, EventLevel even
193193
Assert.Equal(eventLevel, LinuxEventGenerator.ToEventLevel(logLevel));
194194
}
195195

196-
[Theory(Skip = "https://github.com/Azure/azure-functions-host/issues/5636")]
196+
[Theory]
197197
[MemberData(nameof(LinuxEventGeneratorTestData.GetAzureMonitorEvents), MemberType = typeof(LinuxEventGeneratorTestData))]
198198
public void ParseAzureMonitoringEvents(LogLevel level, string resourceId, string operationName, string category, string regionName, string properties)
199199
{

test/WebJobs.Script.Tests/Metrics/LinuxContainerMetricsPublisherTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,7 @@ public void PublishFunctionActivity_SendsRequestHeaders()
140140
_testFunctionActivity.EventTimeStamp,
141141
_testFunctionActivity.StartTime);
142142

143-
Assert.Matches("Added function activity", _testLoggerProvider.GetAllLogMessages().Single().FormattedMessage);
144-
Assert.Equal(LogLevel.Debug, _testLoggerProvider.GetAllLogMessages().Single().Level);
143+
Assert.Empty(_testLoggerProvider.GetAllLogMessages());
145144

146145
_testLoggerProvider.ClearAllLogMessages();
147146

0 commit comments

Comments
 (0)