Merge branch 'main' into gh-oblt/add-asciidoc-freeze-warning

.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,20 +85,20 @@ 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 }}
         subject-digest: ${{ steps.docker-push.outputs.digest }}
         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 }}"
 

.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,20 +78,20 @@ 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 }}
         subject-digest: ${{ steps.docker-push.outputs.digest }}
         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 }}"
 

.tool-versions

@@ -1 +1 @@
-updatecli v0.89.0
+updatecli v0.93.0

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:
 

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": [