NetCore remove TC.Active and fix NetCore Heartbeat

NETCORE/src/Shared/Extensions/ApplicationInsightsServiceOptions.cs

@@ -12,10 +12,6 @@ namespace Microsoft.ApplicationInsights.WorkerService
     /// </summary>
     public class ApplicationInsightsServiceOptions
     {
-        private bool enableAppServicesHeartbeatTelemetryModule = true;
-        private bool enableAzureInstanceMetadataTelemetryModule = true;
-        private bool enableHeartbeat = true;
-
         /// <summary>
         /// Gets or sets a value indicating whether QuickPulseTelemetryModule and QuickPulseTelemetryProcessor are registered with the configuration.
         /// Setting EnableQuickPulseMetricStream to <value>false</value>, will disable the default quick pulse metric stream. Defaults to <value>true</value>.
@@ -31,24 +27,16 @@ public class ApplicationInsightsServiceOptions
         /// <summary>
         /// Gets or sets a value indicating whether AppServicesHeartbeatTelemetryModule should be enabled.
         /// Defaults to <value>true</value>.
-        /// IMPORTANT: This setting will be disabled if <see cref="EnableDiagnosticsTelemetryModule"/> is set to false.
+        /// IMPORTANT: This setting will be ignored if <see cref="EnableDiagnosticsTelemetryModule"/> is set to false.
         /// </summary>
-        public bool EnableAppServicesHeartbeatTelemetryModule
-        {
-            get => this.enableAppServicesHeartbeatTelemetryModule && this.EnableDiagnosticsTelemetryModule;
-            set => this.enableAppServicesHeartbeatTelemetryModule = value;
-        }
+        public bool EnableAppServicesHeartbeatTelemetryModule { get; set; } = true;
 
         /// <summary>
         /// Gets or sets a value indicating whether AzureInstanceMetadataTelemetryModule should be enabled.
         /// Defaults to <value>true</value>.
-        /// IMPORTANT: This setting will be disabled if <see cref="EnableDiagnosticsTelemetryModule"/> is set to false.
+        /// IMPORTANT: This setting will be ignored if <see cref="EnableDiagnosticsTelemetryModule"/> is set to false.
         /// </summary>
-        public bool EnableAzureInstanceMetadataTelemetryModule 
-        { 
-            get => this.enableAzureInstanceMetadataTelemetryModule && this.EnableDiagnosticsTelemetryModule;
-            set => this.enableAzureInstanceMetadataTelemetryModule = value; 
-        }
+        public bool EnableAzureInstanceMetadataTelemetryModule { get; set; } = true;
 
         /// <summary>
         /// Gets or sets a value indicating whether DependencyTrackingTelemetryModule should be enabled.
@@ -102,13 +90,9 @@ public bool EnableAzureInstanceMetadataTelemetryModule
 
         /// <summary>
         /// Gets or sets a value indicating whether heartbeats are enabled.
-        /// IMPORTANT: This setting will be disabled if <see cref="EnableDiagnosticsTelemetryModule"/> is set to false.
+        /// IMPORTANT: This setting will be ignored if <see cref="EnableDiagnosticsTelemetryModule"/> is set to false.
         /// </summary>
-        public bool EnableHeartbeat 
-        { 
-            get => this.enableHeartbeat && this.EnableDiagnosticsTelemetryModule; 
-            set => this.enableHeartbeat = value; 
-        }
+        public bool EnableHeartbeat { get; set; } = true;
 
         /// <summary>
         /// Gets or sets a value indicating whether AutoCollectedMetricExtractors are added or not.

NETCORE/src/Shared/Implementation/TelemetryConfigurationOptionsSetup.cs

@@ -255,7 +255,12 @@ public void Configure(TelemetryConfiguration configuration)
                     }
                     catch (Exception ex)
                     {
-                        throw new Exception($"Failed to initialize module '{module.GetType()}'", ex);
+                        var tempEx = new Exception($"Failed to initialize module '{module.GetType()}'", ex);
+#if AI_ASPNETCORE_WEB
+                        AspNetCoreEventSource.Instance.TelemetryConfigurationSetupFailure(tempEx.ToInvariantString());
+#else
+                        WorkerServiceEventSource.Instance.TelemetryConfigurationSetupFailure(tempEx.ToInvariantString());
+#endif
                     }
                 }
 

NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsServiceOptionsTests.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 
 using Microsoft.ApplicationInsights.AspNetCore.Extensions;
+using Microsoft.ApplicationInsights.Channel;
 using Microsoft.ApplicationInsights.DependencyCollector;
 using Microsoft.ApplicationInsights.Extensibility;
 #if NETCOREAPP
@@ -38,7 +39,7 @@ namespace Microsoft.ApplicationInsights.AspNetCore.Tests.Extensions
     /// </remarks>
     public class ApplicationInsightsServiceOptionsTests
     {
-        private static IServiceProvider TestShim(string configType, bool isEnabled, Action<ApplicationInsightsServiceOptions, bool> testConfig)
+        private static IServiceProvider TestShim(string configType, bool isEnabled, Action<ApplicationInsightsServiceOptions, bool> testConfig, Action<IServiceCollection> servicesConfig = null)
         {
             // ARRANGE
             Action<ApplicationInsightsServiceOptions> serviceOptions = null;
@@ -56,6 +57,7 @@ private static IServiceProvider TestShim(string configType, bool isEnabled, Acti
             var services = CreateServicesAndAddApplicationinsightsWorker(
                 jsonPath: filePath,
                 serviceOptions: serviceOptions,
+                servicesConfig: servicesConfig,
                 useDefaultConfig: configType == "DefaultConfiguration" ? true : false);
 
             IServiceProvider serviceProvider = services.BuildServiceProvider();
@@ -70,7 +72,7 @@ private static IServiceProvider TestShim(string configType, bool isEnabled, Acti
             return serviceProvider;
         }
 
-        private static ServiceCollection CreateServicesAndAddApplicationinsightsWorker(string jsonPath, Action<ApplicationInsightsServiceOptions> serviceOptions = null, bool useDefaultConfig = true)
+        private static ServiceCollection CreateServicesAndAddApplicationinsightsWorker(string jsonPath, Action<ApplicationInsightsServiceOptions> serviceOptions = null, Action<IServiceCollection> servicesConfig = null, bool useDefaultConfig = true)
         {
             IConfigurationRoot config;
             var services = new ServiceCollection()
@@ -113,6 +115,8 @@ private static ServiceCollection CreateServicesAndAddApplicationinsightsWorker(s
             }
 #endif
 
+            servicesConfig?.Invoke(services);
+
             if (serviceOptions != null)
             {
                 services.Configure(serviceOptions);
@@ -147,19 +151,37 @@ public static void UserCanEnableAndDisableTelemetryConfigurationActive(string co
 
             // IMPORTANT: This is the same ikey specified in the config files that will be used for this test.
             string testString = "22222222-2222-3333-4444-555555555555";
+            var testTelemetryInitializer = new FakeTelemetryInitializer();
 
-            IServiceProvider serviceProvider = TestShim(configType: configType, isEnabled: isEnable,
-                testConfig: (o, b) => {
+            IServiceProvider serviceProvider = TestShim(
+                configType: configType,
+                isEnabled: isEnable,
+                testConfig: (o, b) =>
+                {
                     o.EnableActiveTelemetryConfigurationSetup = b;
                     o.InstrumentationKey = testString;
-                });
+                },
+                servicesConfig: (services) => services.AddSingleton<ITelemetryInitializer>(testTelemetryInitializer)
+                );
 
-            // TelemetryConfiguration from DI should have custom set InstrumentationKey
+            // TelemetryConfiguration from DI should have custom set InstrumentationKey and TelemetryInitializer
             var telemetryConfiguration = serviceProvider.GetTelemetryConfiguration();
             Assert.Equal(testString, telemetryConfiguration.InstrumentationKey);
+            Assert.Same(testTelemetryInitializer, telemetryConfiguration.TelemetryInitializers.OfType<FakeTelemetryInitializer>().Single());
 
-            // TelemetryConfiguration.Active will only have custom set InstrumentationKey if BackwardsCompat was enabled.
+            // TelemetryConfiguration.Active will only have custom set InstrumentationKey if .Active was enabled.
             Assert.Equal(testString.Equals(TelemetryConfiguration.Active.InstrumentationKey), isEnable);
+
+            // TelemetryConfiguration.Active will only have custom TelemetryInitializer if .Active was enabled
+            var activeTelemetryInitializer = TelemetryConfiguration.Active.TelemetryInitializers.OfType<FakeTelemetryInitializer>().SingleOrDefault();
+            if (isEnable)
+            {
+                Assert.Same(testTelemetryInitializer, activeTelemetryInitializer);
+            }
+            else
+            {
+                Assert.Null(activeTelemetryInitializer);
+            }
 
 #pragma warning restore CS0618 // Type or member is obsolete
         }
@@ -357,36 +379,5 @@ public static void UserCanEnableAndDisableHeartbeatFeature(string configType, bo
             Assert.True(module.IsInitialized, "module was not initialized");
             Assert.Equal(isEnable, module.IsHeartbeatEnabled);
         }
-
-        [Fact]
-        public static void VerifyCouplingOfHeartbeatSettingsWithDiagnosticTelemetryModule()
-        {
-            var options = new ApplicationInsightsServiceOptions();
-
-            // Verify default values
-            Assert.True(options.EnableHeartbeat);
-            Assert.True(options.EnableAzureInstanceMetadataTelemetryModule);
-            Assert.True(options.EnableAppServicesHeartbeatTelemetryModule);
-            Assert.True(options.EnableDiagnosticsTelemetryModule);
-
-            // Verify disabling DiagnosticsTelemetryModule also disables all heartbeat settings
-            options.EnableDiagnosticsTelemetryModule = false;
-            Assert.False(options.EnableHeartbeat);
-            Assert.False(options.EnableAzureInstanceMetadataTelemetryModule);
-            Assert.False(options.EnableAppServicesHeartbeatTelemetryModule);
-            Assert.False(options.EnableDiagnosticsTelemetryModule);
-
-            // Verify that heartbeat can be disabled but DiagnosticsTelemetryModule will remain enabled.
-            options = new ApplicationInsightsServiceOptions
-            {
-                EnableHeartbeat = false,
-                EnableAzureInstanceMetadataTelemetryModule = false,
-                EnableAppServicesHeartbeatTelemetryModule = false,
-            };
-            Assert.False(options.EnableHeartbeat);
-            Assert.False(options.EnableAzureInstanceMetadataTelemetryModule);
-            Assert.False(options.EnableAppServicesHeartbeatTelemetryModule);
-            Assert.True(options.EnableDiagnosticsTelemetryModule);
-        }
     }
 }

WEB/Src/WindowsServer/WindowsServer/AppServicesHeartbeatTelemetryModule.cs

@@ -2,6 +2,8 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.ComponentModel;
+
     using Microsoft.ApplicationInsights.Extensibility;
     using Microsoft.ApplicationInsights.Extensibility.Implementation;
     using Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing;
@@ -48,6 +50,7 @@ public AppServicesHeartbeatTelemetryModule() : this(null)
         /// <remarks>
         /// This is expected to be an instance of <see cref="DiagnosticsTelemetryModule"/>.
         /// </remarks>
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public IHeartbeatPropertyManager HeartbeatPropertyManager
         {
             get

WEB/Src/WindowsServer/WindowsServer/AzureInstanceMetadataTelemetryModule.cs

@@ -1,6 +1,7 @@
 namespace Microsoft.ApplicationInsights.WindowsServer
 {
     using System;
+    using System.ComponentModel;
     using System.Threading.Tasks;
     using Microsoft.ApplicationInsights.Extensibility;
     using Microsoft.ApplicationInsights.Extensibility.Implementation;
@@ -30,6 +31,7 @@ public AzureInstanceMetadataTelemetryModule() : this(null)
         /// <remarks>
         /// This is expected to be an instance of <see cref="DiagnosticsTelemetryModule"/>.
         /// </remarks>
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public IHeartbeatPropertyManager HeartbeatPropertyManager
         {
             get