From 44d20740a9ff089463696ee529496f068d6166ae Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 13:37:23 +0200 Subject: [PATCH 01/64] post release: ecs-logging-java v1.7.0 (#324) Co-authored-by: obltmachine --- ecs-logging-core/pom.xml | 2 +- jboss-logmanager-ecs-formatter/pom.xml | 2 +- jul-ecs-formatter/pom.xml | 2 +- log4j-ecs-layout/pom.xml | 2 +- log4j-legacy-tests/pom.xml | 2 +- log4j2-ecs-layout/pom.xml | 2 +- log4j2-legacy-tests/pom.xml | 2 +- logback-ecs-encoder/pom.xml | 2 +- logback-legacy-tests/pom.xml | 2 +- pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ecs-logging-core/pom.xml b/ecs-logging-core/pom.xml index 4834d4d..31363c9 100644 --- a/ecs-logging-core/pom.xml +++ b/ecs-logging-core/pom.xml @@ -3,7 +3,7 @@ ecs-logging-java-parent co.elastic.logging - 1.7.0 + 1.7.1-SNAPSHOT 4.0.0 diff --git a/jboss-logmanager-ecs-formatter/pom.xml b/jboss-logmanager-ecs-formatter/pom.xml index b321652..0d1258e 100644 --- a/jboss-logmanager-ecs-formatter/pom.xml +++ b/jboss-logmanager-ecs-formatter/pom.xml @@ -3,7 +3,7 @@ ecs-logging-java-parent co.elastic.logging - 1.7.0 + 1.7.1-SNAPSHOT 4.0.0 diff --git a/jul-ecs-formatter/pom.xml b/jul-ecs-formatter/pom.xml index 1a76b20..85e8299 100644 --- a/jul-ecs-formatter/pom.xml +++ b/jul-ecs-formatter/pom.xml @@ -3,7 +3,7 @@ ecs-logging-java-parent co.elastic.logging - 1.7.0 + 1.7.1-SNAPSHOT 4.0.0 diff --git a/log4j-ecs-layout/pom.xml b/log4j-ecs-layout/pom.xml index 4d73cdf..1303a16 100644 --- a/log4j-ecs-layout/pom.xml +++ b/log4j-ecs-layout/pom.xml @@ -3,7 +3,7 @@ ecs-logging-java-parent co.elastic.logging - 1.7.0 + 1.7.1-SNAPSHOT 4.0.0 diff --git a/log4j-legacy-tests/pom.xml b/log4j-legacy-tests/pom.xml index cc40205..baf8162 100644 --- a/log4j-legacy-tests/pom.xml +++ b/log4j-legacy-tests/pom.xml @@ -3,7 +3,7 @@ ecs-logging-java-parent co.elastic.logging - 1.7.0 + 1.7.1-SNAPSHOT 4.0.0 diff --git a/log4j2-ecs-layout/pom.xml b/log4j2-ecs-layout/pom.xml index 56d610c..ea09d12 100644 --- a/log4j2-ecs-layout/pom.xml +++ b/log4j2-ecs-layout/pom.xml @@ -3,7 +3,7 @@ ecs-logging-java-parent co.elastic.logging - 1.7.0 + 1.7.1-SNAPSHOT 4.0.0 diff --git a/log4j2-legacy-tests/pom.xml b/log4j2-legacy-tests/pom.xml index 0aba3ee..b222a7f 100644 --- a/log4j2-legacy-tests/pom.xml +++ b/log4j2-legacy-tests/pom.xml @@ -3,7 +3,7 @@ ecs-logging-java-parent co.elastic.logging - 1.7.0 + 1.7.1-SNAPSHOT 4.0.0 diff --git a/logback-ecs-encoder/pom.xml b/logback-ecs-encoder/pom.xml index c03fa44..c0bb147 100644 --- a/logback-ecs-encoder/pom.xml +++ b/logback-ecs-encoder/pom.xml @@ -3,7 +3,7 @@ ecs-logging-java-parent co.elastic.logging - 1.7.0 + 1.7.1-SNAPSHOT 4.0.0 diff --git a/logback-legacy-tests/pom.xml b/logback-legacy-tests/pom.xml index 1a61ad2..d24c20c 100644 --- a/logback-legacy-tests/pom.xml +++ b/logback-legacy-tests/pom.xml @@ -3,7 +3,7 @@ ecs-logging-java-parent co.elastic.logging - 1.7.0 + 1.7.1-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index baeccd3..f651fdf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ co.elastic.logging ecs-logging-java-parent - 1.7.0 + 1.7.1-SNAPSHOT ${project.groupId}:${project.artifactId} ecs-logging-core From dcdb676bf600b94f78c257248c4f608f22681848 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 May 2025 10:34:57 +0200 Subject: [PATCH 02/64] build(deps): bump the github-actions group across 1 directory with 2 updates (#326) Bumps the github-actions group with 2 updates in the / directory: [actions/attest-build-provenance](https://github.com/actions/attest-build-provenance) and [docker/login-action](https://github.com/docker/login-action). Updates `actions/attest-build-provenance` from 2.2.3 to 2.3.0 - [Release notes](https://github.com/actions/attest-build-provenance/releases) - [Changelog](https://github.com/actions/attest-build-provenance/blob/main/RELEASE.md) - [Commits](https://github.com/actions/attest-build-provenance/compare/c074443f1aee8d4aeeae555aebba3282517141b2...db473fddc028af60658334401dc6fa3ffd8669fd) Updates `docker/login-action` from 3.3.0 to 3.4.0 - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/9780b0c442fbb1117ed29e0efdff1e18412f7567...74a5d142397b4f367a81961eba4e8cd7edddf772) --- updated-dependencies: - dependency-name: actions/attest-build-provenance dependency-version: 2.3.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: docker/login-action dependency-version: 3.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release-step-3.yml | 2 +- .github/workflows/snapshot.yml | 2 +- .github/workflows/updatecli.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-step-3.yml b/.github/workflows/release-step-3.yml index d68957e..e2a5e11 100644 --- a/.github/workflows/release-step-3.yml +++ b/.github/workflows/release-step-3.yml @@ -96,7 +96,7 @@ jobs: run: tar xvf ${{ env.TARBALL_FILE }} - name: generate build provenance - uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3 + uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0 with: subject-path: "${{ github.workspace }}/**/target/*.jar" diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 83060cb..504f895 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -66,7 +66,7 @@ jobs: run: tar xvf ${{ env.TARBALL_FILE }} - name: generate build provenance - uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3 + uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0 with: subject-path: "${{ github.workspace }}/**/target/*.jar" diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml index 739fd40..384a3dc 100644 --- a/.github/workflows/updatecli.yml +++ b/.github/workflows/updatecli.yml @@ -29,7 +29,7 @@ jobs: "pull_requests": "write" } - - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 + - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 with: registry: ghcr.io username: ${{ github.actor }} From 953c1ccfca2b76557ba60a76683c228c40986554 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Wed, 7 May 2025 10:35:31 +0200 Subject: [PATCH 03/64] deps: Bump updatecli version to v0.99.0 (#325) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: deps(updatecli): Bump updatecli version to v0.98.0 Made with ❤️️ by updatecli * chore: deps(updatecli): Bump updatecli version to v0.99.0 Made with ❤️️ by updatecli --------- Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index a744ca6..0b4ee78 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.96.0 \ No newline at end of file +updatecli v0.99.0 \ No newline at end of file From 8324e3ac323ed346107a87a55a8323fa710692f5 Mon Sep 17 00:00:00 2001 From: Colleen McGinnis Date: Thu, 15 May 2025 15:25:39 -0500 Subject: [PATCH 04/64] add products to docset.yml (#329) --- docs/docset.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/docset.yml b/docs/docset.yml index 4e923a6..abb8471 100644 --- a/docs/docset.yml +++ b/docs/docset.yml @@ -1,4 +1,6 @@ project: 'ECS Logging Java' +products: + - id: ecs-logging cross_links: - apm-agent-java - beats From 8f9b5dedf5ee367afc2798256bba7505103ba0f2 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 22 May 2025 12:45:09 +0200 Subject: [PATCH 05/64] github-action: add catalog-validate for GitHub actions (#328) --- .github/workflows/catalog-info.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/catalog-info.yml diff --git a/.github/workflows/catalog-info.yml b/.github/workflows/catalog-info.yml new file mode 100644 index 0000000..47103e0 --- /dev/null +++ b/.github/workflows/catalog-info.yml @@ -0,0 +1,24 @@ +--- +name: catalog-info + +on: + pull_request: + branches: + - main + paths: + - 'catalog-info.yaml' + +permissions: + contents: read + +jobs: + validate: + runs-on: ubuntu-latest + permissions: + contents: read + packages: read + steps: + - uses: actions/checkout@v4 + + - uses: elastic/oblt-actions/elastic/validate-catalog@v1 + From 09f05a4e6e545397174ae64d55f48a022afc9d3b Mon Sep 17 00:00:00 2001 From: SylvainJuge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 3 Jun 2025 18:34:26 +0200 Subject: [PATCH 06/64] add reviewers to codeowners (#333) --- .github/CODEOWNERS | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..e0e051d --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,3 @@ +/.github/actions/ @elastic/apm-agent-java @elastic/observablt-ci +/.github/workflows/ @elastic/apm-agent-java @elastic/observablt-ci +* @elastic/apm-agent-java From 309f80bb1bf9b104d501048f27044fe06ddf38a8 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Mon, 9 Jun 2025 15:26:26 +0200 Subject: [PATCH 07/64] chore: deps(updatecli): Bump updatecli version to v0.101.0 (#335) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 0b4ee78..3046933 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.99.0 \ No newline at end of file +updatecli v0.101.0 \ No newline at end of file From af1ef0da9dfc0c49bd304c8fa298a9609d513ae0 Mon Sep 17 00:00:00 2001 From: SylvainJuge <763082+SylvainJuge@users.noreply.github.com> Date: Mon, 9 Jun 2025 16:23:39 +0200 Subject: [PATCH 08/64] fix codeowners ordering (#336) --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e0e051d..5140e09 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1,3 @@ +* @elastic/apm-agent-java /.github/actions/ @elastic/apm-agent-java @elastic/observablt-ci /.github/workflows/ @elastic/apm-agent-java @elastic/observablt-ci -* @elastic/apm-agent-java From ada8aae4b64decee4e68207f7be9f9838fd188cd Mon Sep 17 00:00:00 2001 From: SylvainJuge <763082+SylvainJuge@users.noreply.github.com> Date: Tue, 10 Jun 2025 13:24:32 +0200 Subject: [PATCH 09/64] align labeler with other repositories (#337) --- .github/workflows/labeler.yml | 113 +++++++++++++++++++++++----------- 1 file changed, 77 insertions(+), 36 deletions(-) diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 6473cc4..a62d5f2 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -1,9 +1,9 @@ name: "Issue Labeler" on: issues: - types: [opened] + types: [opened, edited, reopened] pull_request_target: - types: [opened] + types: [opened, synchronize, reopened] permissions: contents: read @@ -14,12 +14,7 @@ jobs: triage: runs-on: ubuntu-latest steps: - - name: Add agent-java label - uses: AlexanderWert/issue-labeler@32be4a3c3d8f009c2741af471994337c34b4cb6f # v2.3 - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" - configuration-path: .github/labeler-config.yml - enable-versioned-regex: 0 + - name: Get token id: get_token uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0 @@ -30,36 +25,82 @@ jobs: { "members": "read", "organization_projects": "write", - "issues": "read" + "issues": "read", + "pull_requests": "write" } - - name: Check team membership for user - uses: elastic/get-user-teams-membership@1.1.0 - id: checkUserMember + + - name: Add agent-java label + run: gh issue edit "${NUMBER}" --add-label "agent-java" --repo "${{ github.repository }}" + env: + NUMBER: ${{ github.event.issue.number || github.event.pull_request.number }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - id: is_elastic_member + uses: elastic/oblt-actions/github/is-member-of@v1 with: - username: ${{ github.actor }} - team: 'apm' - usernamesToExclude: | - apmmachine - dependabot - obltmachine - GITHUB_TOKEN: ${{ steps.get_token.outputs.token }} - - name: Show team membership - run: | - echo "::debug::isTeamMember: ${{ steps.checkUserMember.outputs.isTeamMember }}" - echo "::debug::isExcluded: ${{ steps.checkUserMember.outputs.isExcluded }}" - - name: Add community and triage lables - if: steps.checkUserMember.outputs.isTeamMember != 'true' && steps.checkUserMember.outputs.isExcluded != 'true' - uses: AlexanderWert/issue-labeler@32be4a3c3d8f009c2741af471994337c34b4cb6f # v2.3 + github-org: "elastic" + github-user: ${{ github.actor }} + github-token: ${{ steps.get_token.outputs.token }} + + - id: user_type + uses: elastic/oblt-actions/github/user-type@v1 with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" - configuration-path: .github/community-label.yml - enable-versioned-regex: 0 + github-user: ${{ github.actor }} + github-token: ${{ steps.get_token.outputs.token }} + + - name: debug + run: | + echo "::notice:: is_elastic_member=${{ steps.is_elastic_member.outputs.result }}" + echo "::notice:: user_type=${{ steps.user_type.outputs.result }}" + echo "::notice:: github.actor=${{ github.actor }}" + echo "::notice:: github.event_name=${{ github.event_name }}" + + - name: Add community and triage labels + if: steps.is_elastic_member.outputs.result == 'false' && steps.user_type.outputs.result == 'user' + run: gh issue edit "${NUMBER}" --add-label "community,triage" --repo "${{ github.repository }}" + env: + NUMBER: ${{ github.event.issue.number || github.event.pull_request.number }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Assign new internal pull requests to project - uses: elastic/assign-one-project-github-action@1.2.2 - if: (steps.checkUserMember.outputs.isTeamMember == 'true' || steps.checkUserMember.outputs.isExcluded == 'true') && github.event.pull_request + id: add-to-project + if: steps.is_elastic_member.outputs.result == 'true' && github.event_name == 'pull_request_target' + uses: elastic/oblt-actions/github/project-add@v1 with: - project: 'https://github.com/orgs/elastic/projects/454' - project_id: '5882982' - column_name: 'In Progress' - env: - MY_GITHUB_TOKEN: ${{ steps.get_token.outputs.token }} + github-token: ${{ steps.get_token.outputs.token }} + project-id: 1829 + item-url: ${{ github.event.pull_request.html_url }} + + - name: set status in project + id: set-project-status-field + if: steps.is_elastic_member.outputs.result == 'true' && github.event_name == 'pull_request_target' + uses: elastic/oblt-actions/github/project-field-set@v1 + with: + github-token: ${{ steps.get_token.outputs.token }} + project-id: 1829 + item-id: ${{ steps.add-to-project.outputs.item-id }} + field-name: 'Status' + field-value: 'In Progress' + + - name: set agent in project + id: set-project-agent-field + if: steps.is_elastic_member.outputs.result == 'true' && github.event_name == 'pull_request_target' + uses: elastic/oblt-actions/github/project-field-set@v1 + with: + github-token: ${{ steps.get_token.outputs.token }} + project-id: 1829 + item-id: ${{ steps.add-to-project.outputs.item-id }} + field-name: 'Agent' + field-value: 'java' + + - name: set iteration in project + id: set-project-iteration-field + if: steps.is_elastic_member.outputs.result == 'true' && github.event_name == 'pull_request_target' + uses: elastic/oblt-actions/github/project-field-set@v1 + with: + github-token: ${{ steps.get_token.outputs.token }} + project-id: 1829 + item-id: ${{ steps.add-to-project.outputs.item-id }} + field-name: 'Iteration' + field-value: '@current' + field-type: 'iteration' From 225eff39eeb89f76af413ba75a628e53b41921fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Jun 2025 13:48:44 +0200 Subject: [PATCH 10/64] build(deps): bump actions/attest-build-provenance (#339) Bumps the github-actions group with 1 update in the / directory: [actions/attest-build-provenance](https://github.com/actions/attest-build-provenance). Updates `actions/attest-build-provenance` from 2.3.0 to 2.4.0 - [Release notes](https://github.com/actions/attest-build-provenance/releases) - [Changelog](https://github.com/actions/attest-build-provenance/blob/main/RELEASE.md) - [Commits](https://github.com/actions/attest-build-provenance/compare/db473fddc028af60658334401dc6fa3ffd8669fd...e8998f949152b193b063cb0ec769d69d929409be) --- .github/workflows/release-step-3.yml | 2 +- .github/workflows/snapshot.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-step-3.yml b/.github/workflows/release-step-3.yml index e2a5e11..b7bffe5 100644 --- a/.github/workflows/release-step-3.yml +++ b/.github/workflows/release-step-3.yml @@ -96,7 +96,7 @@ jobs: run: tar xvf ${{ env.TARBALL_FILE }} - name: generate build provenance - uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0 + uses: actions/attest-build-provenance@e8998f949152b193b063cb0ec769d69d929409be # v2.4.0 with: subject-path: "${{ github.workspace }}/**/target/*.jar" diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 504f895..a400423 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -66,7 +66,7 @@ jobs: run: tar xvf ${{ env.TARBALL_FILE }} - name: generate build provenance - uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0 + uses: actions/attest-build-provenance@e8998f949152b193b063cb0ec769d69d929409be # v2.4.0 with: subject-path: "${{ github.workspace }}/**/target/*.jar" From c72e8b373d07272fa53e5bf42a9838662fcbb1f5 Mon Sep 17 00:00:00 2001 From: Jan Calanog Date: Mon, 23 Jun 2025 09:55:03 +0200 Subject: [PATCH 11/64] docs-builder: add `pull-requests: write` permission to docs-build workflow (#341) --- .github/workflows/docs-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml index bb46616..adf95da 100644 --- a/.github/workflows/docs-build.yml +++ b/.github/workflows/docs-build.yml @@ -16,4 +16,4 @@ jobs: deployments: write id-token: write contents: read - pull-requests: read + pull-requests: write From 6aa2b0c14f072843176ca719da09cbdbbe163522 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Mon, 23 Jun 2025 15:45:33 +0100 Subject: [PATCH 12/64] chore: deps(updatecli): Bump updatecli version to v0.102.0 (#340) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 3046933..6f6d2a8 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.101.0 \ No newline at end of file +updatecli v0.102.0 \ No newline at end of file From fc067eefee3f8ee8138f2b57e407fba450ef1f5a Mon Sep 17 00:00:00 2001 From: Jonas Kunz Date: Wed, 9 Jul 2025 13:16:33 +0200 Subject: [PATCH 13/64] Switch to central-publishing-maven-plugin for publishing (#343) --- .ci/settings.xml | 7 +------ log4j-legacy-tests/pom.xml | 1 - log4j2-legacy-tests/pom.xml | 1 - logback-legacy-tests/pom.xml | 1 - pom.xml | 36 ++++++------------------------------ 5 files changed, 7 insertions(+), 39 deletions(-) diff --git a/.ci/settings.xml b/.ci/settings.xml index 3b6791a..b0f7934 100644 --- a/.ci/settings.xml +++ b/.ci/settings.xml @@ -6,12 +6,7 @@ - sonatype-nexus-snapshots - ${env.SERVER_USERNAME} - ${env.SERVER_PASSWORD} - - - sonatype-nexus-staging + central ${env.SERVER_USERNAME} ${env.SERVER_PASSWORD} diff --git a/log4j-legacy-tests/pom.xml b/log4j-legacy-tests/pom.xml index baf8162..a8c4170 100644 --- a/log4j-legacy-tests/pom.xml +++ b/log4j-legacy-tests/pom.xml @@ -11,7 +11,6 @@ ${project.basedir}/.. - true diff --git a/log4j2-legacy-tests/pom.xml b/log4j2-legacy-tests/pom.xml index b222a7f..aaa3b59 100644 --- a/log4j2-legacy-tests/pom.xml +++ b/log4j2-legacy-tests/pom.xml @@ -12,7 +12,6 @@ 2.6 ${project.basedir}/.. - true diff --git a/logback-legacy-tests/pom.xml b/logback-legacy-tests/pom.xml index d24c20c..6db286b 100644 --- a/logback-legacy-tests/pom.xml +++ b/logback-legacy-tests/pom.xml @@ -11,7 +11,6 @@ ${project.basedir}/.. - true diff --git a/pom.xml b/pom.xml index f651fdf..1987ba5 100644 --- a/pom.xml +++ b/pom.xml @@ -16,16 +16,6 @@ log4j-legacy-tests logback-legacy-tests jul-ecs-formatter - pom 2019 @@ -67,20 +57,8 @@ UTF-8 UTF-8 ${project.basedir} - false - - - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - https://oss.sonatype.org/ - - sonatype-nexus-staging - ${maven-deploy-plugin.skip} - true + central + true + log4j-legacy-tests,log4j2-legacy-tests,logback-legacy-tests From 828ab395aef5f3f5b268bc864745d305ee3d8c4b Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Tue, 15 Jul 2025 09:18:35 +0200 Subject: [PATCH 14/64] deps: Bump updatecli version to v0.104.0 (#344) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: deps(updatecli): Bump updatecli version to v0.103.1 Made with ❤️️ by updatecli * chore: deps(updatecli): Bump updatecli version to v0.104.0 Made with ❤️️ by updatecli --------- Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 6f6d2a8..46c433f 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.102.0 \ No newline at end of file +updatecli v0.104.0 \ No newline at end of file From 5da39ddefaf8d3012b0dfff9660b065fc6aeb729 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Thu, 17 Jul 2025 15:49:21 +0200 Subject: [PATCH 15/64] chore: deps(updatecli): bump "ghcr.io/updatecli/policies/autodiscover... (#345) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... y/updatecli" policy to 0.9.0 Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- updatecli-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/updatecli-compose.yaml b/updatecli-compose.yaml index 2574eac..cd7f125 100644 --- a/updatecli-compose.yaml +++ b/updatecli-compose.yaml @@ -7,11 +7,11 @@ policies: - .ci/updatecli/values.d/scm.yml - .ci/updatecli/values.d/ecs-logging-specs.yml - name: Update Updatecli policies - policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.8.0@sha256:99e9e61b501575c2c176c39f2275998d198b590a3f6b1fe829f7315f8d457e7f + policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.9.0@sha256:2ae4e1ba471b996e58356a7b12ad8cf283b079ace8eac833d437d1e1ccb85bbb values: - .ci/updatecli/values.d/scm.yml - .ci/updatecli/values.d/update-compose.yml - name: Update Updatecli version policy: ghcr.io/elastic/oblt-updatecli-policies/updatecli/version:0.2.0@sha256:013a37ddcdb627c46e7cba6fb9d1d7bc144584fa9063843ae7ee0f6ef26b4bea values: - - .ci/updatecli/values.d/scm.yml \ No newline at end of file + - .ci/updatecli/values.d/scm.yml From 09d2df26c518092e0c321471479d0f24de0dcd34 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Mon, 4 Aug 2025 12:49:56 +0100 Subject: [PATCH 16/64] chore: deps(updatecli): Bump updatecli version to v0.105.0 (#346) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 46c433f..13a6746 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.104.0 \ No newline at end of file +updatecli v0.105.0 \ No newline at end of file From 30c193d4ca62f402d1e0c90d8157c6d400f3c780 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Aug 2025 11:02:43 +0200 Subject: [PATCH 17/64] build(deps): bump docker/login-action (#348) Bumps the github-actions group with 1 update in the / directory: [docker/login-action](https://github.com/docker/login-action). Updates `docker/login-action` from 3.4.0 to 3.5.0 - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/74a5d142397b4f367a81961eba4e8cd7edddf772...184bdaa0721073962dff0199f1fb9940f07167d1) --- updated-dependencies: - dependency-name: docker/login-action dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/updatecli.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml index 384a3dc..44bffbf 100644 --- a/.github/workflows/updatecli.yml +++ b/.github/workflows/updatecli.yml @@ -29,7 +29,7 @@ jobs: "pull_requests": "write" } - - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 + - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0 with: registry: ghcr.io username: ${{ github.actor }} From 80f5f7721c787814a98d73cf22def70d34d779fb Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Wed, 13 Aug 2025 09:23:59 +0200 Subject: [PATCH 18/64] chore: deps(updatecli): Bump updatecli version to v0.105.1 (#349) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 13a6746..a4187dc 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.105.0 \ No newline at end of file +updatecli v0.105.1 \ No newline at end of file From 07b1c76fd2244719bd3ef699525c56e9fac03ab8 Mon Sep 17 00:00:00 2001 From: Olga Naydyonock Date: Wed, 13 Aug 2025 10:24:57 +0300 Subject: [PATCH 19/64] ci: fix semgrep reported run-shell-injection (#347) * ci: fix semgrep reported run-shell-injection * updated PR according to reviews --- .github/workflows/maven-goal/action.yml | 4 +++- .github/workflows/pre-post-release.yml | 8 ++++++-- .github/workflows/validate-tag/action.yml | 8 +++++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/maven-goal/action.yml b/.github/workflows/maven-goal/action.yml index 7b8dbb9..4cf9c6e 100644 --- a/.github/workflows/maven-goal/action.yml +++ b/.github/workflows/maven-goal/action.yml @@ -25,5 +25,7 @@ runs: java-version-file: .java-version distribution: ${{ inputs.distribution }} cache: 'maven' - - run: ${{ inputs.command }} + - run: "${COMMAND}" shell: ${{ inputs.shell }} + env: + COMMAND: ${{ inputs.command }} \ No newline at end of file diff --git a/.github/workflows/pre-post-release.yml b/.github/workflows/pre-post-release.yml index eda9396..73226da 100644 --- a/.github/workflows/pre-post-release.yml +++ b/.github/workflows/pre-post-release.yml @@ -99,10 +99,14 @@ jobs: - name: Push the ${{ inputs.phase }} release branch run: | git add --all - git commit -m "${{ inputs.phase }} release: ecs-logging-java v${{ env.RELEASE_VERSION }}" + git commit -m "${PHASE} release: ecs-logging-java v${{ env.RELEASE_VERSION }}" git push origin ${{ env.BRANCH_NAME }} + env: + PHASE: ${{ inputs.phase }} - name: Create the ${{ inputs.phase }} release PR - run: gh pr create --title="${{ inputs.pr_title }}" --base main --head ${{ env.BRANCH_NAME }} -b "${{ inputs.pr_body }}" + run: gh pr create --title="${PR_TITLE}" --base main --head ${{ env.BRANCH_NAME }} -b "${PR_BODY}" env: GH_TOKEN: ${{ steps.get_token.outputs.token }} + PR_TITLE: ${{ inputs.pr_title }} + PR_BODY: ${{ inputs.pr_body }} diff --git a/.github/workflows/validate-tag/action.yml b/.github/workflows/validate-tag/action.yml index a982355..07e33d7 100644 --- a/.github/workflows/validate-tag/action.yml +++ b/.github/workflows/validate-tag/action.yml @@ -15,11 +15,13 @@ runs: id: validate-tag shell: 'bash' run: | - if ! [ $(echo "${{ inputs.tag }}" | grep -P "(\d{1,2})\.(\d{1,2})\.(\d{1,2})") ]; then + if ! [ $(echo "${TAG}" | grep -P "(\d{1,2})\.(\d{1,2})\.(\d{1,2})") ]; then echo "Tag should be a SemVer format" exit 1 fi - if [ $(git tag -l "${{ inputs.tag }}") ]; then - echo "The tag ${{ inputs.tag }} already exists" + if [ $(git tag -l "${TAG}") ]; then + echo "The tag ${TAG} already exists" exit 1 fi + env: + TAG: ${{ inputs.tag }} From ab549303f44fe219991c8723275fe7b7b26bef3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Aug 2025 09:18:37 +0200 Subject: [PATCH 20/64] build(deps): bump actions/checkout (#351) Bumps the github-actions group with 1 update in the / directory: [actions/checkout](https://github.com/actions/checkout). Updates `actions/checkout` from 4 to 5 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/catalog-info.yml | 2 +- .github/workflows/pre-post-release.yml | 4 ++-- .github/workflows/release-step-3.yml | 4 ++-- .github/workflows/snapshot.yml | 2 +- .github/workflows/test.yml | 2 +- .github/workflows/updatecli.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/catalog-info.yml b/.github/workflows/catalog-info.yml index 47103e0..3d8c23c 100644 --- a/.github/workflows/catalog-info.yml +++ b/.github/workflows/catalog-info.yml @@ -18,7 +18,7 @@ jobs: contents: read packages: read steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: elastic/oblt-actions/elastic/validate-catalog@v1 diff --git a/.github/workflows/pre-post-release.yml b/.github/workflows/pre-post-release.yml index 73226da..cd6a9c6 100644 --- a/.github/workflows/pre-post-release.yml +++ b/.github/workflows/pre-post-release.yml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: fetch-depth: 0 - name: Validate tag does not exist on current commit @@ -66,7 +66,7 @@ jobs: repositories: >- ["ecs-logging-java"] - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: ref: ${{ inputs.ref }} token: ${{ steps.get_token.outputs.token }} diff --git a/.github/workflows/release-step-3.yml b/.github/workflows/release-step-3.yml index b7bffe5..8e59d03 100644 --- a/.github/workflows/release-step-3.yml +++ b/.github/workflows/release-step-3.yml @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: ${{ inputs.ref }} fetch-depth: 0 @@ -138,7 +138,7 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: ref: ${{ inputs.ref }} diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index a400423..48eefe8 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -21,7 +21,7 @@ jobs: outputs: is-snapshot: ${{ steps.validate.outputs.is-snapshot }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Validate version is a snapshot version id: validate run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f9172af..e13dbe6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,7 +30,7 @@ jobs: - 'compile javadoc:javadoc' fail-fast: false steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./.github/workflows/maven-goal with: command: ./mvnw ${{ matrix.goal }} diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml index 44bffbf..e888cd7 100644 --- a/.github/workflows/updatecli.yml +++ b/.github/workflows/updatecli.yml @@ -15,7 +15,7 @@ jobs: contents: read packages: read steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Get token id: get_token From 7376d07fc826dce0edad28f8529d80bc2add05cb Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Tue, 19 Aug 2025 08:46:10 +0200 Subject: [PATCH 21/64] chore: deps(updatecli): bump "ghcr.io/updatecli/policies/autodiscover... (#352) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... y/updatecli" policy to 0.9.1 Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- updatecli-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/updatecli-compose.yaml b/updatecli-compose.yaml index cd7f125..01b1416 100644 --- a/updatecli-compose.yaml +++ b/updatecli-compose.yaml @@ -7,7 +7,7 @@ policies: - .ci/updatecli/values.d/scm.yml - .ci/updatecli/values.d/ecs-logging-specs.yml - name: Update Updatecli policies - policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.9.0@sha256:2ae4e1ba471b996e58356a7b12ad8cf283b079ace8eac833d437d1e1ccb85bbb + policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.9.1@sha256:5bbca67a9e31bf5432d5cae1452b9fc770014151ddd856f367ccb9ba46f6f8bb values: - .ci/updatecli/values.d/scm.yml - .ci/updatecli/values.d/update-compose.yml From df5967a43cd77f626ef6ccc8fc5020df7289e3b9 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Thu, 28 Aug 2025 10:52:53 +0200 Subject: [PATCH 22/64] chore: deps(updatecli): Bump updatecli version to v0.106.0 (#353) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index a4187dc..22835bc 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.105.1 \ No newline at end of file +updatecli v0.106.0 \ No newline at end of file From 38ad019b5539f21ba64d4c70551e109f4d1881ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Sep 2025 10:09:25 +0200 Subject: [PATCH 23/64] build(deps): bump actions/attest-build-provenance (#354) Bumps the github-actions group with 1 update in the / directory: [actions/attest-build-provenance](https://github.com/actions/attest-build-provenance). Updates `actions/attest-build-provenance` from 2.4.0 to 3.0.0 - [Release notes](https://github.com/actions/attest-build-provenance/releases) - [Changelog](https://github.com/actions/attest-build-provenance/blob/main/RELEASE.md) - [Commits](https://github.com/actions/attest-build-provenance/compare/e8998f949152b193b063cb0ec769d69d929409be...977bb373ede98d70efdf65b84cb5f73e068dcc2a) --- updated-dependencies: - dependency-name: actions/attest-build-provenance dependency-version: 3.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release-step-3.yml | 2 +- .github/workflows/snapshot.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-step-3.yml b/.github/workflows/release-step-3.yml index 8e59d03..727c5d3 100644 --- a/.github/workflows/release-step-3.yml +++ b/.github/workflows/release-step-3.yml @@ -96,7 +96,7 @@ jobs: run: tar xvf ${{ env.TARBALL_FILE }} - name: generate build provenance - uses: actions/attest-build-provenance@e8998f949152b193b063cb0ec769d69d929409be # v2.4.0 + uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0 with: subject-path: "${{ github.workspace }}/**/target/*.jar" diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 48eefe8..bea36d2 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -66,7 +66,7 @@ jobs: run: tar xvf ${{ env.TARBALL_FILE }} - name: generate build provenance - uses: actions/attest-build-provenance@e8998f949152b193b063cb0ec769d69d929409be # v2.4.0 + uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0 with: subject-path: "${{ github.workspace }}/**/target/*.jar" From cf6eea866c0409ece19027d0210ca7b917367db8 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 14:43:10 +0100 Subject: [PATCH 24/64] chore: deps(updatecli): Bump updatecli version to v0.107.0 (#355) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 22835bc..ca67f68 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.106.0 \ No newline at end of file +updatecli v0.107.0 \ No newline at end of file From d7a311d103a533a4c291d3ed2f2f7a6a5598a388 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Fri, 26 Sep 2025 10:26:42 +0200 Subject: [PATCH 25/64] chore: deps(updatecli): Bump updatecli version to v0.108.0 (#358) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index ca67f68..54f4a9d 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.107.0 \ No newline at end of file +updatecli v0.108.0 \ No newline at end of file From a3ddf87476cc75a6fb51c5bf175b0b1d8ed05d2c Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Fri, 26 Sep 2025 14:15:34 +0100 Subject: [PATCH 26/64] Replace tibdex/github-app-token with actions/create-github-app-token (#357) * Initial plan * Initial repository exploration and plan for replacing tibdex/github-app-token Co-authored-by: v1v <2871786+v1v@users.noreply.github.com> * Replace tibdex/github-app-token with actions/create-github-app-token in all workflows Co-authored-by: v1v <2871786+v1v@users.noreply.github.com> * Apply suggestions from code review * Update .github/workflows/pre-post-release.yml * Remove unrelated license headers from Java test files Co-authored-by: v1v <2871786+v1v@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: v1v <2871786+v1v@users.noreply.github.com> Co-authored-by: Victor Martinez --- .github/workflows/addToProject.yml | 13 +++++-------- .github/workflows/labeler.yml | 17 +++++++---------- .github/workflows/pre-post-release.yml | 17 +++++++---------- .github/workflows/updatecli.yml | 13 +++++-------- 4 files changed, 24 insertions(+), 36 deletions(-) diff --git a/.github/workflows/addToProject.yml b/.github/workflows/addToProject.yml index 0feaa07..3047172 100644 --- a/.github/workflows/addToProject.yml +++ b/.github/workflows/addToProject.yml @@ -15,15 +15,12 @@ jobs: steps: - name: Get token id: get_token - uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0 + uses: actions/create-github-app-token@v2 with: - app_id: ${{ secrets.OBS_AUTOMATION_APP_ID }} - private_key: ${{ secrets.OBS_AUTOMATION_APP_PEM }} - permissions: >- - { - "organization_projects": "write", - "issues": "read" - } + app-id: ${{ secrets.OBS_AUTOMATION_APP_ID }} + private-key: ${{ secrets.OBS_AUTOMATION_APP_PEM }} + permission-organization-projects: write + permission-issues: read - name: Assign issues with milestones to project uses: elastic/assign-one-project-github-action@1.2.2 diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index a62d5f2..1f55f8f 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -17,17 +17,14 @@ jobs: - name: Get token id: get_token - uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0 + uses: actions/create-github-app-token@v2 with: - app_id: ${{ secrets.OBS_AUTOMATION_APP_ID }} - private_key: ${{ secrets.OBS_AUTOMATION_APP_PEM }} - permissions: >- - { - "members": "read", - "organization_projects": "write", - "issues": "read", - "pull_requests": "write" - } + app-id: ${{ secrets.OBS_AUTOMATION_APP_ID }} + private-key: ${{ secrets.OBS_AUTOMATION_APP_PEM }} + permission-members: read + permission-organization-projects: write + permission-issues: read + permission-pull-requests: write - name: Add agent-java label run: gh issue edit "${NUMBER}" --add-label "agent-java" --repo "${{ github.repository }}" diff --git a/.github/workflows/pre-post-release.yml b/.github/workflows/pre-post-release.yml index cd6a9c6..7867b4a 100644 --- a/.github/workflows/pre-post-release.yml +++ b/.github/workflows/pre-post-release.yml @@ -54,17 +54,14 @@ jobs: steps: - name: Get token id: get_token - uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0 + uses: actions/create-github-app-token@v2 with: - app_id: ${{ secrets.OBS_AUTOMATION_APP_ID }} - private_key: ${{ secrets.OBS_AUTOMATION_APP_PEM }} - permissions: >- - { - "contents": "write", - "pull_requests": "write" - } - repositories: >- - ["ecs-logging-java"] + app-id: ${{ secrets.OBS_AUTOMATION_APP_ID }} + private-key: ${{ secrets.OBS_AUTOMATION_APP_PEM }} + permission-contents: write + permission-pull-requests: write + repositories: | + ecs-logging-java - uses: actions/checkout@v5 with: diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml index e888cd7..142acd7 100644 --- a/.github/workflows/updatecli.yml +++ b/.github/workflows/updatecli.yml @@ -19,15 +19,12 @@ jobs: - name: Get token id: get_token - uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0 + uses: actions/create-github-app-token@v2 with: - app_id: ${{ secrets.OBS_AUTOMATION_APP_ID }} - private_key: ${{ secrets.OBS_AUTOMATION_APP_PEM }} - permissions: >- - { - "contents": "write", - "pull_requests": "write" - } + app-id: ${{ secrets.OBS_AUTOMATION_APP_ID }} + private-key: ${{ secrets.OBS_AUTOMATION_APP_PEM }} + permission-contents: write + permission-pull-requests: write - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0 with: From fd9f158f74431658d9ee133f421cab41e1ed2348 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Oct 2025 09:30:19 +0200 Subject: [PATCH 27/64] build(deps): bump docker/login-action (#359) Bumps the github-actions group with 1 update in the / directory: [docker/login-action](https://github.com/docker/login-action). Updates `docker/login-action` from 3.5.0 to 3.6.0 - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/184bdaa0721073962dff0199f1fb9940f07167d1...5e57cd118135c172c3672efd75eb46360885c0ef) --- .github/workflows/updatecli.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml index 142acd7..5944381 100644 --- a/.github/workflows/updatecli.yml +++ b/.github/workflows/updatecli.yml @@ -26,7 +26,7 @@ jobs: permission-contents: write permission-pull-requests: write - - uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0 + - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0 with: registry: ghcr.io username: ${{ github.actor }} From 1713e0ed6bddc61cd78c1b77b7caa62d4d87f22c Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Mon, 20 Oct 2025 08:49:51 +0200 Subject: [PATCH 28/64] chore: deps(updatecli): Bump updatecli version to v0.109.0 (#360) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 54f4a9d..73cd39b 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.108.0 \ No newline at end of file +updatecli v0.109.0 \ No newline at end of file From 529f2455c0edbc858d88f06b71d3fc2a4011c63a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Oct 2025 10:48:18 +0100 Subject: [PATCH 29/64] build(deps): bump actions/upload-artifact (#361) Bumps the github-actions group with 1 update in the / directory: [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `actions/upload-artifact` from 4 to 5 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e13dbe6..0a17c7b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,11 +36,11 @@ jobs: command: ./mvnw ${{ matrix.goal }} - name: Store test results if: matrix.goal == 'test' && (success() || failure()) - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: test-results path: '**/target/surefire-reports' - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v5 if: contains(matrix.goal, 'license') with: name: license-report From d5982e1e14aac233d359b40c7af7be809b3c04d6 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Fri, 7 Nov 2025 09:31:44 +0100 Subject: [PATCH 30/64] chore: deps(updatecli): Bump updatecli version to v0.110.0 (#362) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 73cd39b..2b57a8a 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.109.0 \ No newline at end of file +updatecli v0.110.0 \ No newline at end of file From 6582128bc8f3d36ca2f4df900a6af9639fe4c320 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Mon, 10 Nov 2025 10:17:32 +0100 Subject: [PATCH 31/64] chore: deps(updatecli): Bump updatecli version to v0.110.1 (#363) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 2b57a8a..55a79c8 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.110.0 \ No newline at end of file +updatecli v0.110.1 \ No newline at end of file From 10ff552609b5c152c90a9dae9ab1a1f7ce70c4f4 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Wed, 12 Nov 2025 15:50:19 +0100 Subject: [PATCH 32/64] chore: deps(updatecli): Bump updatecli version to v0.110.2 (#364) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 55a79c8..94ceda3 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.110.1 \ No newline at end of file +updatecli v0.110.2 \ No newline at end of file From 210b93a075596d5671add57fb65122b3cb9b2b4c Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Fri, 14 Nov 2025 13:43:22 +0100 Subject: [PATCH 33/64] chore: deps(updatecli): Bump updatecli version to v0.110.3 (#365) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 94ceda3..c82f19a 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.110.2 \ No newline at end of file +updatecli v0.110.3 \ No newline at end of file From d2bb91283d33fda75511f9fc0b151101b1de3171 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 12:42:57 +0100 Subject: [PATCH 34/64] build(deps): bump actions/checkout (#366) Bumps the github-actions group with 1 update in the / directory: [actions/checkout](https://github.com/actions/checkout). Updates `actions/checkout` from 5 to 6 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/catalog-info.yml | 2 +- .github/workflows/pre-post-release.yml | 4 ++-- .github/workflows/release-step-3.yml | 4 ++-- .github/workflows/snapshot.yml | 2 +- .github/workflows/test.yml | 2 +- .github/workflows/updatecli.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/catalog-info.yml b/.github/workflows/catalog-info.yml index 3d8c23c..3f4320a 100644 --- a/.github/workflows/catalog-info.yml +++ b/.github/workflows/catalog-info.yml @@ -18,7 +18,7 @@ jobs: contents: read packages: read steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: elastic/oblt-actions/elastic/validate-catalog@v1 diff --git a/.github/workflows/pre-post-release.yml b/.github/workflows/pre-post-release.yml index 7867b4a..984103a 100644 --- a/.github/workflows/pre-post-release.yml +++ b/.github/workflows/pre-post-release.yml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: fetch-depth: 0 - name: Validate tag does not exist on current commit @@ -63,7 +63,7 @@ jobs: repositories: | ecs-logging-java - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: ref: ${{ inputs.ref }} token: ${{ steps.get_token.outputs.token }} diff --git a/.github/workflows/release-step-3.yml b/.github/workflows/release-step-3.yml index 727c5d3..522f419 100644 --- a/.github/workflows/release-step-3.yml +++ b/.github/workflows/release-step-3.yml @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: ref: ${{ inputs.ref }} fetch-depth: 0 @@ -138,7 +138,7 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: ref: ${{ inputs.ref }} diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index bea36d2..5453b94 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -21,7 +21,7 @@ jobs: outputs: is-snapshot: ${{ steps.validate.outputs.is-snapshot }} steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Validate version is a snapshot version id: validate run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0a17c7b..6361019 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,7 +30,7 @@ jobs: - 'compile javadoc:javadoc' fail-fast: false steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: ./.github/workflows/maven-goal with: command: ./mvnw ${{ matrix.goal }} diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml index 5944381..d97d2e7 100644 --- a/.github/workflows/updatecli.yml +++ b/.github/workflows/updatecli.yml @@ -15,7 +15,7 @@ jobs: contents: read packages: read steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Get token id: get_token From 1308a3eabde553c38857e8ce4e23949560cc5a30 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Fri, 5 Dec 2025 09:27:30 +0100 Subject: [PATCH 35/64] deps(updatecli): bump all policies (#367) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: deps(updatecli): bump "ghcr.io/updatecli/policies/autodiscover... ... y/updatecli" policy to 0.10.0 Made with ❤️️ by updatecli * chore: deps(updatecli): bump "ghcr.io/elastic/oblt-updatecli-policies... ... /updatecli/version" policy to 0.2.1 Made with ❤️️ by updatecli --------- Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- updatecli-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/updatecli-compose.yaml b/updatecli-compose.yaml index 01b1416..467f0a5 100644 --- a/updatecli-compose.yaml +++ b/updatecli-compose.yaml @@ -7,11 +7,11 @@ policies: - .ci/updatecli/values.d/scm.yml - .ci/updatecli/values.d/ecs-logging-specs.yml - name: Update Updatecli policies - policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.9.1@sha256:5bbca67a9e31bf5432d5cae1452b9fc770014151ddd856f367ccb9ba46f6f8bb + policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.10.0@sha256:588fb5b274c1e484198885723b5a67688416feeec414d41a33908826e448fd41 values: - .ci/updatecli/values.d/scm.yml - .ci/updatecli/values.d/update-compose.yml - name: Update Updatecli version - policy: ghcr.io/elastic/oblt-updatecli-policies/updatecli/version:0.2.0@sha256:013a37ddcdb627c46e7cba6fb9d1d7bc144584fa9063843ae7ee0f6ef26b4bea + policy: ghcr.io/elastic/oblt-updatecli-policies/updatecli/version:0.2.1@sha256:6fd23ee6800e330fb6aa60ae3597dceb5dde919d3562dfcf559f6e0cb87cf998 values: - .ci/updatecli/values.d/scm.yml From 5f2d41316d38a8301518d95270966d28b38bc010 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Mon, 8 Dec 2025 09:12:40 +0100 Subject: [PATCH 36/64] chore: deps(updatecli): Bump updatecli version to v0.111.0 (#369) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index c82f19a..b423ac5 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.110.3 \ No newline at end of file +updatecli v0.111.0 \ No newline at end of file From 11dabee63cd62b02f614b51c48f571c88a3977f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 09:28:00 +0100 Subject: [PATCH 37/64] build(deps): bump actions/upload-artifact (#371) Bumps the github-actions group with 1 update in the / directory: [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `actions/upload-artifact` from 5 to 6 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6361019..5d065ec 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,11 +36,11 @@ jobs: command: ./mvnw ${{ matrix.goal }} - name: Store test results if: matrix.goal == 'test' && (success() || failure()) - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: test-results path: '**/target/surefire-reports' - - uses: actions/upload-artifact@v5 + - uses: actions/upload-artifact@v6 if: contains(matrix.goal, 'license') with: name: license-report From 96bda48e92c59ef75db54ee5899a6f5c3696d89f Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 09:50:01 +0100 Subject: [PATCH 38/64] chore: deps(updatecli): Bump updatecli version to v0.112.0 (#370) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index b423ac5..787346e 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.111.0 \ No newline at end of file +updatecli v0.112.0 \ No newline at end of file From d320186a9e2ace39000920efd49f9124bd5b3828 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Dec 2025 13:34:31 +0100 Subject: [PATCH 39/64] build(deps): bump actions/attest-build-provenance (#374) Bumps the github-actions group with 1 update in the / directory: [actions/attest-build-provenance](https://github.com/actions/attest-build-provenance). Updates `actions/attest-build-provenance` from 3.0.0 to 3.1.0 - [Release notes](https://github.com/actions/attest-build-provenance/releases) - [Changelog](https://github.com/actions/attest-build-provenance/blob/main/RELEASE.md) - [Commits](https://github.com/actions/attest-build-provenance/compare/977bb373ede98d70efdf65b84cb5f73e068dcc2a...00014ed6ed5efc5b1ab7f7f34a39eb55d41aa4f8) --- updated-dependencies: - dependency-name: actions/attest-build-provenance dependency-version: 3.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release-step-3.yml | 2 +- .github/workflows/snapshot.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-step-3.yml b/.github/workflows/release-step-3.yml index 522f419..07a97fe 100644 --- a/.github/workflows/release-step-3.yml +++ b/.github/workflows/release-step-3.yml @@ -96,7 +96,7 @@ jobs: run: tar xvf ${{ env.TARBALL_FILE }} - name: generate build provenance - uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0 + uses: actions/attest-build-provenance@00014ed6ed5efc5b1ab7f7f34a39eb55d41aa4f8 # v3.1.0 with: subject-path: "${{ github.workspace }}/**/target/*.jar" diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 5453b94..0bd5f1d 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -66,7 +66,7 @@ jobs: run: tar xvf ${{ env.TARBALL_FILE }} - name: generate build provenance - uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0 + uses: actions/attest-build-provenance@00014ed6ed5efc5b1ab7f7f34a39eb55d41aa4f8 # v3.1.0 with: subject-path: "${{ github.workspace }}/**/target/*.jar" From 4f00be4587cf15134e2c30bbde0d8e7585cc4b3e Mon Sep 17 00:00:00 2001 From: SylvainJuge <763082+SylvainJuge@users.noreply.github.com> Date: Mon, 12 Jan 2026 14:02:49 +0100 Subject: [PATCH 40/64] assign internal PRs to author (#375) --- .github/workflows/labeler.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 1f55f8f..fad711d 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -59,6 +59,14 @@ jobs: NUMBER: ${{ github.event.issue.number || github.event.pull_request.number }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Assign new internal pull requests to author + id: assign-to-author + if: steps.is_elastic_member.outputs.result == 'true' && github.event_name == 'pull_request_target' + run: gh issue edit "${NUMBER}" --add-assignee "${{ github.actor }}" --repo "${{ github.repository }}" + env: + NUMBER: ${{ github.event.issue.number || github.event.pull_request.number }} + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Assign new internal pull requests to project id: add-to-project if: steps.is_elastic_member.outputs.result == 'true' && github.event_name == 'pull_request_target' From e0d785752d10972bccc3385d70db14335e4df29d Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Thu, 15 Jan 2026 14:08:02 +0000 Subject: [PATCH 41/64] chore: deps(updatecli): Bump updatecli version to v0.113.0 (#376) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 787346e..4e6189d 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.112.0 \ No newline at end of file +updatecli v0.113.0 \ No newline at end of file From f06384cc8220600d4c58cdcddcb35060dedc6657 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 26 Jan 2026 09:33:29 +0100 Subject: [PATCH 42/64] github-action: add artifact-metadata permission for attestations (#377) --- .github/workflows/release-step-3.yml | 1 + .github/workflows/snapshot.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/release-step-3.yml b/.github/workflows/release-step-3.yml index 07a97fe..d7df203 100644 --- a/.github/workflows/release-step-3.yml +++ b/.github/workflows/release-step-3.yml @@ -67,6 +67,7 @@ jobs: needs: - validate-tag permissions: + artifact-metadata: write attestations: write contents: write id-token: write diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 0bd5f1d..f7e430b 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -38,6 +38,7 @@ jobs: needs: validate if: ${{ contains(needs.validate.outputs.is-snapshot, 'true') }} permissions: + artifact-metadata: write attestations: write contents: write id-token: write From 4b444b4a2396fa29291d8d5cb1c54717e24b405a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Jan 2026 14:12:05 +0000 Subject: [PATCH 43/64] build(deps-dev): bump org.assertj:assertj-core from 3.12.2 to 3.27.7 (#378) Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.12.2 to 3.27.7. - [Release notes](https://github.com/assertj/assertj/releases) - [Commits](https://github.com/assertj/assertj/compare/assertj-core-3.12.2...assertj-build-3.27.7) --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-version: 3.27.7 dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1987ba5..e983f89 100644 --- a/pom.xml +++ b/pom.xml @@ -324,7 +324,7 @@ org.assertj assertj-core - 3.12.2 + 3.27.7 test From 8819e65f10d309c77e9b6f20016c4e2d81f4756f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Feb 2026 09:06:58 +0100 Subject: [PATCH 44/64] build(deps): bump the github-actions group across 1 directory with 2 updates (#379) Bumps the github-actions group with 2 updates in the / directory: [actions/attest-build-provenance](https://github.com/actions/attest-build-provenance) and [docker/login-action](https://github.com/docker/login-action). Updates `actions/attest-build-provenance` from 3.1.0 to 3.2.0 - [Release notes](https://github.com/actions/attest-build-provenance/releases) - [Changelog](https://github.com/actions/attest-build-provenance/blob/main/RELEASE.md) - [Commits](https://github.com/actions/attest-build-provenance/compare/00014ed6ed5efc5b1ab7f7f34a39eb55d41aa4f8...96278af6caaf10aea03fd8d33a09a777ca52d62f) Updates `docker/login-action` from 3.6.0 to 3.7.0 - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/5e57cd118135c172c3672efd75eb46360885c0ef...c94ce9fb468520275223c153574b00df6fe4bcc9) --- updated-dependencies: - dependency-name: actions/attest-build-provenance dependency-version: 3.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: docker/login-action dependency-version: 3.7.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release-step-3.yml | 2 +- .github/workflows/snapshot.yml | 2 +- .github/workflows/updatecli.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-step-3.yml b/.github/workflows/release-step-3.yml index d7df203..dfc2a26 100644 --- a/.github/workflows/release-step-3.yml +++ b/.github/workflows/release-step-3.yml @@ -97,7 +97,7 @@ jobs: run: tar xvf ${{ env.TARBALL_FILE }} - name: generate build provenance - uses: actions/attest-build-provenance@00014ed6ed5efc5b1ab7f7f34a39eb55d41aa4f8 # v3.1.0 + uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3.2.0 with: subject-path: "${{ github.workspace }}/**/target/*.jar" diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index f7e430b..782b99c 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -67,7 +67,7 @@ jobs: run: tar xvf ${{ env.TARBALL_FILE }} - name: generate build provenance - uses: actions/attest-build-provenance@00014ed6ed5efc5b1ab7f7f34a39eb55d41aa4f8 # v3.1.0 + uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3.2.0 with: subject-path: "${{ github.workspace }}/**/target/*.jar" diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml index d97d2e7..49b992b 100644 --- a/.github/workflows/updatecli.yml +++ b/.github/workflows/updatecli.yml @@ -26,7 +26,7 @@ jobs: permission-contents: write permission-pull-requests: write - - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0 + - uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0 with: registry: ghcr.io username: ${{ github.actor }} From 511bf2a572f8592e251a74eaaddae02e65b778e6 Mon Sep 17 00:00:00 2001 From: Fabrizio Ferri-Benedetti Date: Tue, 24 Feb 2026 15:50:19 +0100 Subject: [PATCH 45/64] Add Vale docs linting support (#382) --- .github/workflows/docs-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml index adf95da..2efad4a 100644 --- a/.github/workflows/docs-build.yml +++ b/.github/workflows/docs-build.yml @@ -11,6 +11,7 @@ jobs: docs-preview: uses: elastic/docs-builder/.github/workflows/preview-build.yml@main with: + enable-vale-linting: true path-pattern: docs/** permissions: deployments: write From fda99a7396259444299b79e6e49a760c5e283148 Mon Sep 17 00:00:00 2001 From: "elastic-vault-github-plugin-prod[bot]" <150874479+elastic-vault-github-plugin-prod[bot]@users.noreply.github.com> Date: Thu, 5 Mar 2026 10:26:54 +0100 Subject: [PATCH 46/64] github-action: use actions/attest (#385) Co-authored-by: obltmachine --- .github/workflows/release-step-3.yml | 2 +- .github/workflows/snapshot.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-step-3.yml b/.github/workflows/release-step-3.yml index dfc2a26..373aeb2 100644 --- a/.github/workflows/release-step-3.yml +++ b/.github/workflows/release-step-3.yml @@ -97,7 +97,7 @@ jobs: run: tar xvf ${{ env.TARBALL_FILE }} - name: generate build provenance - uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3.2.0 + uses: actions/attest@59d89421af93a897026c735860bf21b6eb4f7b26 # v4.1.0 with: subject-path: "${{ github.workspace }}/**/target/*.jar" diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 782b99c..5a72c50 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -67,7 +67,7 @@ jobs: run: tar xvf ${{ env.TARBALL_FILE }} - name: generate build provenance - uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3.2.0 + uses: actions/attest@59d89421af93a897026c735860bf21b6eb4f7b26 # v4.1.0 with: subject-path: "${{ github.workspace }}/**/target/*.jar" From b34c86e464fec7bb0370b16fe800f378d936c502 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Mar 2026 08:47:13 +0100 Subject: [PATCH 47/64] build(deps): bump the github-actions group across 1 directory with 2 updates (#386) Bumps the github-actions group with 2 updates in the / directory: [actions/upload-artifact](https://github.com/actions/upload-artifact) and [docker/login-action](https://github.com/docker/login-action). Updates `actions/upload-artifact` from 6 to 7 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v6...v7) Updates `docker/login-action` from 3.7.0 to 4.0.0 - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/c94ce9fb468520275223c153574b00df6fe4bcc9...b45d80f862d83dbcd57f89517bcf500b2ab88fb2) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions - dependency-name: docker/login-action dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/test.yml | 4 ++-- .github/workflows/updatecli.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5d065ec..80dda95 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,11 +36,11 @@ jobs: command: ./mvnw ${{ matrix.goal }} - name: Store test results if: matrix.goal == 'test' && (success() || failure()) - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: test-results path: '**/target/surefire-reports' - - uses: actions/upload-artifact@v6 + - uses: actions/upload-artifact@v7 if: contains(matrix.goal, 'license') with: name: license-report diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml index 49b992b..cbc70ec 100644 --- a/.github/workflows/updatecli.yml +++ b/.github/workflows/updatecli.yml @@ -26,7 +26,7 @@ jobs: permission-contents: write permission-pull-requests: write - - uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0 + - uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 with: registry: ghcr.io username: ${{ github.actor }} From 3fdfd3cbf67bbcf00eb68fdd78b4c05659d5029f Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Fri, 6 Mar 2026 11:51:34 +0100 Subject: [PATCH 48/64] chore: deps(updatecli): Bump updatecli version to v0.114.0 (#387) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 4e6189d..203a6de 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.113.0 \ No newline at end of file +updatecli v0.114.0 \ No newline at end of file From 94c5a710be75a31bf1d66c87e6fcef4119674248 Mon Sep 17 00:00:00 2001 From: "elastic-vault-github-plugin-prod[bot]" <150874479+elastic-vault-github-plugin-prod[bot]@users.noreply.github.com> Date: Wed, 11 Mar 2026 13:58:46 +0000 Subject: [PATCH 49/64] github-action: include the dependabot section for pre-commit (#388) * github-action: include the dependabot section for pre-commit * Apply suggestion from @v1v --------- Co-authored-by: obltmachine Co-authored-by: Victor Martinez --- .github/dependabot.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b9a9834..2dad41c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -13,3 +13,13 @@ updates: github-actions: patterns: - "*" + + - package-ecosystem: pre-commit + directory: "/" + schedule: + interval: 'weekly' + day: 'sunday' + time: '22:00' + open-pull-requests-limit: 5 + labels: + - 'changelog:dependencies' From 7b93dfceeee8975e4b1c4ba6779ad298b57f143d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Mar 2026 20:42:53 +0000 Subject: [PATCH 50/64] build(deps): bump https://github.com/pre-commit/pre-commit-hooks (#389) Bumps [https://github.com/pre-commit/pre-commit-hooks](https://github.com/pre-commit/pre-commit-hooks) from v2.2.3 to 6.0.0. - [Release notes](https://github.com/pre-commit/pre-commit-hooks/releases) - [Changelog](https://github.com/pre-commit/pre-commit-hooks/blob/main/CHANGELOG.md) - [Commits](https://github.com/pre-commit/pre-commit-hooks/compare/v2.2.3...v6.0.0) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 323c744..0e1584e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.2.3 + rev: v6.0.0 hooks: - id: check-case-conflict - id: check-executables-have-shebangs From e74c3cbc04cc7f9b0d535048dcdf0410405e09fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2026 14:04:52 +0100 Subject: [PATCH 51/64] build(deps): bump actions/create-github-app-token (#390) Bumps the github-actions group with 1 update in the / directory: [actions/create-github-app-token](https://github.com/actions/create-github-app-token). Updates `actions/create-github-app-token` from 2 to 3 - [Release notes](https://github.com/actions/create-github-app-token/releases) - [Commits](https://github.com/actions/create-github-app-token/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/create-github-app-token dependency-version: '3' dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/addToProject.yml | 2 +- .github/workflows/labeler.yml | 2 +- .github/workflows/pre-post-release.yml | 2 +- .github/workflows/updatecli.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/addToProject.yml b/.github/workflows/addToProject.yml index 3047172..6536fe8 100644 --- a/.github/workflows/addToProject.yml +++ b/.github/workflows/addToProject.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Get token id: get_token - uses: actions/create-github-app-token@v2 + uses: actions/create-github-app-token@v3 with: app-id: ${{ secrets.OBS_AUTOMATION_APP_ID }} private-key: ${{ secrets.OBS_AUTOMATION_APP_PEM }} diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index fad711d..7a54789 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -17,7 +17,7 @@ jobs: - name: Get token id: get_token - uses: actions/create-github-app-token@v2 + uses: actions/create-github-app-token@v3 with: app-id: ${{ secrets.OBS_AUTOMATION_APP_ID }} private-key: ${{ secrets.OBS_AUTOMATION_APP_PEM }} diff --git a/.github/workflows/pre-post-release.yml b/.github/workflows/pre-post-release.yml index 984103a..5807cec 100644 --- a/.github/workflows/pre-post-release.yml +++ b/.github/workflows/pre-post-release.yml @@ -54,7 +54,7 @@ jobs: steps: - name: Get token id: get_token - uses: actions/create-github-app-token@v2 + uses: actions/create-github-app-token@v3 with: app-id: ${{ secrets.OBS_AUTOMATION_APP_ID }} private-key: ${{ secrets.OBS_AUTOMATION_APP_PEM }} diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml index cbc70ec..f576f03 100644 --- a/.github/workflows/updatecli.yml +++ b/.github/workflows/updatecli.yml @@ -19,7 +19,7 @@ jobs: - name: Get token id: get_token - uses: actions/create-github-app-token@v2 + uses: actions/create-github-app-token@v3 with: app-id: ${{ secrets.OBS_AUTOMATION_APP_ID }} private-key: ${{ secrets.OBS_AUTOMATION_APP_PEM }} From 3e92d247a1e2eb98da0d675b4bb54443691bfbc1 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2026 09:13:41 +0100 Subject: [PATCH 52/64] chore: deps(updatecli): Bump updatecli version to v0.115.0 (#392) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 203a6de..82ca587 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.114.0 \ No newline at end of file +updatecli v0.115.0 \ No newline at end of file From 5c075f0aae761e126bf2116d601ae4fd821de838 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Mon, 30 Mar 2026 09:10:09 +0200 Subject: [PATCH 53/64] chore: deps(updatecli): bump "ghcr.io/updatecli/policies/autodiscover... (#393) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... y/updatecli" policy to 0.11.1 Made with ❤️️ by updatecli Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- updatecli-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/updatecli-compose.yaml b/updatecli-compose.yaml index 467f0a5..24f1cfd 100644 --- a/updatecli-compose.yaml +++ b/updatecli-compose.yaml @@ -7,7 +7,7 @@ policies: - .ci/updatecli/values.d/scm.yml - .ci/updatecli/values.d/ecs-logging-specs.yml - name: Update Updatecli policies - policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.10.0@sha256:588fb5b274c1e484198885723b5a67688416feeec414d41a33908826e448fd41 + policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.11.1@sha256:de145eea3f42312f4d1fdedb562adc36adcd54d7568f230ae71f931cc5288321 values: - .ci/updatecli/values.d/scm.yml - .ci/updatecli/values.d/update-compose.yml From eaf8357b07e27111a228ad6190e70c9d5a5245e8 Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Mon, 30 Mar 2026 16:33:45 +0200 Subject: [PATCH 54/64] Migrate docs workflows from preview-build to docs-actions (#394) Moves docs CI/CD from elastic/docs-builder to elastic/docs-actions. Part of elastic/docs-eng-team#474 --- .github/workflows/docs-build.yml | 21 ++++++++------------- .github/workflows/docs-cleanup.yml | 14 -------------- .github/workflows/docs-deploy.yml | 16 ++++++++++++++++ .github/workflows/docs-preview-cleanup.yml | 11 +++++++++++ 4 files changed, 35 insertions(+), 27 deletions(-) delete mode 100644 .github/workflows/docs-cleanup.yml create mode 100644 .github/workflows/docs-deploy.yml create mode 100644 .github/workflows/docs-preview-cleanup.yml diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml index 2efad4a..cf37c3d 100644 --- a/.github/workflows/docs-build.yml +++ b/.github/workflows/docs-build.yml @@ -1,20 +1,15 @@ name: docs-build - on: + pull_request: + types: [opened, synchronize, reopened] push: - branches: - - main - pull_request_target: ~ + branches: [main] merge_group: ~ - +permissions: + contents: read + pull-requests: read jobs: - docs-preview: - uses: elastic/docs-builder/.github/workflows/preview-build.yml@main + build: + uses: elastic/docs-actions/.github/workflows/docs-build.yml@v1 with: enable-vale-linting: true - path-pattern: docs/** - permissions: - deployments: write - id-token: write - contents: read - pull-requests: write diff --git a/.github/workflows/docs-cleanup.yml b/.github/workflows/docs-cleanup.yml deleted file mode 100644 index f83e017..0000000 --- a/.github/workflows/docs-cleanup.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: docs-cleanup - -on: - pull_request_target: - types: - - closed - -jobs: - docs-preview: - uses: elastic/docs-builder/.github/workflows/preview-cleanup.yml@main - permissions: - contents: none - id-token: write - deployments: write diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml new file mode 100644 index 0000000..3e44d15 --- /dev/null +++ b/.github/workflows/docs-deploy.yml @@ -0,0 +1,16 @@ +name: docs-deploy +on: + workflow_run: + workflows: [docs-build] + types: [completed] +permissions: + contents: read + deployments: write + id-token: write + pull-requests: write + actions: read +jobs: + deploy: + uses: elastic/docs-actions/.github/workflows/docs-deploy.yml@v1 + with: + enable-vale-linting: true diff --git a/.github/workflows/docs-preview-cleanup.yml b/.github/workflows/docs-preview-cleanup.yml new file mode 100644 index 0000000..b234c23 --- /dev/null +++ b/.github/workflows/docs-preview-cleanup.yml @@ -0,0 +1,11 @@ +name: docs-preview-cleanup +on: + pull_request_target: + types: [closed] +permissions: + contents: none + deployments: write + id-token: write +jobs: + cleanup: + uses: elastic/docs-actions/.github/workflows/docs-preview-cleanup.yml@v1 From 42a3f3a5af34c3460aec845229606133771a136f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2026 13:43:47 +0200 Subject: [PATCH 55/64] build(deps): bump docker/login-action (#397) Bumps the github-actions group with 1 update in the / directory: [docker/login-action](https://github.com/docker/login-action). Updates `docker/login-action` from 4.0.0 to 4.1.0 - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/b45d80f862d83dbcd57f89517bcf500b2ab88fb2...4907a6ddec9925e35a0a9e82d7399ccc52663121) --- updated-dependencies: - dependency-name: docker/login-action dependency-version: 4.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/updatecli.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updatecli.yml b/.github/workflows/updatecli.yml index f576f03..9c79e71 100644 --- a/.github/workflows/updatecli.yml +++ b/.github/workflows/updatecli.yml @@ -26,7 +26,7 @@ jobs: permission-contents: write permission-pull-requests: write - - uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 + - uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0 with: registry: ghcr.io username: ${{ github.actor }} From 213b9192a81633ac94718f65e236dd42d255fdeb Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Mon, 13 Apr 2026 09:37:20 +0200 Subject: [PATCH 56/64] deps: Bump updatecli version to v0.116.1 (#400) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: deps(updatecli): Bump updatecli version to v0.116.0 Made with ❤️️ by updatecli * chore: deps(updatecli): Bump updatecli version to v0.116.1 Made with ❤️️ by updatecli --------- Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 82ca587..8689eb6 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.115.0 \ No newline at end of file +updatecli v0.116.1 \ No newline at end of file From c5d178bf26d25b91348cfe085d88144a2e4d250b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar?= <56847527+LikeTheSalad@users.noreply.github.com> Date: Mon, 13 Apr 2026 15:03:14 +0200 Subject: [PATCH 57/64] Bumping log4j version (#402) --- .../co/elastic/logging/EcsJsonSerializer.java | 4 +++ log4j2-ecs-layout/pom.xml | 27 ++++++++++++++++--- .../log4j2/AbstractLog4j2EcsLayoutTest.java | 2 +- .../Log4j2EcsLayoutIntegrationTest.java | 2 +- .../logging/log4j2/Log4j2EcsLayoutTest.java | 4 +-- 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java b/ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java index dfb7411..46c802c 100644 --- a/ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java +++ b/ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java @@ -302,6 +302,10 @@ private static void formatStackTraceAsArray(StringBuilder builder, CharSequence if (index < length) { // append remaining line appendStackTraceLine(builder, stackTrace, index, length); + } else { + // stack trace ends with newline, remove trailing comma and newline + removeIfEndsWith(builder, NEW_LINE); + removeIfEndsWith(builder, ","); } } else { // no newlines found, add entire stack trace as single element diff --git a/log4j2-ecs-layout/pom.xml b/log4j2-ecs-layout/pom.xml index ea09d12..7d0e009 100644 --- a/log4j2-ecs-layout/pom.xml +++ b/log4j2-ecs-layout/pom.xml @@ -9,7 +9,7 @@ ${project.basedir}/.. - 2.17.1 + 2.25.4 log4j2-ecs-layout @@ -76,10 +76,31 @@ org.apache.logging.log4j - log4j-core + log4j-core-test ${version.log4j} - test-jar test + + + org.junit.platform + junit-platform-commons + + + org.junit.platform + junit-platform-launcher + + + org.junit.platform + junit-platform-engine + + + org.junit.jupiter + junit-jupiter-params + + + org.junit-pioneer + junit-pioneer + + diff --git a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/AbstractLog4j2EcsLayoutTest.java b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/AbstractLog4j2EcsLayoutTest.java index 3363a0f..60ab197 100644 --- a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/AbstractLog4j2EcsLayoutTest.java +++ b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/AbstractLog4j2EcsLayoutTest.java @@ -31,7 +31,7 @@ import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.message.ObjectMessage; -import org.apache.logging.log4j.test.appender.ListAppender; +import org.apache.logging.log4j.core.test.appender.ListAppender; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/Log4j2EcsLayoutIntegrationTest.java b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/Log4j2EcsLayoutIntegrationTest.java index 24fa667..97cd832 100644 --- a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/Log4j2EcsLayoutIntegrationTest.java +++ b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/Log4j2EcsLayoutIntegrationTest.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.JsonNode; import org.apache.logging.log4j.core.LoggerContext; -import org.apache.logging.log4j.test.appender.ListAppender; +import org.apache.logging.log4j.core.test.appender.ListAppender; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/Log4j2EcsLayoutTest.java b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/Log4j2EcsLayoutTest.java index 0896ce5..33f4af4 100644 --- a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/Log4j2EcsLayoutTest.java +++ b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/Log4j2EcsLayoutTest.java @@ -27,11 +27,11 @@ import com.fasterxml.jackson.databind.JsonNode; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.BasicConfigurationFactory; +import org.apache.logging.log4j.core.test.BasicConfigurationFactory; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.util.KeyValuePair; -import org.apache.logging.log4j.test.appender.ListAppender; +import org.apache.logging.log4j.core.test.appender.ListAppender; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; From cfc89c0866836cd346c82730ad786a739732ce59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9sar?= <56847527+LikeTheSalad@users.noreply.github.com> Date: Mon, 13 Apr 2026 15:04:29 +0200 Subject: [PATCH 58/64] Avoid bumping versions for legacy tests (#401) --- .github/dependabot.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2dad41c..922e2a4 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,6 +9,10 @@ updates: interval: "weekly" day: "sunday" time: "22:00" + exclude-paths: + - "log4j2-legacy-tests" + - "log4j-legacy-tests" + - "logback-legacy-tests" groups: github-actions: patterns: From 71ba8f8cecca8543f77226f3791876163dc0a304 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Tue, 21 Apr 2026 10:00:27 +0200 Subject: [PATCH 59/64] deps: Bump updatecli version to v0.116.3 (#403) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: deps(updatecli): Bump updatecli version to v0.116.2 Made with ❤️️ by updatecli * chore: deps(updatecli): Bump updatecli version to v0.116.3 Made with ❤️️ by updatecli --------- Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 8689eb6..23e5cc5 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.116.1 \ No newline at end of file +updatecli v0.116.3 \ No newline at end of file From 0404feb86a018ec3d8350598b991bf49da9c431e Mon Sep 17 00:00:00 2001 From: Aleksandra Spilkowska <96738481+alexandra5000@users.noreply.github.com> Date: Tue, 21 Apr 2026 15:11:29 +0200 Subject: [PATCH 60/64] docs: add applies_to frontmatter and scope Filebeat section to stack (#380) Co-authored-by: Cursor --- docs/reference/_structured_logging_with_log4j2.md | 5 +++++ docs/reference/index.md | 5 +++++ docs/reference/setup.md | 15 +++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/docs/reference/_structured_logging_with_log4j2.md b/docs/reference/_structured_logging_with_log4j2.md index 3662b59..013face 100644 --- a/docs/reference/_structured_logging_with_log4j2.md +++ b/docs/reference/_structured_logging_with_log4j2.md @@ -1,6 +1,11 @@ --- +applies_to: + stack: ga + serverless: ga mapped_pages: - https://www.elastic.co/guide/en/ecs-logging/java/current/_structured_logging_with_log4j2.html +products: + - id: ecs-logging --- # Structured logging with log4j2 [_structured_logging_with_log4j2] diff --git a/docs/reference/index.md b/docs/reference/index.md index d33178a..a941bec 100644 --- a/docs/reference/index.md +++ b/docs/reference/index.md @@ -1,7 +1,12 @@ --- +applies_to: + stack: ga + serverless: ga mapped_pages: - https://www.elastic.co/guide/en/ecs-logging/java/current/intro.html - https://www.elastic.co/guide/en/ecs-logging/java/current/index.html +products: + - id: ecs-logging --- # ECS Logging Java [intro] diff --git a/docs/reference/setup.md b/docs/reference/setup.md index 6c6ce28..0af8fa0 100644 --- a/docs/reference/setup.md +++ b/docs/reference/setup.md @@ -1,7 +1,12 @@ --- +applies_to: + stack: ga + serverless: ga mapped_pages: - https://www.elastic.co/guide/en/ecs-logging/java/current/setup.html navigation_title: Get started +products: + - id: ecs-logging --- # Get started with ECS Logging Java [setup] @@ -383,6 +388,11 @@ If you’re using the Elastic APM Java agent, log correlation is enabled by defa ## Step 2: Configure Filebeat [setup-step-2] +```{applies_to} +stack: ga +serverless: unavailable +``` + :::::::{tab-set} ::::::{tab-item} Log file @@ -476,6 +486,11 @@ For more information, see the [Filebeat reference](beats://reference/filebeat/co ### When `stackTraceAsArray` is enabled [setup-stack-trace-as-array] +```{applies_to} +stack: ga +serverless: unavailable +``` + Filebeat can normally only decode JSON if there is one JSON object per line. When `stackTraceAsArray` is enabled, there will be a new line for each stack trace element which improves readability. But when combining the multiline settings with a `decode_json_fields` we can also handle multi-line JSON: ```yaml From e0803725e23f3dc3349d8c50f73dd4d3b14bedce Mon Sep 17 00:00:00 2001 From: Anup Shetye Date: Tue, 21 Apr 2026 10:27:35 -0400 Subject: [PATCH 61/64] Fix unbounded StringBuilder retention in ThreadLocal (memory leak) (#391) getMessageStringBuilder() called setLength(0) which resets the logical length but never shrinks the internal char[] buffer. In thread-pool environments, a single large trace permanently bloats the buffer for that thread's lifetime, causing cumulative heap pressure. Add a capacity threshold check (8 KB) that discards oversized buffers and replaces them with fresh instances, while still reusing normally-sized buffers for zero-allocation steady state. Fixes #381 --- .../co/elastic/logging/EcsJsonSerializer.java | 18 +++++++++-- .../logging/EcsJsonSerializerTest.java | 32 +++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java b/ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java index 46c802c..8ff2cac 100644 --- a/ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java +++ b/ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java @@ -37,6 +37,8 @@ public class EcsJsonSerializer { private static final ThreadLocal messageStringBuilder = new ThreadLocal(); private static final String NEW_LINE = System.getProperty("line.separator"); private static final Pattern NEW_LINE_PATTERN = Pattern.compile("\\r\\n|\\n|\\r"); + private static final int INITIAL_BUFFER_CAPACITY = 1024; + static final int MAX_BUFFER_CAPACITY = 8192; public static CharSequence toNullSafeString(final CharSequence s) { return s == null ? "" : s; @@ -339,13 +341,23 @@ public static boolean endsWith(StringBuilder sb, String ending) { return true; } + /** + * Returns a thread-local {@link StringBuilder} for temporary message formatting. + *

+ * If the buffer has grown beyond {@link #MAX_BUFFER_CAPACITY} (e.g. due to a large stack trace), + * it is discarded and replaced with a fresh instance to prevent unbounded memory retention in + * long-lived thread-pool threads. + * + * @see #381 + */ public static StringBuilder getMessageStringBuilder() { StringBuilder result = messageStringBuilder.get(); - if (result == null) { - result = new StringBuilder(1024); + if (result == null || result.capacity() > MAX_BUFFER_CAPACITY) { + result = new StringBuilder(INITIAL_BUFFER_CAPACITY); messageStringBuilder.set(result); + } else { + result.setLength(0); } - result.setLength(0); return result; } diff --git a/ecs-logging-core/src/test/java/co/elastic/logging/EcsJsonSerializerTest.java b/ecs-logging-core/src/test/java/co/elastic/logging/EcsJsonSerializerTest.java index 3eca5e9..a6b611a 100644 --- a/ecs-logging-core/src/test/java/co/elastic/logging/EcsJsonSerializerTest.java +++ b/ecs-logging-core/src/test/java/co/elastic/logging/EcsJsonSerializerTest.java @@ -192,6 +192,38 @@ void serializeExceptionWithNullMessage() throws JsonProcessingException { assertThat(jsonNode.get(ERROR_MESSAGE)).isNull(); } + @Test + void getMessageStringBuilderDiscardsOversizedBuffer() { + // First call: initializes the thread-local StringBuilder + StringBuilder sb1 = EcsJsonSerializer.getMessageStringBuilder(); + assertThat(sb1.capacity()).isLessThanOrEqualTo(EcsJsonSerializer.MAX_BUFFER_CAPACITY); + + // Simulate a large log message / stack trace that bloats the buffer + sb1.append("x".repeat(EcsJsonSerializer.MAX_BUFFER_CAPACITY + 1)); + assertThat(sb1.capacity()).isGreaterThan(EcsJsonSerializer.MAX_BUFFER_CAPACITY); + + // Next call should detect the oversized buffer and replace it + StringBuilder sb2 = EcsJsonSerializer.getMessageStringBuilder(); + assertThat(sb2).isNotSameAs(sb1); + assertThat(sb2.capacity()).isLessThanOrEqualTo(EcsJsonSerializer.MAX_BUFFER_CAPACITY); + assertThat(sb2.length()).isZero(); + } + + @Test + void getMessageStringBuilderReuseNormallySizedBuffer() { + // First call: initializes the thread-local StringBuilder + StringBuilder sb1 = EcsJsonSerializer.getMessageStringBuilder(); + + // Append something that stays within the threshold + sb1.append("small message"); + assertThat(sb1.capacity()).isLessThanOrEqualTo(EcsJsonSerializer.MAX_BUFFER_CAPACITY); + + // Next call should reuse the same instance (just cleared) + StringBuilder sb2 = EcsJsonSerializer.getMessageStringBuilder(); + assertThat(sb2).isSameAs(sb1); + assertThat(sb2.length()).isZero(); + } + private void assertRemoveIfEndsWith(String builder, String ending, String expected) { StringBuilder sb = new StringBuilder(builder); EcsJsonSerializer.removeIfEndsWith(sb, ending); From 984434db986f9bb4bbf2c815a3eea95299ec1bf0 Mon Sep 17 00:00:00 2001 From: SylvainJuge <763082+SylvainJuge@users.noreply.github.com> Date: Wed, 22 Apr 2026 12:04:26 +0200 Subject: [PATCH 62/64] filter mdc + spring cleaning (#404) * remove some duplication * filter and spring cleaning * remove a few warnings * add test for mdc serialization * simplify to minimum and still allow to use service.* * fix compatibility with old jdk * Update ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java Co-authored-by: jackshirazi --------- Co-authored-by: jackshirazi --- .../co/elastic/logging/EcsJsonSerializer.java | 33 ++++++++++++++++--- .../logging/EcsJsonSerializerTest.java | 24 +++++++++++++- .../elastic/logging/jul/EcsFormatterTest.java | 24 ++++++++++---- .../logging/log4j2/DefaultMdcSerializer.java | 6 +--- .../logging/log4j2/CustomMdcSerializer.java | 6 +--- .../EcsLayoutWithCustomMdcSerializerTest.java | 24 ++++++++++++++ ...utWithNotExistCustomMdcSerializerTest.java | 24 ++++++++++++++ .../log4j2/MdcSerializerResolverTest.java | 24 ++++++++++++++ 8 files changed, 142 insertions(+), 23 deletions(-) diff --git a/ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java b/ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java index 8ff2cac..17ecd92 100644 --- a/ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java +++ b/ecs-logging-core/src/main/java/co/elastic/logging/EcsJsonSerializer.java @@ -26,8 +26,11 @@ import java.io.PrintWriter; import java.io.Writer; +import java.util.Arrays; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -40,6 +43,18 @@ public class EcsJsonSerializer { private static final int INITIAL_BUFFER_CAPACITY = 1024; static final int MAX_BUFFER_CAPACITY = 8192; + // Those keys are not expected to be used in MDC, thus we filter-out those keys to prevent major issues + // when they are present as top-level MDC keys. + private static final Set RESERVED_KEYS = new HashSet(Arrays.asList( + "@timestamp", + "message", + "log.logger", + "log.level", + "event.dataset", + "process.thread.name", + "process.thread.id", + "ecs.version")); + public static CharSequence toNullSafeString(final CharSequence s) { return s == null ? "" : s; } @@ -196,16 +211,24 @@ public static void serializeOrigin(StringBuilder builder, String fileName, Strin public static void serializeMDC(StringBuilder builder, Map properties) { if (properties != null && !properties.isEmpty()) { for (Map.Entry entry : properties.entrySet()) { - builder.append('\"'); String key = entry.getKey(); - JsonUtils.quoteAsString(key, builder); - builder.append("\":\""); - JsonUtils.quoteAsString(toNullSafeString(String.valueOf(entry.getValue())), builder); - builder.append("\","); + String value = String.valueOf(entry.getValue()); + serializeMdcEntry(builder, key, value); } } } + public static void serializeMdcEntry(StringBuilder builder, String key, String value) { + if (RESERVED_KEYS.contains(key)) { + return; + } + builder.append('\"'); + JsonUtils.quoteAsString(key, builder); + builder.append("\":\""); + JsonUtils.quoteAsString(toNullSafeString(value), builder); + builder.append("\","); + } + public static void serializeException(StringBuilder builder, Throwable thrown, boolean stackTraceAsArray) { if (thrown != null) { builder.append("\"error.type\":\""); diff --git a/ecs-logging-core/src/test/java/co/elastic/logging/EcsJsonSerializerTest.java b/ecs-logging-core/src/test/java/co/elastic/logging/EcsJsonSerializerTest.java index a6b611a..5953707 100644 --- a/ecs-logging-core/src/test/java/co/elastic/logging/EcsJsonSerializerTest.java +++ b/ecs-logging-core/src/test/java/co/elastic/logging/EcsJsonSerializerTest.java @@ -32,7 +32,9 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import java.util.stream.StreamSupport; @@ -99,7 +101,7 @@ void testEscaping() throws IOException { } @Test - void serializeNullDoesNotThrowAnException() throws JsonProcessingException { + void serializeNullDoesNotThrowAnException() { StringBuilder stringBuilder = new StringBuilder(); EcsJsonSerializer.serializeFormattedMessage(stringBuilder, null); assertThat(stringBuilder.toString()).isEqualTo("\"message\":\"null\","); @@ -229,4 +231,24 @@ private void assertRemoveIfEndsWith(String builder, String ending, String expect EcsJsonSerializer.removeIfEndsWith(sb, ending); assertThat(sb.toString()).isEqualTo(expected); } + + @Test + void serializeMdc() throws JsonProcessingException { + StringBuilder jsonBuilder = new StringBuilder(); + EcsJsonSerializer.serializeObjectStart(jsonBuilder, 0); + Map mdc = new HashMap(); + mdc.put("message", "mdc message"); + mdc.put("@timestamp", "mdc timestamp"); + mdc.put("mdc.key1", "mdc value 1"); + mdc.put("mdc_key2", "mdc value 2"); + EcsJsonSerializer.serializeFormattedMessage(jsonBuilder, "formatted message"); + EcsJsonSerializer.serializeMDC(jsonBuilder, mdc); + EcsJsonSerializer.serializeObjectEnd(jsonBuilder); + + JsonNode jsonNode = objectMapper.readTree(jsonBuilder.toString()); + assertThat(jsonNode.get("message").textValue()).isEqualTo("formatted message"); + assertThat(jsonNode.get("@timestamp").textValue()).isEqualTo("1970-01-01T00:00:00.000Z"); + assertThat(jsonNode.get("mdc.key1").textValue()).isEqualTo("mdc value 1"); + assertThat(jsonNode.get("mdc_key2").textValue()).isEqualTo("mdc value 2"); + } } diff --git a/jul-ecs-formatter/src/test/java/co/elastic/logging/jul/EcsFormatterTest.java b/jul-ecs-formatter/src/test/java/co/elastic/logging/jul/EcsFormatterTest.java index 573114d..ea92a0f 100644 --- a/jul-ecs-formatter/src/test/java/co/elastic/logging/jul/EcsFormatterTest.java +++ b/jul-ecs-formatter/src/test/java/co/elastic/logging/jul/EcsFormatterTest.java @@ -55,7 +55,7 @@ void setUp() { } @Test - public void testFormatWithIncludeOriginFlag() throws Exception { + public void testFormatWithIncludeOriginFlag() { formatter.setIncludeOrigin(true); final String result = formatter.format(record); @@ -65,13 +65,13 @@ public void testFormatWithIncludeOriginFlag() throws Exception { } @Test - public void testFormatWithoutIncludeOriginFlag() throws Exception { + public void testFormatWithoutIncludeOriginFlag() { final JsonNode result = parseJson(formatter.format(record)); assertThat(result.get("log.origin")).isNull(); } @Test - public void testFormatWithoutLoggerName() throws Exception { + public void testFormatWithoutLoggerName() { record.setLoggerName(null); final JsonNode result = parseJson(formatter.format(record)); @@ -80,7 +80,7 @@ public void testFormatWithoutLoggerName() throws Exception { } @Test - public void testFormatWithEmptyLoggerName() throws Exception { + public void testFormatWithEmptyLoggerName() { record.setLoggerName(""); final JsonNode result = parseJson(formatter.format(record)); @@ -89,7 +89,7 @@ public void testFormatWithEmptyLoggerName() throws Exception { } @Test - public void testFormatWithInnerClassName() throws Exception { + public void testFormatWithInnerClassName() { formatter.setIncludeOrigin(true); record.setSourceClassName("test.ExampleClass$InnerClass"); @@ -99,7 +99,7 @@ public void testFormatWithInnerClassName() throws Exception { } @Test - public void testFormatWithInvalidClassName() throws Exception { + public void testFormatWithInvalidClassName() { formatter.setIncludeOrigin(true); record.setSourceClassName("$test.ExampleClass"); @@ -110,13 +110,23 @@ public void testFormatWithInvalidClassName() throws Exception { @Test void testMdcSerialization_singleEntry() { - Map mdc = new HashMap<>(); + Map mdc = new HashMap(); TestMdcEcsFormatter mdcFormatter = new TestMdcEcsFormatter(mdc); mdc.put("mdc.key", "value"); JsonNode result = parseJson(mdcFormatter.format(record)); assertThat(result.get("mdc.key").textValue()).isEqualTo("value"); } + @Test + void testMdcSerialization_filterEntries() { + Map mdc = new HashMap(); + TestMdcEcsFormatter mdcFormatter = new TestMdcEcsFormatter(mdc); + mdc.put("message", "mdc message"); + mdc.put("@timestamp", "mdc timestamp"); + JsonNode result = parseJson(mdcFormatter.format(record)); + assertThat(result.get("message").textValue()).isEqualTo(record.getMessage()); + } + private static JsonNode parseJson(String formatter) { try { return objectMapper.readTree(formatter); diff --git a/log4j2-ecs-layout/src/main/java/co/elastic/logging/log4j2/DefaultMdcSerializer.java b/log4j2-ecs-layout/src/main/java/co/elastic/logging/log4j2/DefaultMdcSerializer.java index 3da690e..a5fc699 100644 --- a/log4j2-ecs-layout/src/main/java/co/elastic/logging/log4j2/DefaultMdcSerializer.java +++ b/log4j2-ecs-layout/src/main/java/co/elastic/logging/log4j2/DefaultMdcSerializer.java @@ -43,11 +43,7 @@ enum UsingContextData implements MdcSerializer { private static final TriConsumer WRITE_MDC = new TriConsumer() { @Override public void accept(final String key, final Object value, final StringBuilder stringBuilder) { - stringBuilder.append('\"'); - JsonUtils.quoteAsString(key, stringBuilder); - stringBuilder.append("\":\""); - JsonUtils.quoteAsString(EcsJsonSerializer.toNullSafeString(String.valueOf(value)), stringBuilder); - stringBuilder.append("\","); + EcsJsonSerializer.serializeMdcEntry(stringBuilder, key, String.valueOf(value)); } }; diff --git a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/CustomMdcSerializer.java b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/CustomMdcSerializer.java index c3bba8b..af13021 100644 --- a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/CustomMdcSerializer.java +++ b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/CustomMdcSerializer.java @@ -42,11 +42,7 @@ public void serializeMdc(LogEvent event, StringBuilder builder) { // Default function for serializing MDC entries private static final TriConsumer DEFAULT_WRITE_MDC_FUNCTION = (key, value, stringBuilder) -> { - stringBuilder.append('\"'); - JsonUtils.quoteAsString(key, stringBuilder); - stringBuilder.append("\":\""); - JsonUtils.quoteAsString(EcsJsonSerializer.toNullSafeString(String.valueOf(value)), stringBuilder); - stringBuilder.append("\","); + EcsJsonSerializer.serializeMdcEntry(stringBuilder, key, String.valueOf(value)); }; // Custom function for handling a specific key diff --git a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/EcsLayoutWithCustomMdcSerializerTest.java b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/EcsLayoutWithCustomMdcSerializerTest.java index 2cda0ea..d8e09df 100644 --- a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/EcsLayoutWithCustomMdcSerializerTest.java +++ b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/EcsLayoutWithCustomMdcSerializerTest.java @@ -1,3 +1,27 @@ +/*- + * #%L + * Java ECS logging + * %% + * Copyright (C) 2019 - 2026 Elastic and contributors + * %% + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * #L% + */ package co.elastic.logging.log4j2; import static co.elastic.logging.log4j2.CustomMdcSerializer.CUSTOM_MDC_SERIALIZER_TEST_KEY; diff --git a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/EcsLayoutWithNotExistCustomMdcSerializerTest.java b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/EcsLayoutWithNotExistCustomMdcSerializerTest.java index 170660e..38e5af4 100644 --- a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/EcsLayoutWithNotExistCustomMdcSerializerTest.java +++ b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/EcsLayoutWithNotExistCustomMdcSerializerTest.java @@ -1,3 +1,27 @@ +/*- + * #%L + * Java ECS logging + * %% + * Copyright (C) 2019 - 2026 Elastic and contributors + * %% + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * #L% + */ package co.elastic.logging.log4j2; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/MdcSerializerResolverTest.java b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/MdcSerializerResolverTest.java index 906fe9e..7abdc4b 100644 --- a/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/MdcSerializerResolverTest.java +++ b/log4j2-ecs-layout/src/test/java/co/elastic/logging/log4j2/MdcSerializerResolverTest.java @@ -1,3 +1,27 @@ +/*- + * #%L + * Java ECS logging + * %% + * Copyright (C) 2019 - 2026 Elastic and contributors + * %% + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * #L% + */ package co.elastic.logging.log4j2; import org.junit.jupiter.api.Test; From 1649f9856abedbac906c3a79cfdba0020f823936 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Mon, 27 Apr 2026 12:42:43 +0200 Subject: [PATCH 63/64] pre release: ecs-logging-java v1.8.0 (#405) Co-authored-by: obltmachine --- ecs-logging-core/pom.xml | 2 +- jboss-logmanager-ecs-formatter/pom.xml | 2 +- jul-ecs-formatter/pom.xml | 2 +- log4j-ecs-layout/pom.xml | 2 +- log4j-legacy-tests/pom.xml | 2 +- log4j2-ecs-layout/pom.xml | 2 +- log4j2-legacy-tests/pom.xml | 2 +- logback-ecs-encoder/pom.xml | 2 +- logback-legacy-tests/pom.xml | 2 +- pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ecs-logging-core/pom.xml b/ecs-logging-core/pom.xml index 31363c9..2b07d67 100644 --- a/ecs-logging-core/pom.xml +++ b/ecs-logging-core/pom.xml @@ -3,7 +3,7 @@ ecs-logging-java-parent co.elastic.logging - 1.7.1-SNAPSHOT + 1.8.0 4.0.0 diff --git a/jboss-logmanager-ecs-formatter/pom.xml b/jboss-logmanager-ecs-formatter/pom.xml index 0d1258e..0576c08 100644 --- a/jboss-logmanager-ecs-formatter/pom.xml +++ b/jboss-logmanager-ecs-formatter/pom.xml @@ -3,7 +3,7 @@ ecs-logging-java-parent co.elastic.logging - 1.7.1-SNAPSHOT + 1.8.0 4.0.0 diff --git a/jul-ecs-formatter/pom.xml b/jul-ecs-formatter/pom.xml index 85e8299..26557f9 100644 --- a/jul-ecs-formatter/pom.xml +++ b/jul-ecs-formatter/pom.xml @@ -3,7 +3,7 @@ ecs-logging-java-parent co.elastic.logging - 1.7.1-SNAPSHOT + 1.8.0 4.0.0 diff --git a/log4j-ecs-layout/pom.xml b/log4j-ecs-layout/pom.xml index 1303a16..5c2f0e0 100644 --- a/log4j-ecs-layout/pom.xml +++ b/log4j-ecs-layout/pom.xml @@ -3,7 +3,7 @@ ecs-logging-java-parent co.elastic.logging - 1.7.1-SNAPSHOT + 1.8.0 4.0.0 diff --git a/log4j-legacy-tests/pom.xml b/log4j-legacy-tests/pom.xml index a8c4170..3479d0e 100644 --- a/log4j-legacy-tests/pom.xml +++ b/log4j-legacy-tests/pom.xml @@ -3,7 +3,7 @@ ecs-logging-java-parent co.elastic.logging - 1.7.1-SNAPSHOT + 1.8.0 4.0.0 diff --git a/log4j2-ecs-layout/pom.xml b/log4j2-ecs-layout/pom.xml index 7d0e009..f42ce96 100644 --- a/log4j2-ecs-layout/pom.xml +++ b/log4j2-ecs-layout/pom.xml @@ -3,7 +3,7 @@ ecs-logging-java-parent co.elastic.logging - 1.7.1-SNAPSHOT + 1.8.0 4.0.0 diff --git a/log4j2-legacy-tests/pom.xml b/log4j2-legacy-tests/pom.xml index aaa3b59..841b7e4 100644 --- a/log4j2-legacy-tests/pom.xml +++ b/log4j2-legacy-tests/pom.xml @@ -3,7 +3,7 @@ ecs-logging-java-parent co.elastic.logging - 1.7.1-SNAPSHOT + 1.8.0 4.0.0 diff --git a/logback-ecs-encoder/pom.xml b/logback-ecs-encoder/pom.xml index c0bb147..612bfb2 100644 --- a/logback-ecs-encoder/pom.xml +++ b/logback-ecs-encoder/pom.xml @@ -3,7 +3,7 @@ ecs-logging-java-parent co.elastic.logging - 1.7.1-SNAPSHOT + 1.8.0 4.0.0 diff --git a/logback-legacy-tests/pom.xml b/logback-legacy-tests/pom.xml index 6db286b..84ce12f 100644 --- a/logback-legacy-tests/pom.xml +++ b/logback-legacy-tests/pom.xml @@ -3,7 +3,7 @@ ecs-logging-java-parent co.elastic.logging - 1.7.1-SNAPSHOT + 1.8.0 4.0.0 diff --git a/pom.xml b/pom.xml index e983f89..d6e64c9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ co.elastic.logging ecs-logging-java-parent - 1.7.1-SNAPSHOT + 1.8.0 ${project.groupId}:${project.artifactId} ecs-logging-core From 4988ae8a3b6586fa2a854b8fabe52a124e5dfab3 Mon Sep 17 00:00:00 2001 From: SylvainJuge <763082+SylvainJuge@users.noreply.github.com> Date: Mon, 27 Apr 2026 13:16:34 +0200 Subject: [PATCH 64/64] add missing project.name in some pom.xml (#406) --- ecs-logging-core/pom.xml | 1 + log4j-legacy-tests/pom.xml | 1 + log4j2-legacy-tests/pom.xml | 1 + logback-legacy-tests/pom.xml | 1 + 4 files changed, 4 insertions(+) diff --git a/ecs-logging-core/pom.xml b/ecs-logging-core/pom.xml index 2b07d67..6bd23fa 100644 --- a/ecs-logging-core/pom.xml +++ b/ecs-logging-core/pom.xml @@ -8,6 +8,7 @@ 4.0.0 ecs-logging-core + ${project.groupId}:${project.artifactId} ${project.basedir}/.. diff --git a/log4j-legacy-tests/pom.xml b/log4j-legacy-tests/pom.xml index 3479d0e..6261545 100644 --- a/log4j-legacy-tests/pom.xml +++ b/log4j-legacy-tests/pom.xml @@ -8,6 +8,7 @@ 4.0.0 log4j-legacy-tests + ${project.groupId}:${project.artifactId} ${project.basedir}/.. diff --git a/log4j2-legacy-tests/pom.xml b/log4j2-legacy-tests/pom.xml index 841b7e4..e7b1435 100644 --- a/log4j2-legacy-tests/pom.xml +++ b/log4j2-legacy-tests/pom.xml @@ -8,6 +8,7 @@ 4.0.0 log4j2-legacy-tests + ${project.groupId}:${project.artifactId} 2.6 diff --git a/logback-legacy-tests/pom.xml b/logback-legacy-tests/pom.xml index 84ce12f..775ca3d 100644 --- a/logback-legacy-tests/pom.xml +++ b/logback-legacy-tests/pom.xml @@ -8,6 +8,7 @@ 4.0.0 logback-legacy-tests + ${project.groupId}:${project.artifactId} ${project.basedir}/..