From ff2c83741c0f29bd46fd3dadfa27a22836aed476 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 5 Jun 2017 15:11:36 +0200 Subject: [PATCH 1/3] Bumped netflix --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 75f9af6ec..dd46433a3 100644 --- a/pom.xml +++ b/pom.xml @@ -237,7 +237,7 @@ 1.3.3.BUILD-SNAPSHOT 1.2.3.BUILD-SNAPSHOT Chelsea.BUILD-SNAPSHOT - 1.3.2.BUILD-SNAPSHOT + 1.4.0.BUILD-SNAPSHOT From 215577a31ca25599acd21459898908231299b053 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 5 Jun 2017 17:40:35 +0200 Subject: [PATCH 2/3] Updated cli --- scripts/runAcceptanceTestsStreamKafka.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/runAcceptanceTestsStreamKafka.sh b/scripts/runAcceptanceTestsStreamKafka.sh index 408ea8c36..d6dd00c1f 100755 --- a/scripts/runAcceptanceTestsStreamKafka.sh +++ b/scripts/runAcceptanceTestsStreamKafka.sh @@ -16,4 +16,4 @@ chmod +x runAcceptanceTests.sh echo "Killing all running apps" ./runAcceptanceTests.sh -t "${AT_WHAT_TO_TEST}" -n -./runAcceptanceTests.sh --kafka --whattotest "${AT_WHAT_TO_TEST}" --killattheend -cli "1.3.0.BUILD-SNAPSHOT" +./runAcceptanceTests.sh --kafka --whattotest "${AT_WHAT_TO_TEST}" --killattheend -cli "1.3.3.BUILD-SNAPSHOT" From 6a0a57ef7fef1f9e85d53fdb03a90fafe1c6e513 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 6 Jun 2017 07:54:17 +0200 Subject: [PATCH 3/3] Fixed percentage value in percentage based sampler fixes #608 --- .../cloud/sleuth/sampler/PercentageBasedSampler.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java index f742bd091..10ac50815 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java @@ -1,12 +1,12 @@ package org.springframework.cloud.sleuth.sampler; +import org.springframework.cloud.sleuth.Sampler; +import org.springframework.cloud.sleuth.Span; + import java.util.BitSet; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; -import org.springframework.cloud.sleuth.Sampler; -import org.springframework.cloud.sleuth.Span; - /** * This sampler is appropriate for low-traffic instrumentation (ex servers that each receive <100K * requests), or those who do not provision random trace ids. It not appropriate for collectors as @@ -39,7 +39,7 @@ public class PercentageBasedSampler implements Sampler { public boolean isSampled(Span currentSpan) { if (this.configuration.getPercentage() == 0 || currentSpan == null) { return false; - } else if (this.configuration.getPercentage() == 100) { + } else if (this.configuration.getPercentage() == 1.0f) { return true; } synchronized (this) {