Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions CHANGELOG.next-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ This file contains all changes which are not released yet.

# Fixes
<!--FIXES-START-->
* Fix async httpclient 5.x instrumentation - [#4185](https://github.com/elastic/apm-agent-java/pull/4185)
* Prevent `FileSystemAlreadyExistsException` on single-jar application startup - [#4204](https://github.com/elastic/apm-agent-java/pull/4204)
* Improve SQS async transaction handling to be better with flux flow - [#4205](https://github.com/elastic/apm-agent-java/pull/4205)

<!--FIXES-END-->
# Features and enhancements
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-agent-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-attach-cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-attach/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-agent-attach</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-benchmarks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-agent-benchmarks</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-bootstrap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-agent-bootstrap</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-builds/apm-agent-java8/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>co.elastic.apm</groupId>
<artifactId>apm-agent-builds</artifactId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-agent-java8</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-builds/apm-agent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>co.elastic.apm</groupId>
<artifactId>apm-agent-builds</artifactId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-agent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-builds/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-cached-lookup-key/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-agent-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-lambda-layer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugin-sdk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-agent-parent</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-apache-httpclient</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-apache-httpclient-common</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-apache-httpclient</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-apache-httpclient3-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-apache-httpclient</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-apache-httpclient4-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>co.elastic.apm</groupId>
<artifactId>apm-apache-httpclient</artifactId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-apache-httpclient5-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-apache-httpclient/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-agent-plugins</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-apache-httpclient</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-api-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-agent-plugins</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-asynchttpclient-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-agent-plugins</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-asynchttpclient-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-aws-sdk</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-aws-sdk</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-aws-sdk</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-aws-sdk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-agent-plugins</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-awslambda-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-agent-plugins</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-cassandra</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-cassandra</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-cassandra</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-cassandra/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-agent-plugins</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-dubbo-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-agent-plugins</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-ecs-logging-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-agent-plugins</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-ecs-logging-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-es-restclient-plugin</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-es-restclient-plugin-5_6</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-es-restclient-plugin</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-es-restclient-plugin-6_4</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-es-restclient-plugin</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-es-restclient-plugin-7_x</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>apm-es-restclient-plugin</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-es-restclient-plugin</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-es-restclient-plugin-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-es-restclient-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-agent-plugins</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-es-restclient-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-finagle-httpclient-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-agent-plugins</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-finagle-httpclient-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-grails-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-agent-plugins</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-grails-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-grpc/apm-grpc-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>co.elastic.apm</groupId>
<artifactId>apm-grpc</artifactId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-grpc-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-grpc/apm-grpc-test-1.6.1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>co.elastic.apm</groupId>
<artifactId>apm-grpc</artifactId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-grpc-test-1.6.1</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-grpc/apm-grpc-test-latest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>co.elastic.apm</groupId>
<artifactId>apm-grpc</artifactId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-grpc-test-latest</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-grpc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>co.elastic.apm</groupId>
<artifactId>apm-agent-plugins</artifactId>
<version>1.55.1-SNAPSHOT</version>
<version>1.55.1</version>
</parent>

<artifactId>apm-grpc</artifactId>
Expand Down
Loading
Loading