chore: Merge v1.45.0 to main in prep for release (#1502)

observIQ · Feb 27, 2024 · caf565b · caf565b
2 parents 188e295 + 5ae6a5c
commit caf565b
Show file tree

Hide file tree

Showing 157 changed files with 12,324 additions and 4,373 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -240,6 +240,17 @@ updates:
     commit-message:
       prefix: "deps"
       include: "scope"
+  - package-ecosystem: "gomod"
+    directory: "/exporter/snowflakeexporter"
+    schedule:
+      interval: "weekly"
+    ignore:
+      # Opentelemetry updates will be done manually
+      - dependency-name: "github.com/open-telemetry/opentelemetry-collector*"
+      - dependency-name: "go.opentelemetry.io/*"
+    commit-message:
+      prefix: "deps"
+      include: "scope"
   - package-ecosystem: "gomod"
     directory: "/expr"
     schedule:

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -9,7 +9,7 @@ jobs:
       - name: Checkout Sources
         uses: actions/checkout@v4
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.21"
           check-latest: true
@@ -25,13 +25,13 @@ jobs:
 
   check-fmt:
     runs-on: "ubuntu-20.04"
-    needs: 
+    needs:
       - setup-tools
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v4
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.21"
           check-latest: true
@@ -49,13 +49,13 @@ jobs:
 
   check-license:
     runs-on: "ubuntu-20.04"
-    needs: 
+    needs:
       - setup-tools
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v4
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.21"
           check-latest: true
@@ -73,13 +73,13 @@ jobs:
 
   gosec:
     runs-on: ubuntu-20.04
-    needs: 
+    needs:
       - setup-tools
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.21"
           check-latest: true
@@ -97,13 +97,13 @@ jobs:
 
   misspell:
     runs-on: "ubuntu-20.04"
-    needs: 
+    needs:
       - setup-tools
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v4
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.21"
           check-latest: true
@@ -119,27 +119,40 @@ jobs:
       - name: Check for Misspelled Words in Doc Files
         run: make misspell
 
-# Below checks don't need to run `make install-tools`
   lint:
     runs-on: ubuntu-20.04
+    needs:
+      - setup-tools
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v4
-      - name: Run Revive Action by pulling pre-built image
-        uses: docker://morphy/revive-action:v2
+      - name: Setup Go
+        uses: actions/setup-go@v5
         with:
-          config: revive/config.toml
-
+          go-version: "1.21"
+          check-latest: true
+      - name: Cache Tools
+        id: tool-cache
+        uses: actions/cache@v3
+        with:
+          path: /home/runner/go/bin
+          key: tooling-${{ runner.os }}-${{ hashFiles('./Makefile') }}
+      - name: Install Tools
+        if: steps.tool-cache.outputs.cache-hit != 'true'
+        run: make install-tools
+      - name: Run Revive Linter
+        run: make lint
 
+  # Below checks don't need to run `make install-tools`
   check-plugin-docs:
     runs-on: "ubuntu-20.04"
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v4
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.21"
           check-latest: true
       - name: Plugin Doc Generation
         run: make create-plugin-docs

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -35,6 +35,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      # Install Go so we don't use an out of date version to auto-build
+      # https://github.com/github/codeql-action/issues/1842#issuecomment-1704398087
+      - name: Install Go
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: go.mod
+
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2

diff --git a/.github/workflows/manual_msi_build.yml b/.github/workflows/manual_msi_build.yml
@@ -14,9 +14,9 @@ jobs:
       - name: Checkout Sources
         uses: actions/checkout@v4
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.21"
           check-latest: true
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v5
@@ -61,69 +61,9 @@ jobs:
         run: go-msi.exe make -m observiq-otel-collector.msi --version ${{ github.event.inputs.version }} --arch amd64
         working-directory: C:/build
       - name: "Upload MSI"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: observiq-otel-collector.msi
           path: C:/build/observiq-otel-collector.msi
           # Short lived because this is meant as an action for developers
           retention-days: 1
-  build-32bit-msi:
-    runs-on: windows-2022
-    steps:
-      - name: Checkout Sources
-        uses: actions/checkout@v4
-      - name: Setup Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: "1.20"
-          check-latest: true
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
-        with:
-          # either 'goreleaser' (default) or 'goreleaser-pro'
-          distribution: goreleaser-pro
-          version: "v1.22.1"
-          args: build --single-target --skip=validate --clean --snapshot
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
-          GOARCH: "386"
-      - name: Copy Windows Collector Binary
-        run: cp dist/windows_386/collector_windows_386/observiq-otel-collector.exe windows/observiq-otel-collector.exe
-      - name: Copy Windows Updater Binary
-        run: cp dist/windows_386/updater_windows_386/updater.exe windows/updater.exe
-      - name: Copy Plugins to MSI Build Directory
-        run: cp -r release_deps/plugins windows/
-      - name: Copy Example Config
-        run: cp config/example.yaml windows/config.yaml
-      - name: Copy Logging Config
-        run: cp config/logging.yaml windows/logging.yaml
-      - name: Copy JMX Receiver Jar
-        run: cp release_deps/opentelemetry-java-contrib-jmx-metrics.jar windows/opentelemetry-java-contrib-jmx-metrics.jar
-      - name: Copy LICENSE
-        run: cp LICENSE windows/LICENSE
-      - name: Copy VERSION file
-        run: cp release_deps/VERSION.txt windows/VERSION.txt
-      # HACK: Copy build directory to C drive to avoid this error, since there must be a relative path from the tempdir that go-msi uses
-      # for the MSI to build properly
-      - name: Copy Build Dir
-        run: |
-          cp -r windows C:/build
-          echo "C:/build" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-      # Installs go-msi and wix.
-      - name: Install Build Tools
-        run: |
-          curl -f -L -o go-msi.exe https://github.com/observIQ/go-msi/releases/download/v2.2.0/go-msi.exe
-          curl -f -L -o wix310-binaries.zip http://wixtoolset.org/downloads/v3.10.3.3007/wix310-binaries.zip
-          unzip wix310-binaries.zip
-        working-directory: C:/build
-      - name: "Build MSI from Tagged Release"
-        run: go-msi.exe make -m observiq-otel-collector-x86.msi --version ${{ github.event.inputs.version }} --arch 386
-        working-directory: C:/build
-      - name: "Upload MSI"
-        uses: actions/upload-artifact@v3
-        with:
-          name: observiq-otel-collector-x86.msi
-          path: C:/build/observiq-otel-collector-x86.msi
-          # Short lived because this is meant as an action for developers
-          retention-days: 1
diff --git a/.github/workflows/multi_build.yml b/.github/workflows/multi_build.yml
@@ -12,9 +12,9 @@ jobs:
       - name: Checkout Sources
         uses: actions/checkout@v4
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.21"
           check-latest: true
       - name: Build
         run: make build-linux
@@ -28,9 +28,9 @@ jobs:
       - name: Checkout Sources
         uses: actions/checkout@v4
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.21"
           check-latest: true
       - name: Build
         run: make build-darwin
@@ -44,9 +44,9 @@ jobs:
       - name: Checkout Sources
         uses: actions/checkout@v4
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.21"
           check-latest: true
       - name: Build
         run: make build-windows