Revert "Add lf channel in starter (#739)"

This reverts commit 82c9816.

Author: littleaj

azure-application-insights-spring-boot-starter/README.md

@@ -152,14 +152,6 @@ azure.application-insights.channel.in-process.max-transmission-storage-files-cap
 # Enable/Disable throttling on sending telemetry data. Default value: true.
 azure.application-insights.channel.in-process.throttling=true
 
-#Enable and configure Local Forwarder Telemetry Channel
-azure.application-insights.channel.local-forwarder.endpoint-address=
-# Interval to send telemetry. Must be between 1 and 300. Default value: 5 seconds.
-azure.application-insights.channel.local-forwarder.flush-interval-in-seconds=5
-## Maximum count of telemetries that will be batched before sending. Must be between 1 and 1000. Default value: 500.
-azure.application-insights.channel.local-forwarder.max-telemetry-buffer-capacity=500
-
-
 # Percent of telemetry events that will be sent to Application Insights. Percentage must be close to 100/N where N is an integer.
 # E.g. 50 (=100/2), 33.33 (=100/3), 25 (=100/4), 20, 1 (=100/100), 0.1 (=100/1000). Default value: 100 (all telemetry events).
 azure.application-insights.telemetry-processor.sampling.percentage=100

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

@@ -26,11 +26,9 @@
 import com.microsoft.applicationinsights.TelemetryClient;
 import com.microsoft.applicationinsights.TelemetryConfiguration;
 import com.microsoft.applicationinsights.autoconfigure.ApplicationInsightsProperties.Channel.InProcess;
-import com.microsoft.applicationinsights.autoconfigure.ApplicationInsightsProperties.Channel.LocalForwarder;
 import com.microsoft.applicationinsights.autoconfigure.conditionals.InstrumentationKeyCondition;
 import com.microsoft.applicationinsights.channel.TelemetryChannel;
 import com.microsoft.applicationinsights.channel.concrete.inprocess.InProcessTelemetryChannel;
-import com.microsoft.applicationinsights.channel.concrete.localforwarder.LocalForwarderTelemetryChannel;
 import com.microsoft.applicationinsights.exceptions.IllegalConfigurationException;
 import com.microsoft.applicationinsights.extensibility.ContextInitializer;
 import com.microsoft.applicationinsights.extensibility.TelemetryInitializer;
@@ -178,22 +176,6 @@ public TelemetryClient telemetryClient(TelemetryConfiguration configuration) {
     @Bean
     @ConditionalOnMissingBean
     public TelemetryChannel telemetryChannel(TelemetryConfiguration configuration) {
-        boolean hasLfEndpoint = StringUtils.isNotBlank(environment.getProperty("azure.application-insights.channel.local-forwarder.endpoint-address"));
-        boolean hasInprocEndpoint = StringUtils.isNotBlank(environment.getProperty("azure.application-insights.channel.in-process.endpoint-address"));
-        if (hasLfEndpoint && hasInprocEndpoint) {
-            throw new IllegalConfigurationException("SDK cannot have two channels, please either remove Local Forwarder Endpoint, or In Process Endpoint");
-        }
-
-        // If local forwarder endpoint is present configure local forwarder channel
-        if (hasLfEndpoint) {
-            LocalForwarder lf = applicationInsightsProperties.getChannel().getLocalForwarder();
-
-            // TODO use config
-            final LocalForwarderTelemetryChannel channel = new LocalForwarderTelemetryChannel(lf.getEndpointAddress(), false, lf.getMaxTelemetryBufferCapacity(), lf.getFlushIntervalInSeconds());
-            configuration.setChannel(channel);
-            return channel;
-        }
-
         InProcess inProcess = applicationInsightsProperties.getChannel().getInProcess();
         final InProcessTelemetryChannel channel;
         if (StringUtils.isNotEmpty(inProcess.getEndpointAddress())) {
@@ -210,15 +192,10 @@ public TelemetryChannel telemetryChannel(TelemetryConfiguration configuration) {
         return channel;
     }
 
-    // If local forwarder channel is present quick pulse would not be initialized.
     @Bean
     @ConditionalOnProperty(value = "azure.application-insights.quick-pulse.enabled", havingValue = "true", matchIfMissing = true)
     @DependsOn("telemetryConfiguration")
     public QuickPulse quickPulse(TelemetryConfiguration configuration) {
-        String inProcessEndPoint = environment.getProperty("azure.application-insights.channel.local-forwarder.endpoint-address");
-        if (StringUtils.isNotBlank(inProcessEndPoint)) {
-          return QuickPulse.INSTANCE;
-        }
         QuickPulse.INSTANCE.initialize(configuration);
         return QuickPulse.INSTANCE;
     }

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

@@ -27,7 +27,6 @@
 import com.microsoft.applicationinsights.TelemetryConfiguration;
 import com.microsoft.applicationinsights.channel.TelemetryChannel;
 import com.microsoft.applicationinsights.channel.concrete.inprocess.InProcessTelemetryChannel;
-import com.microsoft.applicationinsights.channel.concrete.localforwarder.LocalForwarderTelemetryChannel;
 import com.microsoft.applicationinsights.exceptions.IllegalConfigurationException;
 import com.microsoft.applicationinsights.extensibility.ContextInitializer;
 import com.microsoft.applicationinsights.extensibility.TelemetryInitializer;
@@ -187,34 +186,6 @@ public void shouldBeAbleToConfigureInprocessTelemetryChannel() throws IllegalCon
         assertThat(channel).extracting("telemetryBuffer").extracting("maxTelemetriesInBatch").contains(10);
     }
 
-    @Test
-    public void shouldBeAbleToConfigureLocalForwarderTelemetryChannel() throws IllegalConfigurationException {
-        EnvironmentTestUtils.addEnvironment(context,
-            "azure.application-insights.instrumentation-key: 00000000-0000-0000-0000-000000000000",
-            "azure.application-insights.channel.local-forwarder.endpoint-address=localhost:8080");
-        context.register(PropertyPlaceholderAutoConfiguration.class,
-            ApplicationInsightsTelemetryAutoConfiguration.class);
-        context.refresh();
-
-        TelemetryConfiguration telemetryConfiguration = context.getBean(TelemetryConfiguration.class);
-        TelemetryChannel channel = telemetryConfiguration.getChannel();
-
-        assertThat(channel).isInstanceOf(LocalForwarderTelemetryChannel.class);
-    }
-
-    @Test
-    public void shouldThrowExceptionWhenChannelsMisconfigured() {
-
-        EnvironmentTestUtils.addEnvironment(context,
-            "azure.application-insights.instrumentation-key: 00000000-0000-0000-0000-000000000000",
-            "azure.application-insights.channel.local-forwarder.endpoint-address=localhost:8080",
-            "azure.application-insights.channel.in-process.endpoint-address=https://dc.services.visualstudio.com/v2/track");
-        context.register(PropertyPlaceholderAutoConfiguration.class, ApplicationInsightsTelemetryAutoConfiguration.class);
-        thrown.expect(BeanCreationException.class);
-        context.refresh();
-    }
-
-
     @Test
     public void shouldBeAbleToConfigureSamplingTelemetryProcessor() {
         EnvironmentTestUtils.addEnvironment(context,
@@ -248,8 +219,7 @@ public void shouldBeAbleToDisableAllWebModules() {
     }
 
     @Test
-    public void internalLoggerShouldBeInitializedBeforeTelemetryConfiguration() throws Exception {
-        resetInternalLogger();
+    public void internalLoggerShouldBeInitializedBeforeTelemetryConfiguration() {
         EnvironmentTestUtils.addEnvironment(context,
             "azure.application-insights.instrumentation-key: 00000000-0000-0000-0000-000000000000",
             "azure.application-insights.logger.level=INFO"
@@ -336,22 +306,6 @@ public void heartBeatModuleShouldBeEnabledByDefault() {
         assertThat(context.getBeansOfType(HeartBeatModule.class)).isNotEmpty();
     }
 
-    @Test
-    public void shouldNotHaveQuickPulseChannelIfLFPresent() throws Exception {
-            resetQuickPulse();
-            EnvironmentTestUtils.addEnvironment(context,
-                "azure.application-insights.instrumentation-key: 00000000-0000-0000-0000-000000000000",
-                "azure.application-insights.channel.local-forwarder.endpoint-address=localhost:8080");
-
-            context.register(PropertyPlaceholderAutoConfiguration.class,
-                ApplicationInsightsTelemetryAutoConfiguration.class);
-            context.refresh();
-
-            QuickPulse instance = context.getBean(QuickPulse.class);
-            assertThat(instance).extracting("initialized").contains(false);
-
-    }
-
     private void testIkeySystemProperty(String propertyName) {
         System.setProperty(propertyName, "00000000-0000-0000-0000-000000000001");
         context.register(PropertyPlaceholderAutoConfiguration.class,