Convert ProfilerConfiguration

Author: heyams

agent/agent-profiler/agent-diagnostics/src/main/java/com/microsoft/applicationinsights/diagnostics/appinsights/CodeOptimizerDiagnosticEngineJfr.java

@@ -144,6 +144,7 @@ private static void emitMachineStats() {
     machineStats.commit();
   }
 
+  @SuppressWarnings("DefaultCharset")
   private static void emitAlertBreachJfrEvent(AlertBreach alert) {
     try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         JsonWriter writer = JsonProviders.createWriter(outputStream)) {

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/profiler/config/ProfilerConfiguration.java

@@ -3,18 +3,26 @@
 
 package com.microsoft.applicationinsights.agent.internal.profiler.config;
 
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonWriter;
 import com.fasterxml.jackson.databind.util.StdDateFormat;
-import com.google.auto.value.AutoValue;
 import com.microsoft.applicationinsights.alerting.aiconfig.AlertingConfig;
+import java.io.IOException;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
 import javax.annotation.Nullable;
 
-@AutoValue
-public abstract class ProfilerConfiguration {
+public class ProfilerConfiguration implements JsonSerializable<ProfilerConfiguration> {
 
   public static final Date DEFAULT_DATE;
+  private Date lastModified;
+  private boolean enabled;
+  private String collectionPlan;
+  private String cpuTriggerConfiguration;
+  private String memoryTriggerConfiguration;
+  private String defaultConfiguration;
+  private List<AlertingConfig.RequestTrigger> requestTriggerConfiguration;
 
   static {
     Date defaultDate;
@@ -27,45 +35,94 @@ public abstract class ProfilerConfiguration {
     DEFAULT_DATE = defaultDate;
   }
 
-  public static ProfilerConfiguration create(
-      Date lastModified,
-      boolean enabled,
-      String collectionPlan,
-      String cpuTriggerConfiguration,
-      String memoryTriggerConfiguration,
-      String defaultConfiguration,
-      List<AlertingConfig.RequestTrigger> requestTriggerConfiguration) {
+  public boolean hasBeenConfigured() {
+    return getLastModified().compareTo(DEFAULT_DATE) != 0;
+  }
 
-    return new AutoValue_ProfilerConfiguration(
-        lastModified,
-        enabled,
-        collectionPlan,
-        cpuTriggerConfiguration,
-        memoryTriggerConfiguration,
-        defaultConfiguration,
-        requestTriggerConfiguration);
+  public Date getLastModified() {
+    return lastModified;
   }
 
-  public boolean hasBeenConfigured() {
-    return getLastModified().compareTo(DEFAULT_DATE) != 0;
+  public ProfilerConfiguration setLastModified(Date lastModified) {
+    this.lastModified = lastModified;
+    return this;
   }
 
-  public abstract Date getLastModified();
+  public boolean isEnabled() {
+    return enabled;
+  }
 
-  public abstract boolean isEnabled();
+  public ProfilerConfiguration setEnabled(boolean enabled) {
+    this.enabled = enabled;
+    return this;
+  }
 
   @Nullable
-  public abstract String getCollectionPlan();
+  public String getCollectionPlan() {
+    return collectionPlan;
+  }
+
+  public ProfilerConfiguration setCollectionPlan(String collectionPlan) {
+    this.collectionPlan = collectionPlan;
+    return this;
+  }
 
   @Nullable
-  public abstract String getCpuTriggerConfiguration();
+  public String getCpuTriggerConfiguration() {
+    return cpuTriggerConfiguration;
+  }
+
+  public ProfilerConfiguration setCpuTriggerConfiguration(String cpuTriggerConfiguration) {
+    this.cpuTriggerConfiguration = cpuTriggerConfiguration;
+    return this;
+  }
 
   @Nullable
-  public abstract String getMemoryTriggerConfiguration();
+  public String getMemoryTriggerConfiguration() {
+    return memoryTriggerConfiguration;
+  }
+
+  public ProfilerConfiguration setMemoryTriggerConfiguration(String memoryTriggerConfiguration) {
+    this.memoryTriggerConfiguration = memoryTriggerConfiguration;
+    return this;
+  }
 
   @Nullable
-  public abstract String getDefaultConfiguration();
+  public String getDefaultConfiguration() {
+    return defaultConfiguration;
+  }
+
+  public ProfilerConfiguration setDefaultConfiguration(String defaultConfiguration) {
+    this.defaultConfiguration = defaultConfiguration;
+    return this;
+  }
 
   @Nullable
-  public abstract List<AlertingConfig.RequestTrigger> getRequestTriggerConfiguration();
+  public List<AlertingConfig.RequestTrigger> getRequestTriggerConfiguration() {
+    return requestTriggerConfiguration;
+  }
+
+  public ProfilerConfiguration setRequestTriggerConfiguration(
+      List<AlertingConfig.RequestTrigger> requestTriggerConfiguration) {
+    this.requestTriggerConfiguration = requestTriggerConfiguration;
+    return this;
+  }
+
+  @Override
+  public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+    jsonWriter.writeStartObject();
+    jsonWriter.writeLongField("lastModified", lastModified.getTime());
+    jsonWriter.writeBooleanField("enabled", enabled);
+    jsonWriter.writeStringField("collectionPlan", collectionPlan);
+    jsonWriter.writeStringField("cpuTriggerConfiguration", cpuTriggerConfiguration);
+    jsonWriter.writeStringField("memoryTriggerConfiguration", memoryTriggerConfiguration);
+    jsonWriter.writeStringField("defaultConfiguration", defaultConfiguration);
+    jsonWriter.writeStartArray("requestTriggerConfiguration");
+    for (AlertingConfig.RequestTrigger trigger : requestTriggerConfiguration) {
+      trigger.toJson(jsonWriter);
+    }
+    jsonWriter.writeEndArray();
+    jsonWriter.writeEndObject();
+    return jsonWriter;
+  }
 }

agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/profiler/ProfilingInitializerTest.java

@@ -166,28 +166,28 @@ public Collection<DynamicTest> runTests() {
 
   @NotNull
   private static ProfilerConfiguration unconfiguredState() {
-    return ProfilerConfiguration.create(
-        ProfilerConfiguration.DEFAULT_DATE,
-        true,
-        "",
-        "--cpu-threshold 80 --cpu-trigger-profilingDuration 120 --cpu-trigger-cooldown 14400 --cpu-trigger-enabled true",
-        "--memory-threshold 80 --memory-trigger-profilingDuration 120 --memory-trigger-cooldown 14400 --memory-trigger-enabled true",
-        null,
-        null);
+    return new ProfilerConfiguration()
+        .setLastModified(ProfilerConfiguration.DEFAULT_DATE)
+        .setEnabled(true)
+        .setCollectionPlan("")
+        .setCpuTriggerConfiguration(
+            "--cpu-threshold 80 --cpu-trigger-profilingDuration 120 --cpu-trigger-cooldown 14400 --cpu-trigger-enabled true")
+        .setMemoryTriggerConfiguration(
+            "--memory-threshold 80 --memory-trigger-profilingDuration 120 --memory-trigger-cooldown 14400 --memory-trigger-enabled true");
   }
 
   @NotNull
   private static ProfilerConfiguration userConfiguredTriggersState(boolean triggersEnabled) {
-    return ProfilerConfiguration.create(
-        new Date(Instant.now().toEpochMilli()),
-        true,
-        "",
-        "--cpu-threshold 80 --cpu-trigger-profilingDuration 120 --cpu-trigger-cooldown 14400 --cpu-trigger-enabled "
-            + triggersEnabled,
-        "--memory-threshold 80 --memory-trigger-profilingDuration 120 --memory-trigger-cooldown 14400 --memory-trigger-enabled "
-            + triggersEnabled,
-        null,
-        null);
+    return new ProfilerConfiguration()
+        .setLastModified(new Date(Instant.now().toEpochMilli()))
+        .setEnabled(true)
+        .setCollectionPlan("")
+        .setCpuTriggerConfiguration(
+            "--cpu-threshold 80 --cpu-trigger-profilingDuration 120 --cpu-trigger-cooldown 14400 --cpu-trigger-enabled "
+                + triggersEnabled)
+        .setMemoryTriggerConfiguration(
+            "--memory-threshold 80 --memory-trigger-profilingDuration 120 --memory-trigger-cooldown 14400 --memory-trigger-enabled "
+                + triggersEnabled);
   }
 
   @NotNull
@@ -200,18 +200,19 @@ private static ProfilerConfiguration profileNowState(
       expiration = Instant.now().plus(100, ChronoUnit.SECONDS);
     }
 
-    return ProfilerConfiguration.create(
-        new Date(Instant.now().minus(10, ChronoUnit.SECONDS).toEpochMilli()),
-        true,
-        "--single --mode immediate --immediate-profiling-duration 120  --expiration "
-            + toBinaryDate(expiration)
-            + " --settings-moniker a-settings-moniker",
-        "--cpu-threshold 80 --cpu-trigger-profilingDuration 120 --cpu-trigger-cooldown 14400 --cpu-trigger-enabled "
-            + triggersEnabled,
-        "--memory-threshold 80 --memory-trigger-profilingDuration 120 --memory-trigger-cooldown 14400 --memory-trigger-enabled "
-            + triggersEnabled,
-        null,
-        null);
+    return new ProfilerConfiguration()
+        .setLastModified(new Date(Instant.now().minus(10, ChronoUnit.SECONDS).toEpochMilli()))
+        .setEnabled(true)
+        .setCollectionPlan(
+            "--single --mode immediate --immediate-profiling-duration 120  --expiration "
+                + toBinaryDate(expiration)
+                + " --settings-moniker a-settings-moniker")
+        .setCpuTriggerConfiguration(
+            "--cpu-threshold 80 --cpu-trigger-profilingDuration 120 --cpu-trigger-cooldown 14400 --cpu-trigger-enabled "
+                + triggersEnabled)
+        .setMemoryTriggerConfiguration(
+            "--memory-threshold 80 --memory-trigger-profilingDuration 120 --memory-trigger-cooldown 14400 --memory-trigger-enabled "
+                + triggersEnabled);
   }
 
   @SuppressWarnings("DirectInvocationOnMock")

agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/profiler/config/ConfigServiceTest.java

@@ -11,7 +11,7 @@
 import com.azure.core.http.HttpPipelineBuilder;
 import com.azure.core.test.TestBase;
 import com.azure.core.test.TestMode;
-import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 import com.microsoft.applicationinsights.agent.internal.profiler.service.ServiceProfilerClient;
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -61,7 +61,7 @@ void badServiceResponseDoesNotProvideReturn() throws MalformedURLException {
     ConfigService configService = new ConfigService(serviceProfilerClient);
     Mono<ProfilerConfiguration> result = configService.pullSettings();
 
-    assertThatThrownBy(result::block).hasRootCauseInstanceOf(JsonParseException.class);
+    assertThatThrownBy(result::block).hasRootCauseInstanceOf(InvalidDefinitionException.class);
   }
 
   private HttpPipeline getHttpPipeline() {