Skip to content

Commit

Permalink
Release 2.8.0 (#69)
Browse files Browse the repository at this point in the history 
* changelog

* updated version and benchmarks

* attempt at fix

* remove caching to try to fix

* added checkerframework to test classpath for mocking to work

Co-authored-by: EC2 Default User <[email protected]>
  • Loading branch information
@willarmiros
willarmiros and EC2 Default User authored Dec 4, 2020
1 parent 4edd799 commit 962164a
Show file tree
Hide file tree
Showing 6 changed files with 161 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## 2.8.0 - 2020-11-25
* Fixed NPE in Servlet Response Handler [PR #63](https://github.com/aws/aws-xray-java-agent/pull/63)
* Fixed bug in parsing sampling decision from upstream header [PR #66](https://github.com/aws/aws-xray-java-agent/pull/66)

## 2.7.1 - 2020-09-03
* Added build steps to compile X-Ray agent ZIP [PR #55](https://github.com/aws/aws-xray-java-agent/pull/55)
* Added Benchmarking tests [PR #57](https://github.com/aws/aws-xray-java-agent/pull/57)
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ To depend on the agent from your project, just add these dependencies:
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-xray-agent-plugin</artifactId>
<version>2.7.1</version>
<version>2.8.0</version>
</dependency>
</dependencies>
```
Expand Down
51 changes: 51 additions & 0 deletions aws-xray-agent-benchmark/results/2.8.x/jmh/auto-instrumentation.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
Benchmark Mode Cnt Score Error Units
AwsSdkBenchmark.awsV1Request thrpt 5 0.411 ± 0.007 ops/ms
AwsSdkBenchmark.awsV2Request thrpt 5 0.400 ± 0.010 ops/ms
HttpDownstreamBenchmark.makeHttpRequest thrpt 5 0.418 ± 0.007 ops/ms
ServletBenchmark.serviceRequest thrpt 5 0.453 ± 0.046 ops/ms
SqlBenchmark.sqlQuery thrpt 5 0.468 ± 0.003 ops/ms
AwsSdkBenchmark.awsV1Request sample 2060 2.426 ± 0.005 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.00 sample 2.339 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.50 sample 2.417 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.90 sample 2.466 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.95 sample 2.499 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.99 sample 2.593 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.999 sample 3.751 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.9999 sample 4.325 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p1.00 sample 4.325 ms/op
AwsSdkBenchmark.awsV2Request sample 2011 2.487 ± 0.004 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.00 sample 2.396 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.50 sample 2.478 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.90 sample 2.523 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.95 sample 2.553 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.99 sample 2.671 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.999 sample 3.070 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.9999 sample 3.506 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p1.00 sample 3.506 ms/op
HttpDownstreamBenchmark.makeHttpRequest sample 2091 2.391 ± 0.020 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.00 sample 2.310 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.50 sample 2.372 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.90 sample 2.417 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.95 sample 2.445 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.99 sample 2.577 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.999 sample 9.083 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.9999 sample 10.043 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p1.00 sample 10.043 ms/op
ServletBenchmark.serviceRequest sample 2274 2.199 ± 0.067 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.00 sample 2.163 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.50 sample 2.175 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.90 sample 2.187 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.95 sample 2.195 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.99 sample 2.225 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.999 sample 2.343 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.9999 sample 48.628 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p1.00 sample 48.628 ms/op
SqlBenchmark.sqlQuery sample 2345 2.132 ± 0.001 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.00 sample 2.091 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.50 sample 2.130 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.90 sample 2.138 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.95 sample 2.142 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.99 sample 2.214 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.999 sample 2.273 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.9999 sample 2.281 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p1.00 sample 2.281 ms/op
51 changes: 51 additions & 0 deletions aws-xray-agent-benchmark/results/2.8.x/jmh/no-instrumentation.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
Benchmark Mode Cnt Score Error Units
AwsSdkBenchmark.awsV1Request thrpt 5 0.425 ± 0.008 ops/ms
AwsSdkBenchmark.awsV2Request thrpt 5 0.417 ± 0.005 ops/ms
HttpDownstreamBenchmark.makeHttpRequest thrpt 5 0.428 ± 0.014 ops/ms
ServletBenchmark.serviceRequest thrpt 5 0.482 ± 0.002 ops/ms
SqlBenchmark.sqlQuery thrpt 5 0.484 ± 0.002 ops/ms
AwsSdkBenchmark.awsV1Request sample 2120 2.358 ± 0.003 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.00 sample 2.281 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.50 sample 2.351 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.90 sample 2.396 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.95 sample 2.441 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.99 sample 2.519 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.999 sample 2.711 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.9999 sample 2.867 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p1.00 sample 2.867 ms/op
AwsSdkBenchmark.awsV2Request sample 2086 2.397 ± 0.009 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.00 sample 2.327 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.50 sample 2.388 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.90 sample 2.430 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.95 sample 2.462 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.99 sample 2.568 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.999 sample 3.064 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.9999 sample 7.569 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p1.00 sample 7.569 ms/op
HttpDownstreamBenchmark.makeHttpRequest sample 2138 2.337 ± 0.018 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.00 sample 2.265 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.50 sample 2.322 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.90 sample 2.359 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.95 sample 2.376 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.99 sample 2.448 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.999 sample 9.182 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.9999 sample 10.142 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p1.00 sample 10.142 ms/op
ServletBenchmark.serviceRequest sample 2414 2.072 ± 0.001 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.00 sample 2.032 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.50 sample 2.071 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.90 sample 2.079 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.95 sample 2.091 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.99 sample 2.101 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.999 sample 2.124 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.9999 sample 2.359 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p1.00 sample 2.359 ms/op
SqlBenchmark.sqlQuery sample 2419 2.069 ± 0.008 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.00 sample 2.019 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.50 sample 2.064 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.90 sample 2.071 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.95 sample 2.075 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.99 sample 2.093 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.999 sample 2.166 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.9999 sample 8.012 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p1.00 sample 8.012 ms/op
51 changes: 51 additions & 0 deletions aws-xray-agent-benchmark/results/2.8.x/jmh/sdk-instrumentation.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
Benchmark Mode Cnt Score Error Units
AwsSdkBenchmark.awsV1Request thrpt 5 0.419 ± 0.007 ops/ms
AwsSdkBenchmark.awsV2Request thrpt 5 0.413 ± 0.008 ops/ms
HttpDownstreamBenchmark.makeHttpRequest thrpt 5 0.425 ± 0.002 ops/ms
ServletBenchmark.serviceRequest thrpt 5 0.459 ± 0.015 ops/ms
SqlBenchmark.sqlQuery thrpt 5 0.466 ± 0.014 ops/ms
AwsSdkBenchmark.awsV1Request sample 2092 2.389 ± 0.008 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.00 sample 2.298 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.50 sample 2.380 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.90 sample 2.425 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.95 sample 2.470 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.99 sample 2.528 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.999 sample 3.631 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p0.9999 sample 6.619 ms/op
AwsSdkBenchmark.awsV1Request:awsV1Request·p1.00 sample 6.619 ms/op
AwsSdkBenchmark.awsV2Request sample 2065 2.421 ± 0.010 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.00 sample 2.335 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.50 sample 2.413 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.90 sample 2.462 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.95 sample 2.482 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.99 sample 2.564 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.999 sample 3.754 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p0.9999 sample 7.897 ms/op
AwsSdkBenchmark.awsV2Request:awsV2Request·p1.00 sample 7.897 ms/op
HttpDownstreamBenchmark.makeHttpRequest sample 2129 2.348 ± 0.021 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.00 sample 2.265 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.50 sample 2.327 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.90 sample 2.363 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.95 sample 2.388 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.99 sample 2.465 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.999 sample 9.896 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p0.9999 sample 11.158 ms/op
HttpDownstreamBenchmark.makeHttpRequest:makeHttpRequest·p1.00 sample 11.158 ms/op
ServletBenchmark.serviceRequest sample 2298 2.175 ± 0.032 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.00 sample 2.142 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.50 sample 2.154 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.90 sample 2.208 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.95 sample 2.249 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.99 sample 2.269 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.999 sample 2.411 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p0.9999 sample 24.150 ms/op
ServletBenchmark.serviceRequest:serviceRequest·p1.00 sample 24.150 ms/op
SqlBenchmark.sqlQuery sample 2324 2.153 ± 0.036 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.00 sample 2.093 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.50 sample 2.138 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.90 sample 2.179 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.95 sample 2.204 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.99 sample 2.241 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.999 sample 2.377 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p0.9999 sample 27.361 ms/op
SqlBenchmark.sqlQuery:sqlQuery·p1.00 sample 27.361 ms/op
5 changes: 3 additions & 2 deletions build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
val discoVersion by extra("0.10.0")

subprojects {
version = "2.7.1"
version = "2.8.0"
group = "com.amazonaws"

repositories {
Expand Down Expand Up @@ -44,7 +44,7 @@ subprojects {

dependencies {
// BOMs for common projects
add("implementation", platform("com.amazonaws:aws-xray-recorder-sdk-bom:2.7.1"))
add("implementation", platform("com.amazonaws:aws-xray-recorder-sdk-bom:${version}"))
add("implementation", platform("software.amazon.disco:disco-toolkit-bom:${discoVersion}"))
add("implementation", platform("com.fasterxml.jackson:jackson-bom:2.11.0"))
add("implementation", platform("com.amazonaws:aws-java-sdk-bom:1.11.837"))
Expand All @@ -57,6 +57,7 @@ subprojects {
add("testImplementation", "junit:junit:4.12")
add("testImplementation", "org.assertj:assertj-core:3.16.1")
add("testImplementation", "org.mockito:mockito-core:2.28.2")
add("testImplementation", "org.checkerframework:checker-qual:3.4.1")
}
}

Expand Down

0 comments on commit 962164a

Please sign in to comment.