changelog fix

open-telemetry · Jul 29, 2021 · 7cb48d6 · 7cb48d6
1 parent 477674d
commit 7cb48d6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/src/OpenTelemetry/CHANGELOG.md b/src/OpenTelemetry/CHANGELOG.md
@@ -5,8 +5,8 @@
 * Removes upper constraint for Microsoft.Extensions.Logging
   dependencies. ([#2179](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2179))
 
-* Fix bug which caused ILogger.Log calls to throw exception, when the
-  formatter supplied is null.
+* OpenTelemetryLogger modified to not throw, when the
+  formatter supplied in ILogger.Log call is null. ([#2200](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2200))
 
 ## 1.2.0-alpha1
 

diff --git a/src/OpenTelemetry/Logs/OpenTelemetryLogger.cs b/src/OpenTelemetry/Logs/OpenTelemetryLogger.cs
@@ -47,22 +47,13 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
             {
                 var options = this.provider.Options;
 
-                string formattedMessage = null;
-                if (options.IncludeFormattedMessage)
-                {
-                    if (formatter != null)
-                    {
-                        formattedMessage = formatter(state, exception);
-                    }
-                }
-
                 var record = new LogRecord(
                     options.IncludeScopes ? this.ScopeProvider : null,
                     DateTime.UtcNow,
                     this.categoryName,
                     logLevel,
                     eventId,
-                    formattedMessage,
+                    options.IncludeFormattedMessage ? formatter?.Invoke(state, exception) : null,
                     options.ParseStateValues ? null : (object)state,
                     exception,
                     options.ParseStateValues ? this.ParseState(state) : null);