chore: Rename to bindplane-agent

.github/dependabot.yml

@@ -267,16 +267,6 @@ updates:
     commit-message:
       prefix: "deps"
       include: "scope"
-  - package-ecosystem: "gomod"
-    directory: "/updater"
-    schedule:
-      interval: "weekly"
-    ignore:
-      # Opentelemetry updates will be done manually
-      - dependency-name: "github.com/open-telemetry/opamp-go"
-    commit-message:
-      prefix: "deps"
-      include: "scope"
   - package-ecosystem: "gomod"
     directory: "/packagestate"
     schedule:

.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

.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

.github/workflows/manual_msi_build.yml

@@ -16,27 +16,22 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version-file: go.mod
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
-        with:
-          # either 'goreleaser' (default) or 'goreleaser-pro'
-          distribution: goreleaser-pro
-          version: "v2.1.0"
-          args: build --single-target --skip=validate --clean --snapshot
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
+          go-version: "1.21"
+          check-latest: true
+      - name: Install tools
+        run: make install-tools
+      - name: Release Prep
+        run: make release-prep CURR_VERSION=${{ github.event.inputs.version }}
+      - name: Build 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
-      - name: Copy Windows Updater Binary
-        run: cp dist/windows_amd64/updater_windows_amd64_v1/updater.exe windows/updater.exe
+        run: cp dist/collector_windows_amd64.exe windows/bindplane-otel-collector.exe
+      - name: Copy Supervisor Binary
+        run: cp release_deps/supervisor_bin/opampsupervisor_windows_amd64.exe windows/opampsupervisor.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
@@ -52,17 +47,17 @@ jobs:
       # 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 go-msi.exe https://github.com/observIQ/go-msi/releases/download/v2.3.0/go-msi.exe
           curl -f -L -o wix310-binaries.zip https://github.com/wixtoolset/wix3/releases/download/wix3104rtm/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.msi --version ${{ github.event.inputs.version }} --arch amd64
+        run: go-msi.exe make -m bindplane-otel-collector.msi --version ${{ github.event.inputs.version }} --arch amd64
         working-directory: C:/build
       - name: "Upload MSI"
         uses: actions/upload-artifact@v4
         with:
-          name: observiq-otel-collector.msi
-          path: C:/build/observiq-otel-collector.msi
+          name: bindplane-otel-collector.msi
+          path: C:/build/bindplane-otel-collector.msi
           # Short lived because this is meant as an action for developers
           retention-days: 1

.github/workflows/multi_build.yml

@@ -11,19 +11,22 @@ jobs:
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v4
-      - name: Install Go
+      - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version-file: go.mod
+          go-version: "1.21"
+          check-latest: true
           cache-dependency-path: |
-            go.sum
             **/go.sum
+      - name: Install Builder
+        run: make install-builder
       - 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_*)
+          lichen --config=./license.yaml $(find dist/collector_*)
+
   build_darwin:
     runs-on: macos-14
     steps:
@@ -35,14 +38,16 @@ jobs:
           go-version: "1.22"
           check-latest: true
           cache-dependency-path: |
-            go.sum
             **/go.sum
+      - name: Install Builder
+        run: make install-builder
       - 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_*)
+          lichen --config=./license.yaml $(find dist/collector_*)
+
   build_windows:
     runs-on: ubuntu-20.04
     steps:
@@ -54,11 +59,12 @@ jobs:
           go-version: "1.22"
           check-latest: true
           cache-dependency-path: |
-            go.sum
             **/go.sum
+      - name: Install Builder
+        run: make install-builder
       - name: Build
         run: make build-windows
       - name: Scan Third Party Dependency Licenses
         run: |
           go install github.com/uw-labs/[email protected]
-          lichen --config=./license.yaml dist/collector_windows_amd64.exe dist/updater_windows_amd64.exe
+          lichen --config=./license.yaml dist/collector_windows_amd64.exe

.github/workflows/release.yml

@@ -13,28 +13,23 @@ 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: "v2.1.0"
-          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: Install Tools
+        run: make install-tools
+      # Needed until supervisor binary is released
+      - name: Build Supervisor Binary
+        run: make release-prep CURR_VERSION=${{ github.ref_name }}
+      - 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
-      - name: Copy Windows Updater Binary
-        run: cp dist/windows_amd64/updater_windows_amd64_v1/updater.exe windows/updater.exe
+        run: cp dist/collector_windows_amd64.exe windows/bindplane-otel-collector.exe
+      - name: Copy Supervisor Binary
+        run: cp release_deps/supervisor_bin/opampsupervisor_windows_amd64.exe windows/opampsupervisor.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
@@ -50,18 +45,18 @@ jobs:
       # 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 go-msi.exe https://github.com/observIQ/go-msi/releases/download/v2.3.0/go-msi.exe
           curl -f -L -o wix310-binaries.zip https://github.com/wixtoolset/wix3/releases/download/wix3104rtm/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.msi --version ${{ github.ref_name }} --arch amd64
+        run: go-msi.exe make -m bindplane-otel-collector.msi --version ${{ github.ref_name }} --arch amd64
         working-directory: C:/build
       - name: "Upload MSI"
         uses: actions/upload-artifact@v4
         with:
-          name: observiq-otel-collector.msi
-          path: C:/build/observiq-otel-collector.msi
+          name: bindplane-otel-collector.msi
+          path: C:/build/bindplane-otel-collector.msi
           # Short lived because Go Releaser will upload the msi to a release (github release, gcs, etc)
           retention-days: 1
 
@@ -79,7 +74,6 @@ jobs:
         with:
           go-version: "1.22"
           check-latest: true
-          cache-dependency-path: "**/go.sum"
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v2
@@ -105,8 +99,8 @@ jobs:
       - name: Retrieve Windows 64-bit MSI Installer
         uses: actions/download-artifact@v4
         with:
-          name: observiq-otel-collector.msi
-          path: observiq-otel-collector.msi
+          name: bindplane-otel-collector.msi
+          path: bindplane-otel-collector.msi
       - name: Install cosign
         run: go install github.com/sigstore/cosign/cmd/[email protected]
       - name: Build cosign key file
@@ -115,10 +109,12 @@ jobs:
         env:
           COSIGN_PRIVATE_KEY: ${{secrets.ORG_COSIGN_PRIVATE_KEY}}
       - name: Sign MSI
-        run: cosign sign-blob --key=cosign.key --output-signature ./observiq-otel-collector.msi/observiq-otel-collector.msi.sig ./observiq-otel-collector.msi/observiq-otel-collector.msi
+        run: cosign sign-blob --key=cosign.key --output-signature ./bindplane-otel-collector.msi/bindplane-otel-collector.msi.sig ./bindplane-otel-collector.msi/bindplane-otel-collector.msi
         shell: bash
         env:
           COSIGN_PASSWORD: ${{ secrets.ORG_COSIGN_PWD }}
+      - name: Install Tools
+        run: make install-tools
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v5
         with:
@@ -134,23 +130,23 @@ jobs:
         run: |
           mkdir artifacts
           cp ./scripts/install/*.sh ./artifacts
-          cp ./observiq-otel-collector.msi/observiq-otel-collector.msi ./artifacts
+          cp ./bindplane-otel-collector.msi/bindplane-otel-collector.msi ./artifacts
           cp ./dist/*tar.gz ./artifacts
           cp ./dist/*zip ./artifacts
           cp ./dist/*.rpm ./artifacts
           cp ./dist/*.deb ./artifacts
           cp ./dist/*SHA256SUMS ./artifacts
-          tar -czvf observiq-otel-collector-${{ github.ref_name }}-artifacts.tar.gz -C ./artifacts .
+          tar -czvf bindplane-otel-collector-${{ github.ref_name }}-artifacts.tar.gz -C ./artifacts .
       - name: Sign artifact archive
-        run: cosign sign-blob --key=cosign.key --output-signature ./observiq-otel-collector-${{ github.ref_name }}-artifacts.tar.gz.sig ./observiq-otel-collector-${{ github.ref_name }}-artifacts.tar.gz
+        run: cosign sign-blob --key=cosign.key --output-signature ./bindplane-otel-collector-${{ github.ref_name }}-artifacts.tar.gz.sig ./bindplane-otel-collector-${{ github.ref_name }}-artifacts.tar.gz
         shell: bash
         env:
           COSIGN_PASSWORD: ${{ secrets.ORG_COSIGN_PWD }}
       - name: Upload artifact bundle to release
         uses: AButler/[email protected]
         with:
           repo-token: ${{ secrets.ORG_GORELEASER_GITHUB_TOKEN }}
-          files: "observiq-otel-collector-${{ github.ref_name }}-artifacts.tar.gz*"
+          files: "bindplane-otel-collector-${{ github.ref_name }}-artifacts.tar.gz*"
           release-tag: ${{ github.ref_name }}
       # Trigger installation tests in otel-collector-installer-testing
       - name: Trigger Installation Testing

.github/workflows/tests.yml

@@ -15,15 +15,9 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version-file: go.mod
+          go-version: "1.22"
+          check-latest: true
           cache-dependency-path: |
-            go.sum
             **/go.sum
       - name: Run Tests
         run: make test
-      - name: Run Updater Integration Tests (non-linux)
-        if: matrix.os != 'ubuntu-20.04'
-        run: make test-updater-integration
-      - name: Run Updater Integration Tests (linux)
-        if: matrix.os == 'ubuntu-20.04'
-        run: sudo make test-updater-integration

.gitignore

@@ -14,7 +14,6 @@ windows/*.zip
 windows/**/wix.dynamic.json
 windows/**/wix
 windows/config.yaml
-windows/logging.yaml
 windows/LICENSE
 windows/plugins
 opentelemetry-java-contrib-jmx-metrics.jar
@@ -26,5 +25,8 @@ release_deps
 collector*.yaml
 manager*.yaml
 logging*.yaml
-config.yaml
-storage
+
+#Supervisor & Builder Files
+builder
+agent*.log
+effective*.yaml