Rename telemetryKind to telemetryType (#2535)

Author: trask

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

@@ -76,8 +76,8 @@ public enum SpanKind {
     }
   }
 
-  public enum SamplingTelemetryKind {
-    // restricted to telemetry kinds that are supported by SamplingOverrides
+  public enum SamplingTelemetryType {
+    // restricted to telemetry types that are supported by SamplingOverrides
     @JsonProperty("request")
     REQUEST,
     @JsonProperty("dependency")
@@ -622,7 +622,10 @@ public static class SamplingOverride {
 
     // TODO (trask) make this required when moving out of preview
     //   for now the default is both "request" and "dependency" for backwards compatibility
-    @Nullable public SamplingTelemetryKind telemetryKind;
+    @Nullable public SamplingTelemetryType telemetryType;
+
+    // this config option existed in one GA release (3.4.0), and was then replaced by telemetryType
+    @Deprecated @Nullable public SamplingTelemetryType telemetryKind;
 
     // this config option only existed in one BETA release (3.4.0-BETA)
     @Deprecated @Nullable public Boolean includingStandaloneTelemetry;
@@ -635,15 +638,15 @@ public static class SamplingOverride {
     public String id; // optional, used for debugging purposes only
 
     public boolean isForRequestTelemetry() {
-      return telemetryKind == SamplingTelemetryKind.REQUEST
+      return telemetryType == SamplingTelemetryType.REQUEST
           // this part is for backwards compatibility:
-          || (telemetryKind == null && spanKind != SpanKind.CLIENT);
+          || (telemetryType == null && spanKind != SpanKind.CLIENT);
     }
 
     public boolean isForDependencyTelemetry() {
-      return telemetryKind == SamplingTelemetryKind.DEPENDENCY
+      return telemetryType == SamplingTelemetryType.DEPENDENCY
           // this part is for backwards compatibility:
-          || (telemetryKind == null && spanKind != SpanKind.SERVER);
+          || (telemetryType == null && spanKind != SpanKind.SERVER);
     }
 
     public void validate() {

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

@@ -177,17 +177,26 @@ private static void logConfigurationWarnings(Configuration config) {
               + " so no need to enable it under preview configuration");
     }
     for (SamplingOverride override : config.preview.sampling.overrides) {
+      if (override.telemetryKind != null) {
+        configurationLogger.warn(
+            "Sampling overrides \"telemetryKind\" has been deprecated,"
+                + " and support for it will be removed in a future release, please transition from"
+                + " \"telemetryKind\" to \"telemetryType\".");
+        if (override.telemetryType == null) {
+          override.telemetryType = override.telemetryKind;
+        }
+      }
       if (override.spanKind != null) {
         configurationLogger.warn(
             "Sampling overrides \"spanKind\" has been deprecated,"
                 + " and support for it will be removed in a future release, please transition from"
-                + " \"spanKind\" to \"telemetryKind\".");
+                + " \"spanKind\" to \"telemetryType\".");
       }
-      if (override.telemetryKind == null) {
+      if (override.telemetryType == null) {
         configurationLogger.warn(
-            "Sampling overrides \"telemetryKind\" is missing,"
+            "Sampling overrides \"telemetryType\" is missing,"
                 + " and will be required in a future release, please transition to add"
-                + " \"telemetryKind\" for sampling overrides.");
+                + " \"telemetryType\" for sampling overrides.");
       }
       if (override.includingStandaloneTelemetry != null) {
         configurationLogger.warn(

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

@@ -23,7 +23,7 @@
 import com.microsoft.applicationinsights.agent.internal.common.FriendlyException;
 import com.microsoft.applicationinsights.agent.internal.configuration.Configuration;
 import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.ProcessorConfig;
-import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.SamplingTelemetryKind;
+import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.SamplingTelemetryType;
 import com.microsoft.applicationinsights.agent.internal.configuration.RpConfiguration;
 import com.microsoft.applicationinsights.agent.internal.exporter.AgentLogExporter;
 import com.microsoft.applicationinsights.agent.internal.exporter.AgentMetricExporter;
@@ -472,11 +472,11 @@ private static LogExporter createLogExporter(
 
     List<Configuration.SamplingOverride> logSamplingOverrides =
         configuration.preview.sampling.overrides.stream()
-            .filter(override -> override.telemetryKind == SamplingTelemetryKind.TRACE)
+            .filter(override -> override.telemetryType == SamplingTelemetryType.TRACE)
             .collect(Collectors.toList());
     List<Configuration.SamplingOverride> exceptionSamplingOverrides =
         configuration.preview.sampling.overrides.stream()
-            .filter(override -> override.telemetryKind == SamplingTelemetryKind.EXCEPTION)
+            .filter(override -> override.telemetryType == SamplingTelemetryType.EXCEPTION)
             .collect(Collectors.toList());
 
     agentLogExporter =