Merge branch 'main' into j_config_merge_override

SumoLogic · Sep 20, 2024 · 6bc6400 · 6bc6400
2 parents c2f28b6 + 62c4b5f
commit 6bc6400
Show file tree

Hide file tree

Showing 106 changed files with 5,114 additions and 3,455 deletions.
diff --git a/.changelog/1600.added.txt b/.changelog/1600.added.txt
diff --git a/.changelog/1601.changed.txt b/.changelog/1601.changed.txt
diff --git a/.changelog/1605.added.txt b/.changelog/1605.added.txt
diff --git a/.changelog/1611.changed.txt b/.changelog/1611.changed.txt
diff --git a/.changelog/1614.added.txt b/.changelog/1614.added.txt
diff --git a/.changelog/1619.changed.txt b/.changelog/1619.changed.txt
diff --git a/.changelog/1632.fixed.txt b/.changelog/1632.fixed.txt
diff --git a/.github/workflows/dev_builds.yml b/.github/workflows/dev_builds.yml
@@ -11,7 +11,7 @@ defaults:
     shell: bash
 
 env:
-  GO_VERSION: "1.21.4"
+  GO_VERSION: "1.22.6"
 
 jobs:
   get-version:
@@ -100,6 +100,25 @@ jobs:
       save-cache: true
       boringcrypto: ${{ matrix.boringcrypto == true }}
 
+  test-otelcol-config:
+    name: Test (otelcol-config)
+    uses: ./.github/workflows/workflow-test-otelcol-config.yml
+    strategy:
+      matrix:
+        include:
+          - arch_os: linux_amd64
+            runs-on: ubuntu-20.04
+          - arch_os: linux_amd64
+            runs-on: ubuntu-20.04
+            boringcrypto: true
+          - arch_os: darwin_amd64
+            runs-on: macos-latest
+    with:
+      arch_os: ${{ matrix.arch_os }}
+      runs-on: ${{ matrix.runs-on }}
+      save-cache: true
+      boringcrypto: ${{ matrix.boringcrypto == true }}
+
   build:
     name: Build
     uses: ./.github/workflows/workflow-build.yml
@@ -143,6 +162,39 @@ jobs:
       microsoft_certificate_name: ${{ secrets.MICROSOFT_CERTNAME }}
       microsoft_description: ${{ secrets.MICROSOFT_DESCRIPTION }}
 
+  build-otelcol-config:
+    name: Build (otelcol-config)
+    uses: ./.github/workflows/workflow-build-otelcol-config.yml
+    needs: [get-version]
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch_os: darwin_amd64
+            runs-on: macos-latest
+          - arch_os: darwin_arm64
+            runs-on: macos-latest
+          - arch_os: linux_amd64
+            runs-on: ubuntu-20.04
+          - arch_os: linux_amd64
+            runs-on: ubuntu-20.04
+            fips: true
+          - arch_os: linux_arm64
+            runs-on: ubuntu-20.04
+          - arch_os: linux_arm64
+            runs-on: ubuntu-20.04
+            fips: true
+    with:
+      arch_os: ${{ matrix.arch_os }}
+      runs-on: ${{ matrix.runs-on }}
+      fips: ${{ matrix.fips == true }}
+      save-cache: true
+      sumo_component_gomod_version: "v${{ needs.get-version.outputs.version }}"
+    secrets:
+      apple_developer_certificate_p12_base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
+      apple_developer_certificate_password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
+      app_store_connect_password: ${{ secrets.AC_PASSWORD }}
+
   build-container-images:
     name: Build container
     runs-on: ubuntu-20.04
@@ -156,11 +208,11 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.1.0
+        uses: docker/setup-qemu-action@v3.2.0
 
       - name: Set up Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.4.0
+        uses: docker/setup-buildx-action@v3.6.1
 
       - name: Show Buildx platforms
         run: echo ${{ steps.buildx.outputs.platforms }}
@@ -320,11 +372,11 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.1.0
+        uses: docker/setup-qemu-action@v3.2.0
 
       - name: Set up Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.4.0
+        uses: docker/setup-buildx-action@v3.6.1
 
       - name: Show Buildx platforms
         run: echo ${{ steps.buildx.outputs.platforms }}
@@ -475,6 +527,8 @@ jobs:
   trigger-packaging:
     name: Trigger Packaging
     needs:
+      - build
+      - build-otelcol-config
       - lint
       - package-msi
       - push-docker-manifest

diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml
@@ -10,7 +10,7 @@ defaults:
     shell: bash
 
 env:
-  GO_VERSION: "1.21.4"
+  GO_VERSION: "1.22.6"
 
 jobs:
   build-changed:
@@ -156,6 +156,25 @@ jobs:
       runs-on: ${{ matrix.runs-on }}
       boringcrypto: ${{ matrix.boringcrypto == true }}
 
+  test-otelcol-config:
+    name: Test (otelcol-config)
+    uses: ./.github/workflows/workflow-test-otelcol-config.yml
+    strategy:
+      matrix:
+        include:
+          - arch_os: linux_amd64
+            runs-on: ubuntu-20.04
+          - arch_os: linux_amd64
+            runs-on: ubuntu-20.04
+            boringcrypto: true
+          - arch_os: darwin_amd64
+            runs-on: macos-latest
+    with:
+      arch_os: ${{ matrix.arch_os }}
+      runs-on: ${{ matrix.runs-on }}
+      save-cache: true
+      boringcrypto: ${{ matrix.boringcrypto == true }}
+
   test-wixext:
     name: Test (SumoLogic.wixext)
     runs-on: windows-2019
@@ -264,6 +283,37 @@ jobs:
       microsoft_certificate_name: ${{ secrets.MICROSOFT_CERTNAME }}
       microsoft_description: ${{ secrets.MICROSOFT_DESCRIPTION }}
 
+  build-otelcol-config:
+    name: Build (otelcol-config)
+    uses: ./.github/workflows/workflow-build-otelcol-config.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch_os: darwin_amd64
+            runs-on: macos-latest
+          - arch_os: darwin_arm64
+            runs-on: macos-latest
+          - arch_os: linux_amd64
+            runs-on: ubuntu-20.04
+          - arch_os: linux_amd64
+            runs-on: ubuntu-20.04
+            fips: true
+          - arch_os: linux_arm64
+            runs-on: ubuntu-20.04
+          - arch_os: linux_arm64
+            runs-on: ubuntu-20.04
+            fips: true
+    with:
+      arch_os: ${{ matrix.arch_os }}
+      runs-on: ${{ matrix.runs-on }}
+      fips: ${{ matrix.fips == true }}
+      save-cache: true
+    secrets:
+      apple_developer_certificate_p12_base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
+      apple_developer_certificate_password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
+      app_store_connect_password: ${{ secrets.AC_PASSWORD }}
+
   build-and-test-container-images:
     name: Build container
     runs-on: ubuntu-20.04
@@ -278,11 +328,11 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.1.0
+        uses: docker/setup-qemu-action@v3.2.0
 
       - name: Set up Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.4.0
+        uses: docker/setup-buildx-action@v3.6.1
 
       - name: Show Buildx platforms
         run: echo ${{ steps.buildx.outputs.platforms }}

diff --git a/.github/workflows/release_builds.yml b/.github/workflows/release_builds.yml
@@ -18,7 +18,7 @@ defaults:
     shell: bash
 
 env:
-  GO_VERSION: "1.21.4"
+  GO_VERSION: "1.22.6"
 
 jobs:
   get-version:
@@ -91,11 +91,11 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.1.0
+        uses: docker/setup-qemu-action@v3.2.0
 
       - name: Set up Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.4.0
+        uses: docker/setup-buildx-action@v3.6.1
 
       - name: Show Buildx platforms
         run: echo ${{ steps.buildx.outputs.platforms }}
@@ -203,11 +203,11 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.1.0
+        uses: docker/setup-qemu-action@v3.2.0
 
       - name: Set up Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3.4.0
+        uses: docker/setup-buildx-action@v3.6.1
 
       - name: Show Buildx platforms
         run: echo ${{ steps.buildx.outputs.platforms }}