Merge remote-tracking branch 'upstream/main' into es-sync-attribute

elastic · Sep 28, 2023 · 21c6ea1 · 21c6ea1
2 parents 3bbaa0a + fd8c224
commit 21c6ea1
Show file tree

Hide file tree

Showing 198 changed files with 203 additions and 198 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -86,7 +86,7 @@ jobs:
 
   maven_central_deploy:
     name: "Deploy to Maven Central (Buildkite)"
-    if: ${{ ! inputs.skip_maven_deploy }}
+    if: ${{ ! inputs.skip_maven_deploy && ( inputs.skip_preparation || success() ) }}
     runs-on: ubuntu-latest
     needs:
       - prepare_release

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -31,6 +31,12 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:
 
 === Unreleased
 
+[[release-notes-1.x]]
+=== Java Agent version 1.x
+
+[[release-notes-1.43.0]]
+==== 1.43.0 - 2023/09/26
+
 [float]
 ===== Features
 * Add support for Elasticsearch client 8.9 - {pull}3283[#3283]
@@ -50,9 +56,6 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:
 * Fixed JDBC instrumentation for DB2 - {pull}3313[#3313]
 * Fixed OpenTelemetry metrics export breaking when `instrument=false` is configured - {pull}3326[#3326]
 
-[[release-notes-1.x]]
-=== Java Agent version 1.x
-
 [[release-notes-1.42.0]]
 ==== 1.42.0 - 2023/08/11
 

diff --git a/apm-agent-api/pom.xml b/apm-agent-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-agent-api</artifactId>

diff --git a/apm-agent-attach-cli/pom.xml b/apm-agent-attach-cli/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/apm-agent-attach/pom.xml b/apm-agent-attach/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-agent-attach</artifactId>

diff --git a/apm-agent-benchmarks/pom.xml b/apm-agent-benchmarks/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-agent-benchmarks</artifactId>

diff --git a/apm-agent-bootstrap/pom.xml b/apm-agent-bootstrap/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-agent-bootstrap</artifactId>

diff --git a/apm-agent-builds/apm-agent-java8/pom.xml b/apm-agent-builds/apm-agent-java8/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>co.elastic.apm</groupId>
         <artifactId>apm-agent-builds</artifactId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-agent-java8</artifactId>

diff --git a/apm-agent-builds/apm-agent/pom.xml b/apm-agent-builds/apm-agent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>co.elastic.apm</groupId>
         <artifactId>apm-agent-builds</artifactId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-agent</artifactId>

diff --git a/apm-agent-builds/pom.xml b/apm-agent-builds/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/apm-agent-cached-lookup-key/pom.xml b/apm-agent-cached-lookup-key/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/apm-agent-common/pom.xml b/apm-agent-common/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/apm-agent-core/pom.xml b/apm-agent-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-agent-core</artifactId>

diff --git a/apm-agent-lambda-layer/pom.xml b/apm-agent-lambda-layer/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/apm-agent-plugin-sdk/pom.xml b/apm-agent-plugin-sdk/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-parent</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/apm-agent-plugins/apm-apache-httpclient/apm-apache-httpclient3-plugin/pom.xml b/apm-agent-plugins/apm-apache-httpclient/apm-apache-httpclient3-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-apache-httpclient</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-apache-httpclient3-plugin</artifactId>

diff --git a/apm-agent-plugins/apm-apache-httpclient/apm-apache-httpclient4-plugin/pom.xml b/apm-agent-plugins/apm-apache-httpclient/apm-apache-httpclient4-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-apache-httpclient</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-apache-httpclient4-plugin</artifactId>

diff --git a/apm-agent-plugins/apm-apache-httpclient/pom.xml b/apm-agent-plugins/apm-apache-httpclient/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-plugins</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-apache-httpclient</artifactId>

diff --git a/apm-agent-plugins/apm-api-plugin/pom.xml b/apm-agent-plugins/apm-api-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-plugins</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/apm-agent-plugins/apm-asynchttpclient-plugin/pom.xml b/apm-agent-plugins/apm-asynchttpclient-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-plugins</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-asynchttpclient-plugin</artifactId>

diff --git a/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-1-plugin/pom.xml b/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-1-plugin/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-aws-sdk</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/pom.xml b/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-2-plugin/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-aws-sdk</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-common/pom.xml b/apm-agent-plugins/apm-aws-sdk/apm-aws-sdk-common/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-aws-sdk</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/apm-agent-plugins/apm-aws-sdk/pom.xml b/apm-agent-plugins/apm-aws-sdk/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-plugins</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/apm-agent-plugins/apm-awslambda-plugin/pom.xml b/apm-agent-plugins/apm-awslambda-plugin/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-plugins</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/apm-agent-plugins/apm-cassandra/apm-cassandra-core-plugin/pom.xml b/apm-agent-plugins/apm-cassandra/apm-cassandra-core-plugin/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-cassandra</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/apm-agent-plugins/apm-cassandra/apm-cassandra3-plugin/pom.xml b/apm-agent-plugins/apm-cassandra/apm-cassandra3-plugin/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-cassandra</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/apm-agent-plugins/apm-cassandra/apm-cassandra4-plugin/pom.xml b/apm-agent-plugins/apm-cassandra/apm-cassandra4-plugin/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-cassandra</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/apm-agent-plugins/apm-cassandra/pom.xml b/apm-agent-plugins/apm-cassandra/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-plugins</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/apm-agent-plugins/apm-dubbo-plugin/pom.xml b/apm-agent-plugins/apm-dubbo-plugin/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-agent-plugins</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/apm-agent-plugins/apm-ecs-logging-plugin/pom.xml b/apm-agent-plugins/apm-ecs-logging-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-plugins</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-ecs-logging-plugin</artifactId>

diff --git a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/pom.xml b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-5_6/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-es-restclient-plugin</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-es-restclient-plugin-5_6</artifactId>

diff --git a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/pom.xml b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-6_4/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-es-restclient-plugin</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-es-restclient-plugin-6_4</artifactId>

diff --git a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-7_x/pom.xml b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-7_x/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-es-restclient-plugin</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-es-restclient-plugin-7_x</artifactId>

diff --git a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-8_x/pom.xml b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-8_x/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apm-es-restclient-plugin</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-common/pom.xml b/apm-agent-plugins/apm-es-restclient-plugin/apm-es-restclient-plugin-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-es-restclient-plugin</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-es-restclient-plugin-common</artifactId>

diff --git a/apm-agent-plugins/apm-es-restclient-plugin/pom.xml b/apm-agent-plugins/apm-es-restclient-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-plugins</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-es-restclient-plugin</artifactId>

diff --git a/apm-agent-plugins/apm-finagle-httpclient-plugin/pom.xml b/apm-agent-plugins/apm-finagle-httpclient-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-plugins</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-finagle-httpclient-plugin</artifactId>

diff --git a/apm-agent-plugins/apm-grails-plugin/pom.xml b/apm-agent-plugins/apm-grails-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>apm-agent-plugins</artifactId>
         <groupId>co.elastic.apm</groupId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-grails-plugin</artifactId>

diff --git a/apm-agent-plugins/apm-grpc/apm-grpc-plugin/pom.xml b/apm-agent-plugins/apm-grpc/apm-grpc-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>co.elastic.apm</groupId>
         <artifactId>apm-grpc</artifactId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-grpc-plugin</artifactId>

diff --git a/apm-agent-plugins/apm-grpc/apm-grpc-test-1.6.1/pom.xml b/apm-agent-plugins/apm-grpc/apm-grpc-test-1.6.1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>co.elastic.apm</groupId>
         <artifactId>apm-grpc</artifactId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-grpc-test-1.6.1</artifactId>

diff --git a/apm-agent-plugins/apm-grpc/apm-grpc-test-latest/pom.xml b/apm-agent-plugins/apm-grpc/apm-grpc-test-latest/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>co.elastic.apm</groupId>
         <artifactId>apm-grpc</artifactId>
-        <version>1.42.1-SNAPSHOT</version>
+        <version>1.43.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apm-grpc-test-latest</artifactId>