Merge branch 'master' into fix/llmobs-telemetry-span-finished-aggregation

Author: Yun-Kim

dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/build.gradle

@@ -8,6 +8,7 @@ muzzle {
     module = "aws-java-sdk-sns"
     versions = "[1.12.113,2)"
     assertInverse = true
+    excludeDependency 'joda-time:joda-time'
   }
 }
 

dd-java-agent/instrumentation/cucumber-5.4/build.gradle

@@ -8,6 +8,7 @@ muzzle {
     group = 'io.cucumber'
     module = 'cucumber-core'
     versions = '[5.4.0,)'
+    excludeDependency 'io.cucumber:query'
   }
 }
 

dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/build.gradle

@@ -9,13 +9,15 @@ muzzle {
     versions = "[7.3,8.0.0)"
     assertInverse = true
     skipVersions = ["7.11.0", "7.17.8"]
+    excludeDependency 'org.apache.logging.log4j:log4j-api'
   }
   pass {
     group = "org.elasticsearch"
     module = "elasticsearch"
     versions = "[7.3,8.0.0)"
     assertInverse = true
     skipVersions = ["7.11.0", "7.17.8", "8.8.0", "9.3.0"]
+    excludeDependency 'org.apache.logging.log4j:log4j-api'
   }
 }
 

dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/build.gradle

@@ -9,6 +9,7 @@ muzzle {
     versions = "[,]"
     extraDependency "com.netflix.zuul:zuul-core:1.3.1"
     extraDependency "javax.servlet:javax.servlet-api:3.1.0"
+    excludeDependency 'org.apache.logging.log4j:log4j-to-slf4j'
     assertInverse = true
   }
 }

dd-java-agent/instrumentation/spring/spring-rabbit-1.5/build.gradle

@@ -8,6 +8,7 @@ muzzle {
     module = 'spring-boot-starter-amqp'
     versions = '[1.5.0.RELEASE,3)'
     extraDependency 'com.rabbitmq:amqp-client:2.7.0'
+    excludeDependency 'org.apache.logging.log4j:log4j-to-slf4j'
   }
 }
 

dd-trace-core/src/main/java/datadog/trace/common/sampling/DeterministicSampler.java

@@ -38,11 +38,11 @@ protected <T extends CoreSpan<T>> long getSamplingId(T span) {
 
   private static final double MAX = Math.pow(2, 64) - 1;
 
-  private final float rate;
+  private final double rate;
   private final long threshold;
 
   public DeterministicSampler(final double rate) {
-    this.rate = (float) rate;
+    this.rate = rate;
     this.threshold = cutoff(rate);
   }
 

dd-trace-core/src/test/java/datadog/trace/common/sampling/DeterministicTraceSamplerTest.java

@@ -357,6 +357,11 @@ void testSamplingAll(String traceId) {
     assertTrue(sampler.sample(span));
   }
 
+  @TableTest({"rate       ", "0.123456789", "0.999999999"})
+  void preservesConfiguredSampleRate(double rate) {
+    assertEquals(rate, new DeterministicSampler.TraceSampler(rate).getSampleRate());
+  }
+
   @ParameterizedTest(name = "rate={0}")
   @MethodSource("testCutoffCalculationArguments")
   void testCutoffCalculation(int rate) {