Merge pull request #1016 from microsoft/minor_tweaks

Minor reworkings

Author: trask

ApplicationInsightsInternalLogger/src/main/java/com/microsoft/applicationinsights/internal/logger/InternalLogger.java

@@ -307,8 +307,7 @@ private static String createMessage(String prefix, String message, Object... arg
         }
         String formattedMessage = String.format(message, args);
         final Thread thisThread = Thread.currentThread();
-        String theMessage = String.format("%s %s, %d(%s): %s", prefix, currentDateAsString, thisThread.getId(), thisThread.getName(), formattedMessage);
-        return theMessage;
+        return String.format("%s %s, %d(%s): %s", prefix, currentDateAsString, thisThread.getId(), thisThread.getName(), formattedMessage);
     }
 
     /**

core/src/main/java/com/microsoft/applicationinsights/internal/channel/samplingV2/FixedRateSamplingTelemetryProcessor.java

@@ -105,17 +105,12 @@ public Set<Class> getIncludedTypes() {
     }
 
 
-    private void setIncludedOrExcludedTypes(String value, Set<Class> typeSet) {
-
-        if (!StringUtils.isEmpty(value)) {
-            value = value.trim();
-            if (!StringUtils.isEmpty(value) && allowedTypes.containsKey(value)) {
-                typeSet.add(allowedTypes.get(value));
-            } else {
-                InternalLogger.INSTANCE.error("Item %s is either not allowed to sample or is empty", value);
-            }
+    private void setIncludedOrExcludedTypes(String value, Set<Class> typeSet, String verb) {
+        Class type = allowedTypes.get(StringUtils.trimToEmpty(value));
+        if (type != null) {
+            typeSet.add(type);
         } else {
-            InternalLogger.INSTANCE.error("Telemetry type %s is empty", value);
+            InternalLogger.INSTANCE.error("Error configuring %s: %s is not a valid telemetry type to %s.", FixedRateSamplingTelemetryProcessor.class.getSimpleName(), value, verb);
         }
     }
 
@@ -133,13 +128,14 @@ private void setIncludedOrExcludedTypes(String value, Set<Class> typeSet) {
      */
     public void setSamplingPercentage(String samplingPercentage) {
         try {
-            this.samplingPercentage = Double.valueOf(samplingPercentage);
+            this.samplingPercentage = Double.parseDouble(samplingPercentage);
             InternalLogger.INSTANCE.info("Sampling rate set to %s", samplingPercentage);
         }
         catch (NumberFormatException ex) {
             this.samplingPercentage = 100.0;
-            InternalLogger.INSTANCE.error("Sampling rate specified in improper format, sampling rate is now set to 100.0 (default)");
-            InternalLogger.INSTANCE.trace("stack trace is %s", ExceptionUtils.getStackTrace(ex));
+            if (InternalLogger.INSTANCE.isErrorEnabled()) {
+                InternalLogger.INSTANCE.error("Sampling rate specified in improper format. Using default sampling rate, 100.0: %s", ExceptionUtils.getStackTrace(ex));
+            }
         }
     }
 
@@ -152,7 +148,7 @@ public void setSamplingPercentage(String samplingPercentage) {
     @Override
     public boolean process(Telemetry telemetry) {
 
-        double samplingPercentage = this.samplingPercentage;
+        double sp = this.samplingPercentage;
 
         if (telemetry instanceof SupportSampling) {
 
@@ -162,24 +158,24 @@ public boolean process(Telemetry telemetry) {
 
                 if (samplingSupportingTelemetry.getSamplingPercentage() == null) {
 
-                    samplingSupportingTelemetry.setSamplingPercentage(samplingPercentage);
+                    samplingSupportingTelemetry.setSamplingPercentage(sp);
 
 
                 } else {
                     InternalLogger.INSTANCE.info("Item has sampling percentage already set to :"
                             + samplingSupportingTelemetry.getSamplingPercentage());
 
-                    samplingPercentage = samplingSupportingTelemetry.getSamplingPercentage();
+                    sp = samplingSupportingTelemetry.getSamplingPercentage();
                 }
 
-                if (SamplingScoreGeneratorV2.getSamplingScore(telemetry) >= samplingPercentage) {
+                if (SamplingScoreGeneratorV2.getSamplingScore(telemetry) >= sp) {
 
-                    InternalLogger.INSTANCE.info("Item %s sampled out", telemetry.getClass());
+                    InternalLogger.INSTANCE.info("Item %s sampled out", telemetry.getClass().getSimpleName());
                     return false;
                 }
 
             } else {
-                InternalLogger.INSTANCE.trace("Skip sampling since %s type is not sampling applicable", telemetry.getClass());
+                InternalLogger.INSTANCE.trace("Skip sampling since %s type is not sampling applicable", telemetry.getClass().getSimpleName());
             }
         }
 
@@ -212,8 +208,7 @@ private boolean isSamplingApplicable(Class item) {
      */
     public void addToExcludedType(String value) {
 
-        setIncludedOrExcludedTypes(value, excludedTypes);
-        InternalLogger.INSTANCE.trace("%s added as excluded to sampling", value);
+        setIncludedOrExcludedTypes(value, excludedTypes, "exclude");
 
     }
 
@@ -224,8 +219,7 @@ public void addToExcludedType(String value) {
      */
     public void addToIncludedType(String value) {
 
-        setIncludedOrExcludedTypes(value, includedTypes);
-        InternalLogger.INSTANCE.trace("%s added as included to sampling", value);
+        setIncludedOrExcludedTypes(value, includedTypes, "include");
 
     }
 }

core/src/main/java/com/microsoft/applicationinsights/internal/heartbeat/HeartbeatDefaultPayload.java

@@ -14,8 +14,7 @@ public class HeartbeatDefaultPayload {
   /**
    * List of default payloads which would be added
    */
-  private static final List<HeartBeatPayloadProviderInterface> defaultPayloadProviders =
-      new ArrayList<>();
+  private static final List<HeartBeatPayloadProviderInterface> defaultPayloadProviders = new ArrayList<>();
 
   static {
     defaultPayloadProviders.add(new DefaultHeartBeatPropertyProvider());
@@ -59,10 +58,9 @@ public static boolean addDefaultPayLoadProvider(HeartBeatPayloadProviderInterfac
   public static Callable<Boolean> populateDefaultPayload(final List<String> disabledFields, final List<String>
       disabledProviders, final HeartBeatProviderInterface provider) {
     return new Callable<Boolean>() {
-
-      volatile boolean populatedFields = false;
       @Override
       public Boolean call() throws Exception {
+        boolean populatedFields = false;
         for (HeartBeatPayloadProviderInterface payloadProvider : defaultPayloadProviders) {
           if (disabledProviders != null && disabledProviders.contains(payloadProvider.getName())) {
 

core/src/main/java/com/microsoft/applicationinsights/internal/heartbeat/MiscUtils.java

@@ -11,6 +11,7 @@
  * @author Dhaval Doshi
  */
 public class MiscUtils {
+    private MiscUtils(){}
 
   /**
    * Returns a set which contains result of List - Set

core/src/main/java/com/microsoft/applicationinsights/telemetry/BaseTelemetry.java

@@ -147,8 +147,7 @@ public void sanitize() {
     @Override
     public void serialize(JsonTelemetryDataSerializer writer) throws IOException {
 
-        String telemetryName = this.getTelemetryName(
-                this.normalizeInstrumentationKey(context.getInstrumentationKey()), this.getEnvelopName());
+        String telemetryName = getTelemetryName(normalizeInstrumentationKey(context.getInstrumentationKey()), this.getEnvelopName());
 
         Envelope envelope = new Envelope();
         envelope.setName(telemetryName);