feat: Refactor to OCB based agent (#1755)

* wip * refactor repo * update workflow go versions * update build flow to install-tools * update build license check * new make target * rename to manifests * update release workflow * package supervisor with agent * resolve errs with gcp exporters * update version to have go.mod * get google exporters correctly importing version * manifest documentation * use updated version commit in google exporters * include supervisor as prebuilt binary * remove config.yaml from release pkg since its not used by supervisor/agent now * feedback 1/n * rebase cleanup * update go version in a few actions, use https git clone for contrib * change tool cache and fix release-test * replace rest of tool caches
observIQ · Aug 16, 2024 · 5f46c61 · 5f46c61
1 parent b167938
commit 5f46c61
Show file tree

Hide file tree

Showing 178 changed files with 784 additions and 19,029 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -11,13 +11,14 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version-file: go.mod
+          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') }}
+          key: tooling-${{ runner.os }}-${{ hashFiles('./internal/tools/go.sum') }}
       - name: Install Tools
         if: steps.tool-cache.outputs.cache-hit != 'true'
         run: make install-tools
@@ -39,7 +40,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /home/runner/go/bin
-          key: tooling-${{ runner.os }}-${{ hashFiles('./Makefile') }}
+          key: tooling-${{ runner.os }}-${{ hashFiles('./internal/tools/go.sum') }}
       - name: Install Tools
         if: steps.tool-cache.outputs.cache-hit != 'true'
         run: make install-tools
@@ -63,7 +64,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /home/runner/go/bin
-          key: tooling-${{ runner.os }}-${{ hashFiles('./Makefile') }}
+          key: tooling-${{ runner.os }}-${{ hashFiles('./internal/tools/go.sum') }}
       - name: Install Tools
         if: steps.tool-cache.outputs.cache-hit != 'true'
         run: make install-tools
@@ -87,7 +88,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /home/runner/go/bin
-          key: tooling-${{ runner.os }}-${{ hashFiles('./Makefile') }}
+          key: tooling-${{ runner.os }}-${{ hashFiles('./internal/tools/go.sum') }}
       - name: Install Tools
         if: steps.tool-cache.outputs.cache-hit != 'true'
         run: make install-tools
@@ -111,7 +112,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /home/runner/go/bin
-          key: tooling-${{ runner.os }}-${{ hashFiles('./Makefile') }}
+          key: tooling-${{ runner.os }}-${{ hashFiles('./internal/tools/go.sum') }}
       - name: Install Tools
         if: steps.tool-cache.outputs.cache-hit != 'true'
         run: make install-tools
@@ -135,7 +136,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /home/runner/go/bin
-          key: tooling-${{ runner.os }}-${{ hashFiles('./Makefile') }}
+          key: tooling-${{ runner.os }}-${{ hashFiles('./internal/tools/go.sum') }}
       - name: Install Tools
         if: steps.tool-cache.outputs.cache-hit != 'true'
         run: make install-tools

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -40,7 +40,8 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version-file: go.mod
+          go-version: "1.21"
+          check-latest: true
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL

diff --git a/.github/workflows/manual_msi_build.yml b/.github/workflows/manual_msi_build.yml
@@ -16,7 +16,8 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version-file: go.mod
+          go-version: "1.21"
+          check-latest: true
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v5
         with:

diff --git a/.github/workflows/multi_build.yml b/.github/workflows/multi_build.yml
@@ -6,23 +6,58 @@ on:
   pull_request:
 
 jobs:
+  setup-tools:
+    runs-on: "ubuntu-20.04"
+    steps:
+      - name: Checkout Sources
+        uses: actions/checkout@v4
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          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('./internal/tools/go.sum') }}
+      - name: Install Tools
+        if: steps.tool-cache.outputs.cache-hit != 'true'
+        run: make install-tools
+
   build_linux:
     runs-on: ubuntu-latest-4-cores
+    needs:
+      - setup-tools
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v4
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version-file: go.mod
+          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('./internal/tools/go.sum') }}
+      - name: Install Tools
+        if: steps.tool-cache.outputs.cache-hit != 'true'
+        run: make install-tools
       - name: Build
         run: make build-linux
       - name: Scan Third Party Dependency Licenses
         run: |
           go install github.com/uw-labs/[email protected]
           lichen --config=./license.yaml $(find dist/collector_* dist/updater_*)
+
   build_darwin:
     runs-on: macos-14
+    needs:
+      - setup-tools
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v4
@@ -31,14 +66,26 @@ jobs:
         with:
           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('./internal/tools/go.sum') }}
+      - name: Install Tools
+        if: steps.tool-cache.outputs.cache-hit != 'true'
+        run: make install-tools
       - name: Build
         run: make build-darwin
       - name: Scan Third Party Dependency Licenses
         run: |
           go install github.com/uw-labs/[email protected]
           lichen --config=./license.yaml $(find dist/collector_* dist/updater_*)
+
   build_windows:
     runs-on: ubuntu-20.04
+    needs:
+      - setup-tools
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v4
@@ -47,6 +94,15 @@ jobs:
         with:
           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('./internal/tools/go.sum') }}
+      - name: Install Tools
+        if: steps.tool-cache.outputs.cache-hit != 'true'
+        run: make install-tools
       - name: Build
         run: make build-windows
       - name: Scan Third Party Dependency Licenses

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,22 +13,14 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version-file: go.mod
-          cache-dependency-path: "**/go.sum"
-      - 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
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
+          go-version: "1.21"
+          check-latest: true
+      - name: Build Windows Binaries
+        run: make build-binaries
       - name: Copy Windows Collector Binary
-        run: cp dist/windows_amd64/collector_windows_amd64_v1/observiq-otel-collector.exe windows/observiq-otel-collector.exe
+        run: cp dist/collector_windows_amd64.exe windows/observiq-otel-collector.exe
       - name: Copy Windows Updater Binary
-        run: cp dist/windows_amd64/updater_windows_amd64_v1/updater.exe windows/updater.exe
+        run: cp dist/updater_windows_amd64.exe windows/updater.exe
       - name: Copy Plugins to MSI Build Directory
         run: cp -r release_deps/plugins windows/
       - name: Copy Example Config
@@ -79,7 +71,6 @@ jobs:
         with:
           go-version: "1.21"
           check-latest: true
-          cache-dependency-path: "**/go.sum"
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v2

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,7 +15,8 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version-file: go.mod
+          go-version: "1.21"
+          check-latest: true
       - name: Run Tests
         run: make test
       - name: Run Updater Integration Tests (non-linux)

diff --git a/.gitignore b/.gitignore
@@ -25,4 +25,9 @@ release_deps
 # OpAmp Files
 collector*.yaml
 manager*.yaml
-logging*.yaml
+logging*.yaml
+
+#Supervisor & Builder Files
+builder
+agent*.log
+effective*.yaml