Add the optional BoundaryMeasureType to MetricBoundaryCondition & improve detection sample (Azure#22691)

* Add the optional BoundaryMeasureType to MetricBoundaryCondition

* Update detection config samples to have null check before accessing optionals

Author: anuchandy

sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/models/BoundaryMeasureType.java

@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.ai.metricsadvisor.administration.models;
+
+import com.azure.ai.metricsadvisor.implementation.models.ValueType;
+import com.azure.core.util.ExpandableStringEnum;
+import com.fasterxml.jackson.annotation.JsonCreator;
+
+import java.util.Collection;
+
+/**
+ * The measure type that detector should use for measuring data-points when detecting anomalies
+ * using {@link MetricBoundaryCondition}.
+ */
+public final class BoundaryMeasureType extends ExpandableStringEnum<BoundaryMeasureType> {
+    /**
+     * Static value Value indicating that detector should use raw value of data points.
+     */
+    public static final BoundaryMeasureType VALUE = fromString(ValueType.VALUE.toString());
+    /**
+     * Static value Value indicating that detector should use mean value of data points over a period.
+     */
+    public static final BoundaryMeasureType MEAN = fromString(ValueType.MEAN.toString());
+
+    /**
+     * Creates or finds a BoundaryMeasureType from its string representation.
+     *
+     * @param name a name to look for.
+     * @return the corresponding BoundaryMeasureType.
+     */
+    @JsonCreator
+    public static BoundaryMeasureType fromString(String name) {
+        return fromString(name, BoundaryMeasureType.class);
+    }
+
+    /** @return known BoundaryMeasureType values. */
+    public static Collection<BoundaryMeasureType> values() {
+        return values(BoundaryMeasureType.class);
+    }
+}

sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/administration/models/MetricBoundaryCondition.java

@@ -16,6 +16,7 @@ public final class MetricBoundaryCondition {
     private Double upperBoundary;
     private String companionMetricId;
     private Boolean alertIfMissing;
+    private BoundaryMeasureType measureType;
 
     static {
         MetricBoundaryConditionHelper.setAccessor(new MetricBoundaryConditionHelper.MetricBoundaryConditionAccessor() {
@@ -84,6 +85,25 @@ public String getCompanionMetricId() {
         return this.companionMetricId;
     }
 
+    /**
+     * True if alert will be triggered when the companion-metric data-points are out
+     * of boundary but the corresponding data-point is missing for the original metric.
+     *
+     * @return True if alert is triggered for missing data-points, false otherwise.
+     */
+    public Boolean shouldAlertIfDataPointMissing() {
+        return this.alertIfMissing;
+    }
+
+    /**
+     * Gets the measure type that detector should use for measuring data-points.
+     *
+     * @return the measure type.
+     */
+    public BoundaryMeasureType getMeasureType() {
+        return this.measureType;
+    }
+
     /**
      * Sets the boundary.
      *
@@ -119,16 +139,6 @@ public MetricBoundaryCondition setCompanionMetricId(String companionMetricId) {
         return this;
     }
 
-    /**
-     * True if alert will be triggered when the companion-metric data-points are out
-     * of boundary but the corresponding data-point is missing for the original metric.
-     *
-     * @return True if alert is triggered for missing data-points, false otherwise.
-     */
-    public Boolean shouldAlertIfDataPointMissing() {
-        return this.alertIfMissing;
-    }
-
     /**
      * Sets the companion metric id.
      *
@@ -150,6 +160,18 @@ public MetricBoundaryCondition setCompanionMetricId(String companionMetricId,
         return this;
     }
 
+    /**
+     * Sets the measure type that detector should use for measuring data-points.
+     *
+     * @param measureType the type of measure to use.
+     *
+     * @return The MetricBoundaryCondition object itself.
+     */
+    public MetricBoundaryCondition setMeasureType(BoundaryMeasureType measureType) {
+        this.measureType = measureType;
+        return this;
+    }
+
     void setLowerBoundary(Double lowerBoundary) {
         this.lowerBoundary = lowerBoundary;
     }

sdk/metricsadvisor/azure-ai-metricsadvisor/src/main/java/com/azure/ai/metricsadvisor/implementation/util/AlertConfigurationTransforms.java

@@ -3,6 +3,7 @@
 
 package com.azure.ai.metricsadvisor.implementation.util;
 
+import com.azure.ai.metricsadvisor.administration.models.BoundaryMeasureType;
 import com.azure.ai.metricsadvisor.administration.models.MetricAnomalyAlertSnoozeCondition;
 import com.azure.ai.metricsadvisor.implementation.models.AnomalyAlertingConfiguration;
 import com.azure.ai.metricsadvisor.implementation.models.AnomalyAlertingConfigurationLogicType;
@@ -15,6 +16,7 @@
 import com.azure.ai.metricsadvisor.implementation.models.ValueCondition;
 import com.azure.ai.metricsadvisor.administration.models.AnomalyAlertConfiguration;
 import com.azure.ai.metricsadvisor.administration.models.BoundaryDirection;
+import com.azure.ai.metricsadvisor.implementation.models.ValueType;
 import com.azure.ai.metricsadvisor.models.DimensionKey;
 import com.azure.ai.metricsadvisor.administration.models.MetricAnomalyAlertConditions;
 import com.azure.ai.metricsadvisor.administration.models.MetricAlertConfiguration;
@@ -183,6 +185,10 @@ private static List<MetricAlertingConfiguration> getMetricAlertConfigList(
                             .setMetricId(UUID.fromString(boundaryConditions.getCompanionMetricId()));
                         innerValueCondition.setTriggerForMissing(boundaryConditions.shouldAlertIfDataPointMissing());
                     }
+                    if (boundaryConditions.getMeasureType() != null) {
+                        innerValueCondition.setType(
+                            ValueType.fromString(boundaryConditions.getMeasureType().toString()));
+                    }
                     innerMetricAlertConfiguration.setValueFilter(innerValueCondition);
                 }
             }
@@ -317,6 +323,10 @@ public static AnomalyAlertConfiguration fromInner(
                             boundaryCondition.setCompanionMetricId(innerValueCondition.getMetricId().toString(),
                                 triggerIfMissing);
                         }
+                        if (innerValueCondition.getType() != null) {
+                            boundaryCondition.setMeasureType(
+                                BoundaryMeasureType.fromString(innerValueCondition.getType().toString()));
+                        }
                         alertConditions.setMetricBoundaryCondition(boundaryCondition);
                     }
                     metricAlertConfiguration.setAlertConditions(alertConditions);