rename

microsoft · May 30, 2024 · c0b4645 · c0b4645
1 parent 1606bc7
commit c0b4645
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/...in/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java b/...in/java/com/microsoft/applicationinsights/agent/internal/configuration/Configuration.java
@@ -202,7 +202,7 @@ public static class SamplingPreview {
     // future goal: make parentBased sampling the default if item count is received via tracestate
     public boolean parentBased;
 
-    public boolean suppressIngestionSampling;
+    public boolean ingestionSamplingEnabled = true;
 
     @Deprecated public List<SamplingOverride> overrides = new ArrayList<>();
   }

diff --git a/...ng/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/AiSampler.java b/...ng/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/AiSampler.java
@@ -29,7 +29,7 @@ public class AiSampler implements Sampler {
 
   private static final double SAMPLE_RATE_TO_DISABLE_INGESTION_SAMPLING = 99.99;
 
-  private final boolean suppressIngestionSampling;
+  private final boolean ingestionSamplingEnabled;
   private final boolean localParentBased;
   private final SamplingPercentage requestSamplingPercentage;
   // when localParentBased=false, then this applies to all dependencies, not only parentless
@@ -39,22 +39,22 @@ public class AiSampler implements Sampler {
   public AiSampler(
       SamplingPercentage requestSamplingPercentage,
       SamplingPercentage parentlessDependencySamplingPercentage,
-      boolean suppressIngestionSampling) {
+      boolean ingestionSamplingEnabled) {
     this(
         requestSamplingPercentage,
         parentlessDependencySamplingPercentage,
-        suppressIngestionSampling,
+        ingestionSamplingEnabled,
         true);
   }
 
   public AiSampler(
       SamplingPercentage requestSamplingPercentage,
       SamplingPercentage parentlessDependencySamplingPercentage,
-      boolean suppressIngestionSampling,
+      boolean ingestionSamplingEnabled,
       boolean localParentBased) {
     this.requestSamplingPercentage = requestSamplingPercentage;
     this.parentlessDependencySamplingPercentage = parentlessDependencySamplingPercentage;
-    this.suppressIngestionSampling = suppressIngestionSampling;
+    this.ingestionSamplingEnabled = ingestionSamplingEnabled;
     this.localParentBased = localParentBased;
   }
 
@@ -94,7 +94,7 @@ public SamplingResult shouldSample(
       return SamplingResult.drop();
     }
 
-    if (sp == 100 && !suppressIngestionSampling) {
+    if (sp == 100 && ingestionSamplingEnabled) {
       return SamplingResult.recordAndSample();
     }
 

diff --git a/...ing/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/Samplers.java b/...ing/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/Samplers.java
@@ -22,12 +22,12 @@ public static Sampler getSampler(
           new AiSampler(
               requestSamplingPercentage,
               parentlessDependencySamplingPercentage,
-              samplingPreview.suppressIngestionSampling);
+              samplingPreview.ingestionSamplingEnabled);
     } else if (sampling.percentage != null) {
       SamplingPercentage samplingPercentage = SamplingPercentage.fixed(sampling.percentage);
       sampler =
           new AiSampler(
-              samplingPercentage, samplingPercentage, samplingPreview.suppressIngestionSampling);
+              samplingPercentage, samplingPercentage, samplingPreview.ingestionSamplingEnabled);
     } else {
       throw new AssertionError("ConfigurationBuilder should have set the default sampling");
     }

diff --git a/...ts/smoketest/NoIngestionSamplingTest.java → ...ketest/IngestionSamplingDisabledTest.java b/...ts/smoketest/NoIngestionSamplingTest.java → ...ketest/IngestionSamplingDisabledTest.java
@@ -21,8 +21,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-@UseAgent("applicationinsights-no-ingestion-sampling.json")
-abstract class NoIngestionSamplingTest {
+@UseAgent("applicationinsights-ingestion-sampling-disabled.json")
+abstract class IngestionSamplingDisabledTest {
 
   @RegisterExtension static final SmokeTestExtension testing = SmokeTestExtension.create();
 
@@ -62,29 +62,29 @@ void testNoIngestionSampling() throws Exception {
   }
 
   @Environment(TOMCAT_8_JAVA_8)
-  static class Tomcat8Java8Test extends NoIngestionSamplingTest {}
+  static class Tomcat8Java8Test extends IngestionSamplingDisabledTest {}
 
   @Environment(TOMCAT_8_JAVA_8_OPENJ9)
-  static class Tomcat8Java8OpenJ9Test extends NoIngestionSamplingTest {}
+  static class Tomcat8Java8OpenJ9Test extends IngestionSamplingDisabledTest {}
 
   @Environment(TOMCAT_8_JAVA_11)
-  static class Tomcat8Java11Test extends NoIngestionSamplingTest {}
+  static class Tomcat8Java11Test extends IngestionSamplingDisabledTest {}
 
   @Environment(TOMCAT_8_JAVA_11_OPENJ9)
-  static class Tomcat8Java11OpenJ9Test extends NoIngestionSamplingTest {}
+  static class Tomcat8Java11OpenJ9Test extends IngestionSamplingDisabledTest {}
 
   @Environment(TOMCAT_8_JAVA_17)
-  static class Tomcat8Java17Test extends NoIngestionSamplingTest {}
+  static class Tomcat8Java17Test extends IngestionSamplingDisabledTest {}
 
   @Environment(TOMCAT_8_JAVA_21)
-  static class Tomcat8Java21Test extends NoIngestionSamplingTest {}
+  static class Tomcat8Java21Test extends IngestionSamplingDisabledTest {}
 
   @Environment(TOMCAT_8_JAVA_21_OPENJ9)
-  static class Tomcat8Java21OpenJ9Test extends NoIngestionSamplingTest {}
+  static class Tomcat8Java21OpenJ9Test extends IngestionSamplingDisabledTest {}
 
   @Environment(WILDFLY_13_JAVA_8)
-  static class Wildfly13Java8Test extends NoIngestionSamplingTest {}
+  static class Wildfly13Java8Test extends IngestionSamplingDisabledTest {}
 
   @Environment(WILDFLY_13_JAVA_8_OPENJ9)
-  static class Wildfly13Java8OpenJ9Test extends NoIngestionSamplingTest {}
+  static class Wildfly13Java8OpenJ9Test extends IngestionSamplingDisabledTest {}
 }
diff --git a/...cationinsights-no-ingestion-sampling.json → ...insights-ingestion-sampling-disabled.json b/...cationinsights-no-ingestion-sampling.json → ...insights-ingestion-sampling-disabled.json
@@ -8,7 +8,7 @@
   },
   "preview": {
     "sampling": {
-      "suppressIngestionSampling": true
+      "ingestionSamplingEnabled": false
     }
   }
 }