some renaming

Author: trask

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/exporter/AgentLogExporter.java

@@ -11,7 +11,7 @@
 import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem;
 import com.azure.monitor.opentelemetry.autoconfigure.implementation.quickpulse.QuickPulse;
 import com.microsoft.applicationinsights.agent.internal.configuration.Configuration.SamplingOverride;
-import com.microsoft.applicationinsights.agent.internal.sampling.AiSamplerForOverride;
+import com.microsoft.applicationinsights.agent.internal.sampling.AiFixedPercentageSampler;
 import com.microsoft.applicationinsights.agent.internal.sampling.SamplingOverrides;
 import com.microsoft.applicationinsights.agent.internal.telemetry.BatchItemProcessor;
 import com.microsoft.applicationinsights.agent.internal.telemetry.TelemetryClient;
@@ -120,7 +120,7 @@ private void internalExport(LogRecordData log) {
       SpanContext spanContext = log.getSpanContext();
       Double parentSpanSampleRate = log.getAttributes().get(AiSemanticAttributes.SAMPLE_RATE);
 
-      AiSamplerForOverride sampler = samplingOverrides.getOverride(log.getAttributes());
+      AiFixedPercentageSampler sampler = samplingOverrides.getOverride(log.getAttributes());
 
       boolean hasSamplingOverride = sampler != null;
 

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

@@ -45,7 +45,7 @@
 import com.microsoft.applicationinsights.agent.internal.processors.LogExporterWithAttributeProcessor;
 import com.microsoft.applicationinsights.agent.internal.processors.SpanExporterWithAttributeProcessor;
 import com.microsoft.applicationinsights.agent.internal.profiler.triggers.AlertTriggerSpanProcessor;
-import com.microsoft.applicationinsights.agent.internal.sampling.AiSamplerForOverride;
+import com.microsoft.applicationinsights.agent.internal.sampling.AiFixedPercentageSampler;
 import com.microsoft.applicationinsights.agent.internal.sampling.SamplingOverrides;
 import com.microsoft.applicationinsights.agent.internal.telemetry.BatchItemProcessor;
 import com.microsoft.applicationinsights.agent.internal.telemetry.MetricFilter;
@@ -581,7 +581,7 @@ private static SpanExporter createSpanExporter(
               return false;
             },
             (span, event) -> {
-              AiSamplerForOverride sampler =
+              AiFixedPercentageSampler sampler =
                   exceptionSamplingOverrides.getOverride(event.getAttributes());
               return sampler != null
                   && sampler

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/AiSamplerForOverride.java renamed to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/AiFixedPercentageSampler.java

@@ -16,16 +16,16 @@
 import java.util.List;
 import javax.annotation.Nullable;
 
-public class AiSamplerForOverride implements Sampler {
+public class AiFixedPercentageSampler implements Sampler {
 
-  private final SamplingPercentage samplingPercentage;
+  private final double percentage;
 
-  public static AiSamplerForOverride create(SamplingPercentage samplingPercentage) {
-    return new AiSamplerForOverride(samplingPercentage);
+  public static AiFixedPercentageSampler create(double percentage) {
+    return new AiFixedPercentageSampler(percentage);
   }
 
-  private AiSamplerForOverride(SamplingPercentage samplingPercentage) {
-    this.samplingPercentage = samplingPercentage;
+  private AiFixedPercentageSampler(double percentage) {
+    this.percentage = percentage;
   }
 
   @Override
@@ -61,9 +61,7 @@ private SamplingResult internalShouldSample(
       return samplingResult;
     }
 
-    double sp = samplingPercentage.get();
-
-    return SamplerUtil.shouldSample(traceId, sp);
+    return SamplerUtil.shouldSample(traceId, percentage);
   }
 
   @Nullable
@@ -78,14 +76,12 @@ private SamplingResult useLocalParentDecisionIfPossible(
       return null;
     }
 
-    double sp = samplingPercentage.get();
-
     if (!parentSpanContext.isSampled()) {
-      if (sp < 100) {
+      if (percentage < 100) {
         // only 100% sampling override will override an unsampled parent!!
         return SamplingResult.drop();
       } else {
-        // falls back in this case to sp
+        // falls back in this case to percentage
         return null;
       }
     }
@@ -94,8 +90,8 @@ private SamplingResult useLocalParentDecisionIfPossible(
       return null;
     }
 
-    if (sp < parentSpanSampleRate || sp == 100) {
-      // falls back in this case to sp
+    if (percentage < parentSpanSampleRate || percentage == 100) {
+      // falls back in this case to percentage
       return null;
     }
     // don't sample more dependencies than parent in this case
@@ -104,6 +100,6 @@ private SamplingResult useLocalParentDecisionIfPossible(
 
   @Override
   public String getDescription() {
-    return "AiSampler";
+    return "FixedPercentageSampler";
   }
 }

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/Samplers.java

@@ -43,7 +43,8 @@ public static Sampler getSampler(
 
     if (!requestSamplingOverrides.isEmpty() || !dependencySamplingOverrides.isEmpty()) {
       sampler =
-          new AiOverrideSampler(requestSamplingOverrides, dependencySamplingOverrides, sampler);
+          new SamplingOverridesSampler(
+              requestSamplingOverrides, dependencySamplingOverrides, sampler);
     }
 
     if (!samplingPreview.parentBased) {

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/SamplingOverrides.java

@@ -33,7 +33,7 @@ public SamplingOverrides(List<SamplingOverride> overrides) {
   }
 
   @Nullable
-  public AiSamplerForOverride getOverride(Attributes attributes) {
+  public AiFixedPercentageSampler getOverride(Attributes attributes) {
     LazyHttpUrl lazyHttpUrl = new LazyHttpUrl(attributes);
     LazyHttpTarget lazyHttpTarget = new LazyHttpTarget(attributes);
     for (MatcherGroup matcherGroups : matcherGroups) {
@@ -46,7 +46,7 @@ public AiSamplerForOverride getOverride(Attributes attributes) {
 
   private static class MatcherGroup {
     private final List<TempPredicate> predicates;
-    private final AiSamplerForOverride sampler;
+    private final AiFixedPercentageSampler sampler;
 
     private MatcherGroup(SamplingOverride override) {
       predicates = new ArrayList<>();
@@ -56,11 +56,10 @@ private MatcherGroup(SamplingOverride override) {
           predicates.add(predicate);
         }
       }
-      SamplingPercentage samplingPercentage = SamplingPercentage.fixed(override.percentage);
-      sampler = AiSamplerForOverride.create(samplingPercentage);
+      sampler = AiFixedPercentageSampler.create(override.percentage);
     }
 
-    AiSamplerForOverride getSampler() {
+    AiFixedPercentageSampler getSampler() {
       return sampler;
     }
 

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/AiOverrideSampler.java renamed to agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/SamplingOverridesSampler.java

@@ -15,13 +15,13 @@
 import io.opentelemetry.sdk.trace.samplers.SamplingResult;
 import java.util.List;
 
-class AiOverrideSampler implements Sampler {
+class SamplingOverridesSampler implements Sampler {
 
   private final SamplingOverrides requestSamplingOverrides;
   private final SamplingOverrides dependencySamplingOverrides;
   private final Sampler delegate;
 
-  AiOverrideSampler(
+  SamplingOverridesSampler(
       List<SamplingOverride> requestSamplingOverrides,
       List<SamplingOverride> dependencySamplingOverrides,
       Sampler delegate) {
@@ -53,6 +53,6 @@ public SamplingResult shouldSample(
 
   @Override
   public String getDescription() {
-    return "AiOverrideSampler";
+    return "SamplingOverridesSampler";
   }
 }