Support already configured TelemetryConfiguration for LoggingSetup (#324

) * Support already configured TelemetryConfiguration for LoggingSetup * The MetricTelemetry.Value property is obsolete and replaced by Sum
NuGet · Dec 10, 2019 · b107552 · b107552
1 parent f33967c
commit b107552
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/NuGet.Services.Logging/LoggingSetup.cs b/src/NuGet.Services.Logging/LoggingSetup.cs
@@ -31,19 +31,28 @@ public static LoggerConfiguration CreateDefaultLoggerConfiguration(bool withCons
 
         public static ILoggerFactory CreateLoggerFactory(
             LoggerConfiguration loggerConfiguration = null,
-            LogEventLevel applicationInsightsMinimumLogEventLevel = LogEventLevel.Information)
+            LogEventLevel applicationInsightsMinimumLogEventLevel = LogEventLevel.Information,
+            TelemetryConfiguration telemetryConfiguration = null)
         {
             // setup Serilog
             if (loggerConfiguration == null)
             {
                 loggerConfiguration = CreateDefaultLoggerConfiguration();
             }
 
-            if (!string.IsNullOrEmpty(TelemetryConfiguration.Active.InstrumentationKey))
+            if (telemetryConfiguration != null 
+                && !string.IsNullOrEmpty(telemetryConfiguration.InstrumentationKey))
             {
-                loggerConfiguration = loggerConfiguration.WriteTo.ApplicationInsightsTraces(
-                    TelemetryConfiguration.Active.InstrumentationKey,
-                    restrictedToMinimumLevel: applicationInsightsMinimumLogEventLevel);
+                // Even though this method call is marked [Obsolete],
+                // there's currently no other way to pass in the active TelemetryConfiguration as configured in DI.
+                // These SeriLog APIs are very likely to change to support passing in the TelemetryConfiguration again.
+                // See also https://github.com/serilog/serilog-sinks-applicationinsights/issues/121.
+
+#pragma warning disable CS0618 // Type or member is obsolete
+                loggerConfiguration = loggerConfiguration.WriteTo.ApplicationInsights(
+                    telemetryConfiguration, 
+                    applicationInsightsMinimumLogEventLevel);
+#pragma warning restore CS0618 // Type or member is obsolete
             }
 
             Log.Logger = loggerConfiguration.CreateLogger();

diff --git a/src/NuGet.Services.Logging/TelemetryClientWrapper.cs b/src/NuGet.Services.Logging/TelemetryClientWrapper.cs
@@ -59,7 +59,7 @@ public void TrackMetric(
                 {
                     Timestamp = timestamp,
                     Name = metricName,
-                    Value = value
+                    Sum = value
                 };
 
                 if (properties != null)