merge from main

sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/quickpulse/filtering/CustomDimensions.java

@@ -42,16 +42,15 @@ public boolean matchesCustomDimFilter(FilterInfo filter, String trimmedFieldName
     }
 
     public double getCustomDimValueForProjection(String key) {
-        double result = Double.NaN;
         if (customDimensions.containsKey(key)) {
             String value = customDimensions.get(key);
             try {
-                result = Double.parseDouble(value);
+                return Double.parseDouble(value);
             } catch (NumberFormatException e) {
-                return result;
+
             }
         }
-        return result;
+        return Double.NaN;
     }
 
 }

sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/quickpulse/filtering/DerivedMetricAggregation.java

@@ -45,11 +45,12 @@ void update(double incrementBy) {
         synchronized (lock) {
             if (count == 0) {
                 return 0.0;
-            } else if (aggregationType.equals(AggregationType.AVG)) {
+
+            }
+            if (aggregationType.equals(AggregationType.AVG)) {
                 return aggregation / count;
-            } else {
-                return aggregation;
             }
+            return aggregation;
         }
     }
 }

sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/quickpulse/filtering/DerivedMetricProjections.java

@@ -52,7 +52,7 @@ public void calculateProjection(DerivedMetricInfo derivedMetricInfo, TelemetryCo
             long duration = columns.getFieldValue(KnownRequestColumns.DURATION, Long.class);
             // in case duration from telemetrycolumns doesn't parse correctly.
             // also quickpulse expects duration derived metrics to be reported in millis.
-            incrementBy = duration != -1 ? (double) duration / 1000.0 : Double.NaN;
+            incrementBy = duration == -1 ? Double.NaN : (double) duration / 1000.0;
         } else if (derivedMetricInfo.getProjection().startsWith(Filter.CUSTOM_DIM_FIELDNAME_PREFIX)) {
             String customDimKey
                 = derivedMetricInfo.getProjection().substring(Filter.CUSTOM_DIM_FIELDNAME_PREFIX.length());

sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/quickpulse/filtering/FilteringConfiguration.java

@@ -2,7 +2,14 @@
 // Licensed under the MIT License.
 package com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.filtering;
 
-import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.*;
+import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.DerivedMetricInfo;
+import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.FilterConjunctionGroupInfo;
+import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.CollectionConfigurationInfo;
+import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.DocumentStreamInfo;
+import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.DocumentFilterConjunctionGroupInfo;
+import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.AggregationType;
+import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.TelemetryType;
+import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.swagger.models.CollectionConfigurationErrorType;
 
 import java.util.Set;
 import java.util.List;
@@ -134,14 +141,4 @@ private Map<String, AggregationType> initValidProjectionInfo() {
         return result;
     }
 
-    private Map<String, AggregationType> initValidProjectionInfo() {
-        Map<String, AggregationType> result = new HashMap<>();
-        for (List<DerivedMetricInfo> derivedMetricInfoList : validDerivedMetricInfos.values()) {
-            for (DerivedMetricInfo derivedMetricInfo : derivedMetricInfoList) {
-                result.put(derivedMetricInfo.getId(), derivedMetricInfo.getAggregation());
-            }
-        }
-        return result;
-    }
-
 }