Micronaut 4.x instrumentation

.buildkite/README.md

@@ -0,0 +1,21 @@
+# Buildkite
+
+This README provides an overview of the Buildkite pipeline used to automate the build and publishing process.
+
+## Release pipeline
+
+This is the Buildkite pipeline for releasing the APM Agent Java.
+
+### Pipeline Configuration
+
+To view the pipeline and its configuration, click [here](https://buildkite.com/elastic/apm-agent-java-release) or
+go to the definition in the `elastic/ci` repository.
+
+## Snapshot pipeline
+
+This is the Buildkite pipeline for the APM Agent java in charge of the snaposhots.
+
+### Pipeline Configuration
+
+To view the pipeline and its configuration, click [here](https://buildkite.com/elastic/apm-agent-java-snapshot) or
+go to the definition in the `elastic/ci` repository.

.buildkite/load-testing.yml

@@ -0,0 +1,4 @@
+# @reakaleek: This is a place holder to create the pipeline in Buildkite. I will work on it, in a follow-up.
+steps:
+  - label: ":wave: Greetings"            # Label (with rich emojis https://ela.st/bk-emoji).
+    command: "echo 'My first pipeline!'" # Command to run (evaluated by Bash).

.github/dependabot.yml

@@ -33,8 +33,6 @@ updates:
       - dependency-name: "com.datastax.oss:java-driver-core"
       - dependency-name: "io.micrometer:*"
       - dependency-name: "redis.clients:*"
-      - dependency-name: "org.elasticsearch.client:*"
-      - dependency-name: "co.elastic.clients:*"
       - dependency-name: "io.vertx:*"
       - dependency-name: "org.apache.logging.log4j:*"
       - dependency-name: "org.springframework.boot:*"

.github/workflows/README.md

@@ -0,0 +1,50 @@
+## CI/CD
+
+There are 4 main stages that run on GitHub actions:
+
+* Build
+* Unit Test
+* Integration Test
+* Release
+
+There are some other stages that run for every push on the main branches:
+
+* [Microbenchmark](./microbenchmark.yml)
+* [Snapshoty](./snapshoty.yml)
+* [Sync-branches](./sync-branches.yml)
+
+### Scenarios
+
+* Tests should be triggered on branch, tag and PR basis.
+* Commits that are only affecting the docs files should not trigger any test or similar stages that are not required.
+* Automated release in the CI gets triggered through a GitHub workflow.
+* **This is not the case yet**, but if Github secrets are required then Pull Requests from forked repositories won't run any build accessing those secrets. If needed, then create a feature branch (opened directly on the upstream project).
+
+### How to interact with the CI?
+
+#### On a PR basis
+
+Once a PR has been opened then there are two different ways you can trigger builds in the CI:
+
+1. Git commit based
+1. UI based, any Elasticians can force a build through the GitHub UI
+
+#### Branches
+
+Every time there is a merge to main or any branches the whole workflow will compile and test on Linux and Windows.
+
+### Release process
+
+This process has been fully automated and it gets triggered manually when running the [release](https://github.com/elastic/apm-agent-java/actions/workflows/release.yml) workflow. It runs then a Buildkite pipeline in charge of generating and publishing the artifacts,
+for further details please go to [the buildkite folder](../../.buildkite/README.md).
+
+The tag release follows the naming convention: `v.<major>.<minor>.<patch>`, where `<major>`, `<minor>` and `<patch>`.
+
+### OpenTelemetry
+
+There is a GitHub workflow in charge to populate what the workflow run in terms of jobs and steps. Those details can be seen in [here](https://ela.st/oblt-ci-cd-stats) (**NOTE**: only available for Elasticians).
+
+## Bump automation
+
+[updatecli](https://www.updatecli.io/) is the tool we use to automatically update the specs
+the [APM agents](./updatecli.yml) use.

.github/workflows/main.yml

@@ -176,6 +176,18 @@ jobs:
         with:
           name: build
           path: ${{ github.workspace }}
+      # As long as there are some space issues with the CI runners.
+      - name: Free Disk Space
+        continue-on-error: true
+        uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8
+        with:
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: true
+          tool-cache: false
       - uses: ./.github/workflows/maven-goal
         with:
           command: ./mvnw -q -P ci-non-application-server-integration-tests verify
@@ -205,7 +217,8 @@ jobs:
           path: ${{ github.workspace }}
       # As long as there are some space issues with the CI runners.
       - name: Free Disk Space
-        uses: jlumbroso/free-disk-space@0add001504c51b93b35ac8e81d252bdd47e4ef07
+        continue-on-error: true
+        uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8
         with:
           android: true
           dotnet: true
@@ -283,7 +296,7 @@ jobs:
             distribution: 'temurin'
           - version: 20
             distribution: 'temurin'
-          - version: 21-ea
+          - version: 21
             distribution: 'zulu'
     steps:
       - uses: actions/checkout@v3

.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

.mergify.yml

@@ -0,0 +1,14 @@
+queue_rules:
+  - name: default
+  # merge method needs to be set to 'squash' to match the repository config
+    merge_method: squash
+  # branch protection rules are automatically included, no extra rule needed for now
+
+pull_request_rules:
+  - name: Automatic squash and merge on approval with success checks and ready-to-merge label
+    conditions:
+      - label=ready-to-merge
+      - base=main
+    actions:
+      queue:
+        name: default

CHANGELOG.asciidoc

@@ -33,18 +33,35 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:
 
 [float]
 ===== Bug fixes
-* Prevent bad serialization in edge cases for span compression - {pull}3293[#3293]
-* Allow overriding of transaction type for Servlet-API transactions - {pull}3226[#3226]
-* Fix micrometer histogram serialization - {pull}3290[#3290], {pull}3304[#3304]
-* Fix transactions not being correctly handled in certain edge cases - {pull}3294[#3294]
+* Fixed too many spans being created for `HTTPUrlConnection` requests with method `HEAD` - {pull}3353[#3353]
+
+===== Features
+* Support for micronaut 4.x
+
+[[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]
 * Added `baggage_to_attach` config option to allow automatic lifting of baggage into transaction, span and error attributes - {pull}3288[#3288], {pull}3289[#3289]
+* Exclude elasticsearch 8.10 and newer clients from instrumentation because they natively support OpenTelemetry  - {pull}3303[#3303]
+* Switched to OpenTelemetry compatible context propagation for Kafka - {pull}3300[#3300]
+* Changed `cloud.project.id` collected in Google Cloud (GCP) to be the `project-id` - {issues}3311[#3311]
+* Allow running the IntelliJ debug agent in parallel - {pull}3315[#3315]
+* Capture `span.sync` = `false` for ES restclient async spans plugins
 
-[[release-notes-1.x]]
-=== Java Agent version 1.x
+[float]
+===== Bug fixes
+* Prevent bad serialization in edge cases for span compression - {pull}3293[#3293]
+* Allow overriding of transaction type for Servlet-API transactions - {pull}3226[#3226]
+* Fix micrometer histogram serialization - {pull}3290[#3290], {pull}3304[#3304]
+* Fix transactions not being correctly handled in certain edge cases - {pull}3294[#3294]
+* Fixed JDBC instrumentation for DB2 - {pull}3313[#3313]
+* Fixed OpenTelemetry metrics export breaking when `instrument=false` is configured - {pull}3326[#3326]
 
 [[release-notes-1.42.0]]
 ==== 1.42.0 - 2023/08/11

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>

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>
 
@@ -56,6 +56,13 @@
             <version>${version.bouncy-castle.bc-fips}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <!-- required for the inherited assertJ and Mockito dependencies-->
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy-dep</artifactId>
+            <version>${version.byte-buddy}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

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>

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>

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>

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>

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>

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>
 
@@ -262,6 +262,11 @@
             <artifactId>apm-micrometer-plugin</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>apm-micronaut-plugin</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>apm-mongodb3-plugin</artifactId>

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>
 

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>
 

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>