Configuration updates

Author: trask

agent/agent-bootstrap/src/main/java/com/microsoft/applicationinsights/agent/bootstrap/configuration/InstrumentationSettings.java

@@ -26,6 +26,8 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import static java.util.concurrent.TimeUnit.MINUTES;
+
 public class InstrumentationSettings {
 
     public String connectionString;
@@ -39,7 +41,6 @@ public static class PreviewConfiguration {
         public Sampling sampling = new Sampling();
         public Heartbeat heartbeat = new Heartbeat();
         public HttpProxy httpProxy = new HttpProxy();
-        public LiveMetrics liveMetrics = new LiveMetrics();
         public boolean developerMode;
 
         public List<JmxMetric> jmxMetrics = Collections.emptyList();
@@ -67,8 +68,7 @@ public static class FixedRateSampling {
 
     public static class Heartbeat {
 
-        public boolean enabled = true;
-        public long intervalSeconds = TimeUnit.MINUTES.toSeconds(15);
+        public long intervalSeconds = MINUTES.toSeconds(15);
     }
 
     public static class HttpProxy {
@@ -77,11 +77,6 @@ public static class HttpProxy {
         public int port = 80;
     }
 
-    public static class LiveMetrics {
-
-        public boolean enabled = true;
-    }
-
     public static class JmxMetric {
 
         public String objectName;

agent/agent-bootstrap/src/test/java/com/microsoft/applicationinsights/agent/bootstrap/configuration/ConfigurationTest.java

@@ -30,7 +30,7 @@ public void shouldParse() throws IOException {
         assertEquals("Something Good", preview.roleName);
         assertEquals("xyz123", preview.roleInstance);
         assertEquals((Double) 10.0, preview.sampling.fixedRate.percentage);
-        assertEquals(false, preview.liveMetrics.enabled);
+        assertEquals(60, preview.heartbeat.intervalSeconds);
         assertEquals(3, preview.jmxMetrics.size());
         assertEquals("java.lang:type=Threading", preview.jmxMetrics.get(0).objectName);
         assertEquals("ThreadCount", preview.jmxMetrics.get(0).attribute);
@@ -58,7 +58,7 @@ public void shouldUseDefaults() throws IOException {
         assertEquals(null, instrumentationSettings.connectionString);
         assertEquals(null, preview.roleName);
         assertEquals(null, preview.roleInstance);
-        assertEquals(true, preview.liveMetrics.enabled);
+        assertEquals(900, preview.heartbeat.intervalSeconds);
         assertEquals(0, preview.jmxMetrics.size());
         assertEquals(0, preview.instrumentation.size());
     }

agent/agent-bootstrap/src/test/resources/ApplicationInsights.json

@@ -27,11 +27,7 @@
         }
       },
       "heartbeat": {
-        "enabled": true,
-        "intervalSeconds": 900
-      },
-      "liveMetrics": {
-        "enabled": false
+        "intervalSeconds": 60
       },
       "instrumentation": {
         "logging": {

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/BeforeAgentInstaller.java

@@ -28,10 +28,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 import com.google.common.base.Strings;
 import com.microsoft.applicationinsights.TelemetryClient;
@@ -64,12 +61,13 @@
 import io.opentelemetry.auto.bootstrap.instrumentation.aiappid.AiAppId;
 import io.opentelemetry.auto.config.Config;
 import io.opentelemetry.auto.config.ConfigOverride;
-import io.opentelemetry.sdk.OpenTelemetrySdk;
 import org.apache.http.HttpHost;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static java.util.concurrent.TimeUnit.MINUTES;
+
 public class BeforeAgentInstaller {
 
     private static Logger startupLogger = LoggerFactory.getLogger("com.microsoft.applicationinsights.agent");
@@ -249,17 +247,13 @@ private static ApplicationInsightsXmlConfiguration buildXmlConfiguration(Instrum
         if (!Strings.isNullOrEmpty(config.preview.roleInstance)) {
             xmlConfiguration.setRoleInstance(config.preview.roleInstance);
         }
-        if (!config.preview.liveMetrics.enabled) {
-            xmlConfiguration.getQuickPulse().setEnabled(false);
-        }
 
         // configure heartbeat module
         AddTypeXmlElement heartbeatModule = new AddTypeXmlElement();
         heartbeatModule.setType("com.microsoft.applicationinsights.internal.heartbeat.HeartBeatModule");
-        heartbeatModule.getParameters().add(newParamXml("isHeartBeatEnabled",
-                Boolean.toString(config.preview.heartbeat.enabled)));
-        heartbeatModule.getParameters().add(newParamXml("HeartBeatInterval",
-                Long.toString(config.preview.heartbeat.intervalSeconds)));
+        // do not allow interval longer than 15 minutes, since we use the heartbeat data for usage telemetry
+        long intervalSeconds = Math.min(config.preview.heartbeat.intervalSeconds, MINUTES.toSeconds(15));
+        heartbeatModule.getParameters().add(newParamXml("HeartBeatInterval", Long.toString(intervalSeconds)));
         ArrayList<AddTypeXmlElement> modules = new ArrayList<>();
         modules.add(heartbeatModule);
         TelemetryModulesXmlElement modulesXml = new TelemetryModulesXmlElement();