Fix cyclic reference in starter (#706)

Author: dhaval24

azure-application-insights-spring-boot-starter/src/main/java/com/microsoft/applicationinsights/boot/ApplicationInsightsModuleConfiguration.java

@@ -31,7 +31,6 @@
 import com.microsoft.applicationinsights.internal.channel.samplingV2.FixedRateSamplingTelemetryProcessor;
 import com.microsoft.applicationinsights.internal.heartbeat.HeartBeatModule;
 import com.microsoft.applicationinsights.internal.heartbeat.HeartBeatPayloadProviderInterface;
-import com.microsoft.applicationinsights.internal.heartbeat.HeartBeatProviderInterface;
 import com.microsoft.applicationinsights.internal.heartbeat.HeartbeatDefaultPayload;
 import com.microsoft.applicationinsights.internal.perfcounter.JvmPerformanceCountersModule;
 import com.microsoft.applicationinsights.internal.perfcounter.ProcessPerformanceCountersModule;
@@ -41,7 +40,6 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.DependsOn;
 import org.springframework.core.env.Environment;
 
 /**
@@ -102,7 +100,6 @@ public SpringBootTelemetryInitializer springBootTelemetryInitializer() {
     //FIXME: This should be conditional on operating System. However, current architecture of ProcessBuiltInPerformanceCountersFactory
     //FIXME: does not separate this concerns therefore cannot condition as of now.
     @Bean
-    @DependsOn("performanceCounterContainer")
     @ConditionalOnProperty(value = "azure.application-insights.default-modules.ProcessPerformanceCountersModule.enabled", havingValue = "true", matchIfMissing = true)
     public ProcessPerformanceCountersModule processPerformanceCountersModule() {
         try {
@@ -119,7 +116,6 @@ public ProcessPerformanceCountersModule processPerformanceCountersModule() {
      * @return instance of {@link JvmPerformanceCountersModule}
      */
     @Bean
-    @DependsOn("performanceCounterContainer")
     @ConditionalOnProperty(value = "azure.application-insights.default.modules.JvmPerformanceCountersModule.enabled", havingValue = "true", matchIfMissing = true)
     public JvmPerformanceCountersModule jvmPerformanceCountersModule() {
         try {

azure-application-insights-spring-boot-starter/src/main/java/com/microsoft/applicationinsights/boot/ApplicationInsightsTelemetryAutoConfiguration.java

@@ -26,21 +26,20 @@
 import com.microsoft.applicationinsights.TelemetryClient;
 import com.microsoft.applicationinsights.TelemetryConfiguration;
 import com.microsoft.applicationinsights.boot.ApplicationInsightsProperties.Channel.InProcess;
-import com.microsoft.applicationinsights.boot.ApplicationInsightsProperties.TelemetryProcessor.Sampling;
 import com.microsoft.applicationinsights.channel.TelemetryChannel;
 import com.microsoft.applicationinsights.channel.concrete.inprocess.InProcessTelemetryChannel;
 import com.microsoft.applicationinsights.extensibility.ContextInitializer;
 import com.microsoft.applicationinsights.extensibility.TelemetryInitializer;
 import com.microsoft.applicationinsights.extensibility.TelemetryModule;
 import com.microsoft.applicationinsights.extensibility.TelemetryProcessor;
-import com.microsoft.applicationinsights.internal.channel.samplingV2.FixedRateSamplingTelemetryProcessor;
 import com.microsoft.applicationinsights.internal.logger.InternalLogger;
 import com.microsoft.applicationinsights.internal.perfcounter.PerformanceCounterContainer;
 import com.microsoft.applicationinsights.internal.quickpulse.QuickPulse;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -180,15 +179,16 @@ public InternalLogger internalLogger() {
         return InternalLogger.INSTANCE;
     }
 
-    @Bean
-    public PerformanceCounterContainer performanceCounterContainer() {
+    // Configure properties of PerformanceCounter Container. Since this is ENUM type we do not need
+    // a bean for this.
+    @PostConstruct
+    public void initializePerformanceCounterContainer() {
         ApplicationInsightsProperties.PerformanceCounter performanceCounter = applicationInsightsProperties.getPerformanceCounter();
         PerformanceCounterContainer.INSTANCE.setCollectionFrequencyInSec(performanceCounter.getCollectionFrequencyInSeconds());
 
         ApplicationInsightsProperties.Jmx jmx = applicationInsightsProperties.getJmx();
         if (jmx.getJmxCounters() !=null && jmx.getJmxCounters().size() > 0) {
             applicationInsightsProperties.processAndLoadJmxCounters(jmx.getJmxCounters());
         }
-        return PerformanceCounterContainer.INSTANCE;
     }
 }

azure-application-insights-spring-boot-starter/src/main/java/com/microsoft/applicationinsights/boot/ApplicationInsightsWebModuleConfiguration.java

@@ -34,7 +34,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.DependsOn;
 
 /**
  * <h1>Web Configuration for Application Insights</h1>
@@ -88,7 +87,6 @@ public WebUserTrackingTelemetryModule webUserTrackingTelemetryModule() {
    * @return instance of {@link WebPerformanceCounterModule}
    */
   @Bean
-    @DependsOn("performanceCounterContainer")
     @ConditionalOnProperty(value = "azure.application-insights.default-modules.WebPerformanceCounterModule.enabled", havingValue = "true", matchIfMissing = true)
     public WebPerformanceCounterModule webPerformanceCounterModule() {
         return new WebPerformanceCounterModule();

azure-application-insights-spring-boot-starter/src/test/java/com/microsoft/applicationinsights/boot/ApplicationInsightsTelemetryAutoConfigurationTests.java

@@ -250,7 +250,7 @@ public void shouldBeAbleToConfigureJmxPerformanceCounters() throws Exception{
             ApplicationInsightsTelemetryAutoConfiguration.class);
         context.refresh();
 
-        PerformanceCounterContainer counterContainer = context.getBean(PerformanceCounterContainer.class);
+        PerformanceCounterContainer counterContainer = PerformanceCounterContainer.INSTANCE;
         Field field = counterContainer.getClass().getDeclaredField("performanceCounters");
         field.setAccessible(true);
         Map<String, PerformanceCounter> map = (Map<String, PerformanceCounter>)field.get(counterContainer);