Merge branch 'main' into feature/provenance

elastic · May 28, 2024 · e105c8b · e105c8b
2 parents 9e4532b + d73446f
commit e105c8b
Show file tree

Hide file tree

Showing 30 changed files with 199 additions and 296 deletions.
diff --git a/.ci/updatecli/updatecli.d/update-gherkin-specs.yml b/.ci/updatecli/updatecli.d/update-gherkin-specs.yml
@@ -5,22 +5,21 @@ scms:
   default:
     kind: github
     spec:
-      user: '{{ requiredEnv "GIT_USER" }}'
-      email: '{{ requiredEnv "GIT_EMAIL" }}'
+      user: '{{ requiredEnv "GITHUB_ACTOR" }}'
       owner: "{{ .github.owner }}"
       repository: "{{ .github.repository }}"
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
-      username: '{{ requiredEnv "GIT_USER" }}'
+      username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       branch: "{{ .github.branch }}"
+      commitusingapi: true
   apm:
     kind: github
     spec:
-      user: '{{ requiredEnv "GIT_USER" }}'
-      email: '{{ requiredEnv "GIT_EMAIL" }}'
+      user: '{{ requiredEnv "GITHUB_ACTOR" }}'
       owner: "{{ .github.owner }}"
       repository: "{{ .github.apm_repository }}"
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
-      username: '{{ requiredEnv "GIT_USER" }}'
+      username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       branch: "{{ .github.branch }}"
 
 sources:

diff --git a/.ci/updatecli/updatecli.d/update-json-specs.yml b/.ci/updatecli/updatecli.d/update-json-specs.yml
@@ -5,22 +5,21 @@ scms:
   default:
     kind: github
     spec:
-      user: '{{ requiredEnv "GIT_USER" }}'
-      email: '{{ requiredEnv "GIT_EMAIL" }}'
+      user: '{{ requiredEnv "GITHUB_ACTOR" }}'
       owner: "{{ .github.owner }}"
       repository: "{{ .github.repository }}"
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
-      username: '{{ requiredEnv "GIT_USER" }}'
+      username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       branch: "{{ .github.branch }}"
+      commitusingapi: true
   apm:
     kind: github
     spec:
-      user: '{{ requiredEnv "GIT_USER" }}'
-      email: '{{ requiredEnv "GIT_EMAIL" }}'
+      user: '{{ requiredEnv "GITHUB_ACTOR" }}'
       owner: "{{ .github.owner }}"
       repository: "{{ .github.apm_repository }}"
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
-      username: '{{ requiredEnv "GIT_USER" }}'
+      username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       branch: "{{ .github.branch }}"
 
 sources:

diff --git a/.ci/updatecli/updatecli.d/update-specs.yml b/.ci/updatecli/updatecli.d/update-specs.yml
@@ -5,23 +5,22 @@ scms:
   default:
     kind: github
     spec:
-      user: '{{ requiredEnv "GIT_USER" }}'
-      email: '{{ requiredEnv "GIT_EMAIL" }}'
+      user: '{{ requiredEnv "GITHUB_ACTOR" }}'
       owner: "{{ .github.owner }}"
       repository: "{{ .github.repository }}"
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
-      username: '{{ requiredEnv "GIT_USER" }}'
+      username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       branch: "{{ .github.branch }}"
+      commitusingapi: true
 
   apm-data:
     kind: github
     spec:
-      user: '{{ requiredEnv "GIT_USER" }}'
-      email: '{{ requiredEnv "GIT_EMAIL" }}'
+      user: '{{ requiredEnv "GITHUB_ACTOR" }}'
       owner: "{{ .github.owner }}"
       repository: "{{ .github.apm_data_repository }}"
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
-      username: '{{ requiredEnv "GIT_USER" }}'
+      username: '{{ requiredEnv "GITHUB_ACTOR" }}'
       branch: "{{ .github.branch }}"
 
 sources:

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -40,16 +40,3 @@ updates:
       github-actions:
         patterns:
           - "*"
-  - package-ecosystem: "github-actions"
-    directory: "/.github/workflows/test"
-    schedule:
-      interval: "weekly"
-      day: "sunday"
-      time: "22:00"
-    reviewers:
-      - "elastic/observablt-ci"
-    groups:
-      github-actions:
-        patterns:
-          - "*"
-
diff --git a/.github/workflows/test-linux-reporter.yml b/.github/workflows/test-linux-reporter.yml
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -23,7 +23,7 @@ concurrency:
 
 env:
   NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
-
+  
 jobs:
   pack:
     runs-on: ubuntu-latest
@@ -56,16 +56,14 @@ jobs:
       - uses: actions/checkout@v4
       - name: Bootstrap Action Workspace
         uses: ./.github/workflows/bootstrap
-
-      - name: Build
-        shell: bash
-        run: dotnet build -c Release --verbosity minimal
 
       - name: 'Tests: Unit'
-        uses: ./.github/workflows/test
-        with:
-            name: 'unit'
-            filter: 'FullyQualifiedName!~Elastic.Apm.StartupHook.Tests&FullyQualifiedName!~Elastic.Apm.Profiler.Managed.Tests&FullyQualifiedName!~Elastic.Apm.Azure'
+        shell: bash
+        run: ./build.sh test --test-suite unit
+
+      - name: 'Tests: Integrations'
+        shell: bash
+        run: ./build.sh test --test-suite integrations
 
   azure-tests:
     runs-on: ubuntu-latest
@@ -80,10 +78,6 @@ jobs:
         with:
           azure: 'true'
 
-      - name: Build
-        shell: bash
-        run: dotnet build -c Release --verbosity minimal
-
       - name: 'Read credentials'
         uses: hashicorp/[email protected]
         with:
@@ -104,11 +98,9 @@ jobs:
           echo "AZURE_RESOURCE_GROUP_PREFIX=ci-dotnet-${GITHUB_RUN_ID}" >> ${GITHUB_ENV}
 
       - name: 'Tests: Azure'
-        uses: ./.github/workflows/test
-        with:
-          name: 'azure'
-          filter: 'FullyQualifiedName~Elastic.Apm.Azure'
-
+        shell: bash
+        run: ./build.sh test --test-suite azure
+
       - name: 'Teardown tests infra'
         if: ${{ always() }}
         run: |
@@ -124,16 +116,10 @@ jobs:
     - name: Bootstrap Action Workspace
       uses: ./.github/workflows/bootstrap
 
-    - name: Build agent-zip
-      run: ./build.sh agent-zip
-
     - name: 'Tests: StartupHooks'
-      uses: ./.github/workflows/test
-      with:
-        name: 'startuphooks'
-        project: 'test/startuphook/Elastic.Apm.StartupHook.Tests/Elastic.Apm.StartupHook.Tests.csproj'
-
-
+      shell: bash
+      run: ./build.sh test --test-suite startuphooks
+
   profiler-tests:
     runs-on: ubuntu-latest
 
@@ -145,14 +131,9 @@ jobs:
       with:
           rust: 'true'
 
-    - name: Build profiler
-      run: ./build.sh profiler-zip
-
     - name: 'Tests: Profiler'
-      uses: ./.github/workflows/test
-      with:
-          name: 'profiler'
-          project: 'test/profiler/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj'
+      shell: bash
+      run: ./build.sh test --test-suite profiler
 
     - name: Build Profiler Docker Image
       run: |

diff --git a/.github/workflows/test-windows-iis-reporter.yml b/.github/workflows/test-windows-iis-reporter.yml
diff --git a/.github/workflows/test-windows-reporter.yml b/.github/workflows/test-windows-reporter.yml
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -38,21 +38,18 @@ jobs:
       - name: Bootstrap Action Workspace
         uses: ./.github/workflows/bootstrap
 
-      - name: Build
-        run: dotnet build -c Release --verbosity minimal
-
       - name: Setup Testcontainers Cloud Client
         if: github.event_name != 'pull_request' || github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
         uses: atomicjar/testcontainers-cloud-setup-action@v1
         with:
           token: ${{ secrets.TC_CLOUD_TOKEN }}
 
       - name: 'Tests: Unit'
-        uses: ./.github/workflows/test
-        with:
-          name: 'unit'
-          filter: 'FullyQualifiedName!~Elastic.Apm.StartupHook.Tests&FullyQualifiedName!~Elastic.Apm.Profiler.Managed.Tests&FullyQualifiedName!~Elastic.Apm.Azure'
-          framework: '' # reset to test all .NET frameworks including net462
+        run: ./build.bat test --test-suite unit
+
+      - name: 'Tests: Integrations'
+        shell: bash
+        run: ./build.bat test --test-suite integrations
 
   startup-hook-tests:
     runs-on: windows-2022
@@ -62,14 +59,8 @@ jobs:
       - name: Bootstrap Action Workspace
         uses: ./.github/workflows/bootstrap
 
-      - name: Build agent-zip
-        run: ./build.bat agent-zip
-
       - name: 'Tests: StartupHooks'
-        uses: ./.github/workflows/test
-        with:
-          name: 'startuphooks'
-          project: 'test/startuphook/Elastic.Apm.StartupHook.Tests/Elastic.Apm.StartupHook.Tests.csproj'
+        run: ./build.bat test --test-suite startuphooks
 
   profiler-tests:
     runs-on: windows-2022
@@ -82,17 +73,11 @@ jobs:
         with:
           rust: 'true'
 
-      - name: Build profiler
-        run: ./build.bat profiler-zip
-
       - name: Setup Testcontainers Cloud Client
         if: github.event_name != 'pull_request' || github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
         uses: atomicjar/testcontainers-cloud-setup-action@v1
         with:
           token: ${{ secrets.TC_CLOUD_TOKEN }}
 
       - name: 'Tests: Profiler'
-        uses: ./.github/workflows/test
-        with:
-          name: 'profiler'
-          project: 'test/profiler/Elastic.Apm.Profiler.Managed.Tests/Elastic.Apm.Profiler.Managed.Tests.csproj'
+        run: ./build.bat test --test-suite profiler