Update to xray sampler 1.5 (#79)

anuraaga · Anuraag Agrawal · commit 6e586d4d8343 · 2021-09-06T16:44:30.000+09:00
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -69,7 +69,7 @@ val DEPENDENCIES = listOf(
   "commons-logging:commons-logging:1.2",
   "com.sparkjava:spark-core:2.9.3",
   "com.squareup.okhttp3:okhttp:4.9.1",
-  "io.opentelemetry.contrib:opentelemetry-aws-xray:1.4.0",
+  "io.opentelemetry.contrib:opentelemetry-aws-xray:1.5.0-SNAPSHOT",
   "io.opentelemetry.javaagent:opentelemetry-javaagent:${if (!TEST_SNAPSHOTS) "1.5.2" else "$otelSnapshotVersion-SNAPSHOT"}",
   "net.bytebuddy:byte-buddy:1.11.13"
 )
diff --git a/smoke-tests/runner/src/test/java/io/awsobservability/instrumentation/smoketests/runner/SpringBootSmokeTest.java b/smoke-tests/runner/src/test/java/io/awsobservability/instrumentation/smoketests/runner/SpringBootSmokeTest.java
@@ -227,7 +227,7 @@ void remoteSamplingRate() {
     var exported = getExported();
     // 5 spans per request (1 CLIENT, 2 SERVER, 2 INTERNAL) if sampled. The default sampler is
     // around 5%, we do a very rough check that there are no more than 10% sampled.
-    assertThat(exported).hasSizeLessThanOrEqualTo(numRequests * 5 / 10);
+    assertThat(exported).isNotEmpty().hasSizeLessThanOrEqualTo(numRequests * 5 / 10);
   }
 
   private List<Span> getExported() {

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ val DEPENDENCIES = listOf(`
`69`	`69`	`"commons-logging:commons-logging:1.2",`
`70`	`70`	`"com.sparkjava:spark-core:2.9.3",`
`71`	`71`	`"com.squareup.okhttp3:okhttp:4.9.1",`
`72`		`- "io.opentelemetry.contrib:opentelemetry-aws-xray:1.4.0",`
	`72`	`+ "io.opentelemetry.contrib:opentelemetry-aws-xray:1.5.0-SNAPSHOT",`
`73`	`73`	`"io.opentelemetry.javaagent:opentelemetry-javaagent:${if (!TEST_SNAPSHOTS) "1.5.2" else "$otelSnapshotVersion-SNAPSHOT"}",`
`74`	`74`	`"net.bytebuddy:byte-buddy:1.11.13"`
`75`	`75`	`)`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ void remoteSamplingRate() {`
`227`	`227`	`var exported = getExported();`
`228`	`228`	`// 5 spans per request (1 CLIENT, 2 SERVER, 2 INTERNAL) if sampled. The default sampler is`
`229`	`229`	`// around 5%, we do a very rough check that there are no more than 10% sampled.`
`230`		`- assertThat(exported).hasSizeLessThanOrEqualTo(numRequests * 5 / 10);`
	`230`	`+ assertThat(exported).isNotEmpty().hasSizeLessThanOrEqualTo(numRequests * 5 / 10);`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`private List<Span> getExported() {`