From 58e4a484ccf5e900118397d68077f75ea078875d Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 12:23:33 +0000 Subject: [PATCH 1/4] [Automation] Update JSON server schema specs (#2542) ### What APM agent json server schema automatic sync ### Why *Changeset* * https://github.com/elastic/apm-data/pull/424 * https://github.com/elastic/apm-data/commit/184e8d7fd0c3063688603db090f0c4c3850f93aa ---

automation: update JSON server schema specs

APM agent json server schema 184e8d7fd0c3063688603db090f0c4c3850f93aa

ran shell command "tar -xzf /home/runner/work/apm-agent-dotnet/apm-agent-dotnet/json-schema.tgz && git --no-pager diff"

GitHub Action workflow link ---
Updatecli logo

Created automatically by Updatecli

Options:

Most of Updatecli configuration is done via its manifest(s).

  • If you close this pull request, Updatecli will automatically reopen it, the next time it runs.
  • If you close this pull request and delete the base branch, Updatecli will automatically recreate it, erasing all previous commits made.

Feel free to report any issues at github.com/updatecli/updatecli.
If you find this tool useful, do not hesitate to star our GitHub repository as a sign of appreciation, and/or to tell us directly on our chat!

Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com> --- src/Elastic.Apm.Specification/specs/span.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Elastic.Apm.Specification/specs/span.json b/src/Elastic.Apm.Specification/specs/span.json index e86da9a69..14eea1b15 100644 --- a/src/Elastic.Apm.Specification/specs/span.json +++ b/src/Elastic.Apm.Specification/specs/span.json @@ -188,6 +188,9 @@ "object" ], "properties": { + "body": { + "description": "The http request body usually as a string, but may be a dictionary for multipart/form-data content" + }, "id": { "description": "ID holds the unique identifier for the http request.", "type": [ From 801fc08962f777510c062be8aab8bf6d10a45ed5 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 12:23:57 +0000 Subject: [PATCH 2/4] deps: Bump updatecli version to v0.93.0 (#2543) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit

deps: Bump updatecli version

deps(updatecli): Bump updatecli version to v0.93.0

1 file(s) updated with "updatecli v0.93.0": * .tool-versions

v0.92.0 
Release published on the 2025-01-12 08:14:30 +0000 UTC at the
url
https://github.com/updatecli/updatecli/releases/tag/v0.92.0

##
Changes

## 🚀 Features

-
githubaction autodiscovery should allow for pinning version to commit
hash @loispostula (#3508)
- improvement(httpclient): add
support for http proxy in retry client @ryancurrah (#3516)
-
feat: add versionfilter of kind lexicographical @acobaugh
(#3371)
- feat: add versionfilter of kind time @olblak
(#3405)

## 🐛 Bug Fixes

-
fix(autodiscovery/helm): correctly handle ignore/only rule @olblak
(#3501)
- fix(autodiscovery/dockercompose): correctly set arch
@olblak (#3500)
- fix(helm): retrieve correct helm chart
changelog based on a version @olblak (#3489)
- fix(helm):
Protect against undefined sourceSpec @kuisathaverat (#3369)
-
fix(autodiscovery/argocd): ArgoCD autodiscovery for OCI registry
@dshmelev (#3461)
- fix!(versionfilter): preserve original
version for regex/semver @mcwarman (#3404)
- fix: use latest
when tag is not set in autodiscover @kuisathaverat
(#3370)

## 🧰 Maintenance

-
refactor(git): git error messages @olblak (#3460)
-
refactor(json): improving json error message @olblak (#3458)
-
Adds devcontainer @btrepp (#2807)
- deps(go): bump module
github.com/testcontainers/testcontainers-go @updateclibot
(#3517)
- deps(go): bump module github.com/go-git/go-git/v5
@updateclibot (#3447)
- deps(go): bump module
golang.org/x/oauth2 @updateclibot (#3430)
- deps(go): bump
module github.com/zclconf/go-cty @updateclibot (#3431)
-
deps(go): bump module github.com/goccy/go-yaml @updateclibot
(#3394)
- deps(go): bump module github.com/invopop/jsonschema
@updateclibot (#3387)
- deps(go): bump module
github.com/go-git/go-git/v5 @updateclibot (#3375)

##
Contributors

@acobaugh, @btrepp, @dshmelev,
@kuisathaverat, @loispostula, @mcwarman, @olblak, @ryancurrah,
@updateclibot and @updateclibot[bot]
v0.93.0 
Release published on the 2025-01-24 08:50:31 +0000 UTC at the
url
https://github.com/updatecli/updatecli/releases/tag/v0.93.0

##
Changes

## ⚠️ Security

- fix:
Maven credentials exposed in console output
[CVE-2025-24355](https://github.com/updatecli/updatecli/security/advisories/GHSA-v34r-vj4r-38j6)


## 🚀 Features

- feat: github
action autodiscovery support docker @olblak
(#3633)

## 🐛 Bug Fixes

- fix:
Maven credentials exposed in console output @olblak (#3659)
-
fix(githubaction): correctly ignore relative path action @olblak
(#3562)
- fix(gittag): always return lightweight git tag
@olblak (#3561)

## 🧰 Maintenance

-
deps(go): bump module helm.sh/helm/v3
@[updateclibot[bot]](https://github.com/apps/updateclibot)
(#3685)
- deps(go): bump module github.com/zclconf/go-cty
@[updateclibot[bot]](https://github.com/apps/updateclibot)
(#3679)
- deps(go): bump module github.com/go-git/go-git/v5
@[updateclibot[bot]](https://github.com/apps/updateclibot)
(#3638)
- deps: Bump Golang version to 1.23.5
@[updateclibot[bot]](https://github.com/apps/updateclibot)
(#3616)
- deps(go): bump module github.com/zclconf/go-cty
@[updateclibot[bot]](https://github.com/apps/updateclibot)
(#3602)
- deps(go): bump module github.com/goccy/go-yaml
@[updateclibot[bot]](https://github.com/apps/updateclibot)
(#3606)
- deps(go): bump module
github.com/google/go-containerregistry
@[updateclibot[bot]](https://github.com/apps/updateclibot)
(#3591)
- deps(go): bump module github.com/goccy/go-yaml
@[updateclibot[bot]](https://github.com/apps/updateclibot)
(#3584)
- deps(go): bump module
github.com/hashicorp/terraform-registry-address
@[updateclibot[bot]](https://github.com/apps/updateclibot)
(#3547)

## Contributors

@olblak,
@updateclibot[bot] and
[updateclibot[bot]](https://github.com/apps/updateclibot)
GitHub Action workflow link ---
Updatecli logo

Created automatically by Updatecli

Options:

Most of Updatecli configuration is done via its manifest(s).

  • If you close this pull request, Updatecli will automatically reopen it, the next time it runs.
  • If you close this pull request and delete the base branch, Updatecli will automatically recreate it, erasing all previous commits made.

Feel free to report any issues at github.com/updatecli/updatecli.
If you find this tool useful, do not hesitate to star our GitHub repository as a sign of appreciation, and/or to tell us directly on our chat!

--------- 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 433f827ca..9846e7746 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -updatecli v0.89.0 \ No newline at end of file +updatecli v0.93.0 \ No newline at end of file From b5257887cfc1601068e221bfbc9f35ad8bf74ced Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 12:24:25 +0000 Subject: [PATCH 3/4] Bump the github-actions group across 1 directory with 2 updates (#2546) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps the github-actions group with 2 updates in the / directory: [actions/attest-build-provenance](https://github.com/actions/attest-build-provenance) and [docker/build-push-action](https://github.com/docker/build-push-action). Updates `actions/attest-build-provenance` from 2.1.0 to 2.2.0
Release notes

Sourced from actions/attest-build-provenance's releases.

v2.2.0

What's Changed

Full Changelog: https://github.com/actions/attest-build-provenance/compare/v2.1.0...v2.2.0

Commits

Updates `docker/build-push-action` from 6.11.0 to 6.13.0
Release notes

Sourced from docker/build-push-action's releases.

v6.13.0

Full Changelog: https://github.com/docker/build-push-action/compare/v6.12.0...v6.13.0

v6.12.0

Full Changelog: https://github.com/docker/build-push-action/compare/v6.11.0...v6.12.0

Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore ` will remove the ignore condition of the specified dependency and ignore conditions
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release-main.yml | 10 +++++----- .github/workflows/release.yml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release-main.yml b/.github/workflows/release-main.yml index 275dd0d67..0171802a2 100644 --- a/.github/workflows/release-main.yml +++ b/.github/workflows/release-main.yml @@ -35,7 +35,7 @@ jobs: run: ./build.sh pack - name: generate build provenance - uses: actions/attest-build-provenance@7668571508540a607bdfd90a87a560489fe372eb # v2.1.0 + uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0 with: subject-path: "${{ github.workspace }}/build/output/_packages/*.nupkg" @@ -72,7 +72,7 @@ jobs: - name: Build and Push Profiler Docker Image id: docker-push continue-on-error: true # continue for now until we see it working in action - uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0 + uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0 with: cache-from: type=gha cache-to: type=gha,mode=max @@ -85,7 +85,7 @@ jobs: AGENT_ZIP_FILE=${{ env.PREFIX_APM_PROFILER }}${{ steps.bootstrap.outputs.agent-version }}${{ env.SUFFIX_APM_PROFILER }} - name: Attest image - uses: actions/attest-build-provenance@7668571508540a607bdfd90a87a560489fe372eb # v2.1.0 + uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0 continue-on-error: true # continue for now until we see it working in action with: subject-name: ${{ env.DOCKER_IMAGE_NAME }} @@ -93,12 +93,12 @@ jobs: push-to-registry: true - name: generate build provenance (APM Agent) - uses: actions/attest-build-provenance@7668571508540a607bdfd90a87a560489fe372eb # v2.1.0 + uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0 with: subject-path: "${{ github.workspace }}/${{ env.PREFIX_APM_AGENT }}${{ steps.bootstrap.outputs.agent-version }}${{ env.SUFFIX_APM_AGENT }}" - name: generate build provenance (APM Profiler) - uses: actions/attest-build-provenance@7668571508540a607bdfd90a87a560489fe372eb # v2.1.0 + uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0 with: subject-path: "${{ github.workspace }}/${{ env.PREFIX_APM_PROFILER }}${{ steps.bootstrap.outputs.agent-version }}${{ env.SUFFIX_APM_PROFILER }}" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a3b55c723..6e3d49429 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,7 +65,7 @@ jobs: - name: Build and Push Profiler Docker Image id: docker-push continue-on-error: true # continue for now until we see it working in action - uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0 + uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0 with: cache-from: type=gha cache-to: type=gha,mode=max @@ -78,7 +78,7 @@ jobs: AGENT_ZIP_FILE=${{ env.PREFIX_APM_PROFILER }}${{ steps.bootstrap.outputs.agent-version }}${{ env.SUFFIX_APM_PROFILER }} - name: Attest image - uses: actions/attest-build-provenance@7668571508540a607bdfd90a87a560489fe372eb # v2.1.0 + uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0 continue-on-error: true # continue for now until we see it working in action with: subject-name: ${{ env.DOCKER_IMAGE_NAME }} @@ -86,12 +86,12 @@ jobs: push-to-registry: true - name: generate build provenance (APM Agent) - uses: actions/attest-build-provenance@7668571508540a607bdfd90a87a560489fe372eb # v2.1.0 + uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0 with: subject-path: "${{ github.workspace }}/${{ env.PREFIX_APM_AGENT }}${{ steps.bootstrap.outputs.agent-version }}${{ env.SUFFIX_APM_AGENT }}" - name: generate build provenance (APM Profiler) - uses: actions/attest-build-provenance@7668571508540a607bdfd90a87a560489fe372eb # v2.1.0 + uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0 with: subject-path: "${{ github.workspace }}/${{ env.PREFIX_APM_PROFILER }}${{ steps.bootstrap.outputs.agent-version }}${{ env.SUFFIX_APM_PROFILER }}" @@ -147,7 +147,7 @@ jobs: run: ./build.bat profiler-zip - name: generate build provenance (APM Profiler) - uses: actions/attest-build-provenance@7668571508540a607bdfd90a87a560489fe372eb # v2.1.0 + uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0 with: subject-path: "${{ github.workspace }}/${{ env.PREFIX_ZIP_FILE }}${{ steps.bootstrap.outputs.agent-version }}${{ env.SUFFIX_ZIP_FILE }}" From a0458c95c157a3f08162ae54f17f6c7d407591ea Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Mon, 3 Feb 2025 12:53:41 +0000 Subject: [PATCH 4/4] Add note about auto-instrumentation and satellite assemblies (#2533) As titled. --- docs/setup-auto-instrumentation.asciidoc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/setup-auto-instrumentation.asciidoc b/docs/setup-auto-instrumentation.asciidoc index f4859660f..b34842834 100644 --- a/docs/setup-auto-instrumentation.asciidoc +++ b/docs/setup-auto-instrumentation.asciidoc @@ -35,9 +35,12 @@ _* Due to binding issues introduced by Microsoft, we recommend at least .NET Fra _** Minimum GLIBC version 2.14._ -NOTE: The profiler-based agent only supports 64-bit applications. 32-bit applications aren't supported. +IMPORTANT: The profiler-based agent only supports 64-bit applications. 32-bit applications aren't supported. -NOTE: The profiler-based agent does not currently support ARM. +IMPORTANT: The profiler-based agent does not currently support ARM. + +IMPORTANT: The profiler-based agent does not currently support instrumenting applications which use resources contained in +satellite assemblies. See https://github.com/elastic/apm-agent-dotnet/issues/2339[this issue] for more details. It instruments the following assemblies: