Skip to content

Revert changes created by failed release #3179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 13, 2023
Merged

Revert changes created by failed release #3179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 5 additions & 7 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:

=== Unreleased

[[release-notes-1.x]]
=== Java Agent version 1.x

[[release-notes-1.39.0]]
==== 1.39.0 - 2023/06/13

[float]
===== Features
* Capture S3 operation details as OTel attributes - {pull}3136[#3136]
Expand All @@ -50,6 +44,10 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:
* Handled an edge case where exceptions thrown by instrumentation code could escape into the application - {pull}3159[#3159]
* Added guard to gracefully handle the presence of pre 3.0 Servlet API versions in the spring service name discovery mechanism - {pull}3172[#3172]


[[release-notes-1.x]]
=== Java Agent version 1.x

[[release-notes-1.38.0]]
==== 1.38.0 - 2023/05/04

Expand Down Expand Up @@ -1659,4 +1657,4 @@ Transactions are named based on your resources (`ResourceClass#resourceMethod`).
you will still want to set the `service_name` explicitly.
But it helps getting started and seeing data easier,
as there are no required configuration options anymore.
In the future we will most likely determine more useful application names for Servlet API-based applications.
In the future we will most likely determine more useful application names for Servlet API-based applications.
2 changes: 1 addition & 1 deletion apm-agent-api/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-agent-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-attach-cli/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-attach/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-agent-attach</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-benchmarks/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-agent-benchmarks</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-bootstrap/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-agent-bootstrap</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-builds/apm-agent-java8/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-agent-java8</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-builds/apm-agent/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-agent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-builds/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-cached-lookup-key/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-common/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-core/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-agent-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugin-sdk/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-apache-httpclient/apm-apache-httpclient3-plugin/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-apache-httpclient3-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-apache-httpclient/apm-apache-httpclient4-plugin/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-apache-httpclient4-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-apache-httpclient/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-apache-httpclient</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-api-plugin/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-asynchttpclient-plugin/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-asynchttpclient-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-1-plugin/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</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
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-aws-sdk/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-awslambda-plugin/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-cassandra/apm-cassandra-core-plugin/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-cassandra/apm-cassandra3-plugin/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-cassandra/apm-cassandra4-plugin/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-cassandra/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-dubbo-plugin/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-ecs-logging-plugin/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-ecs-logging-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-es-restclient-plugin/apm-es-api-client-test/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-es-restclient-plugin-5_6</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-es-restclient-plugin-6_4</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-7_x/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-es-restclient-plugin-7_x</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-common/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</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
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</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
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-finagle-httpclient-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-grails-plugin/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</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
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</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
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</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
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-grpc-test-latest</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-grpc/pom.xml
View file
Open in desktop
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.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-grpc</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-5_x/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>apm-hibernate-search-plugin</artifactId>
<groupId>co.elastic.apm</groupId>
<version>1.39.1-SNAPSHOT</version>
<version>1.38.1-SNAPSHOT</version>
</parent>

<artifactId>apm-hibernate-search-plugin-5_x</artifactId>
Expand Down
Loading