Release v1.26.0 Merge (#1107)

* update modules to v1.26.0 * chore(ci): Updated runner for windows test and build to 8 core box (#1085) Updated runner for windows test and build to 8 core box Signed-off-by: Corbin Phelps <[email protected]> * feat: Remove PowerShell requirement from the MSI (#1084) * Swapped powershell script to batch file Signed-off-by: Corbin Phelps <[email protected]> * Fixed paths in manual msi build Signed-off-by: Corbin Phelps <[email protected]> * Fixed bad XML Signed-off-by: Corbin Phelps <[email protected]> * Set before on set property Signed-off-by: Corbin Phelps <[email protected]> * Setting command prompt differently Signed-off-by: Corbin Phelps <[email protected]> * Added quotes around custom action install Signed-off-by: Corbin Phelps <[email protected]> * Removed extra path slash from bat file Signed-off-by: Corbin Phelps <[email protected]> * Use SetProperty, CALL --------- Signed-off-by: Corbin Phelps <[email protected]> Co-authored-by: Corbin Phelps <[email protected]> * deps: Update OTel v0.78.0 (#1086) * update otel * Bump ottl to include body indexing * deps: Match bindplane-op tool versions (#1104) * Match bindplane-op tool versions * Update goreleaser in actions * deps(dependabot): Dependabot 05 31 2023 (#1105) * Updated github.stretchr/testify to v1.8.4 Signed-off-by: Corbin Phelps <[email protected]> * Updated google.golang.org/api to v0.125.0 Signed-off-by: Corbin Phelps <[email protected]> --------- Signed-off-by: Corbin Phelps <[email protected]> * deps(mdatagen): Updated mdatagen and ran make generate (#1106) Updated mdata gen and ran make generate Signed-off-by: Corbin Phelps <[email protected]> --------- Signed-off-by: Corbin Phelps <[email protected]> Co-authored-by: Brandon Johnson <[email protected]> Co-authored-by: Nico Stewart <[email protected]>
observIQ · Jun 1, 2023 · ae4b740 · ae4b740
1 parent 50d1297
commit ae4b740
Show file tree

Hide file tree

Showing 78 changed files with 2,457 additions and 2,311 deletions.
diff --git a/.github/workflows/manual_msi_build.yml b/.github/workflows/manual_msi_build.yml
@@ -23,15 +23,15 @@ jobs:
         with:
           # either 'goreleaser' (default) or 'goreleaser-pro'
           distribution: goreleaser-pro
-          version: "v1.16.1"
+          version: "v1.18.2"
           args: build --single-target --skip-validate --clean --snapshot
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
       - name: Copy Windows Collector Binary
-        run: cp dist/collector_windows_amd64_v1/observiq-otel-collector.exe windows/observiq-otel-collector.exe
+        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/updater_windows_amd64_v1/updater.exe windows/updater.exe
+        run: cp dist/windows_amd64/updater_windows_amd64_v1/updater.exe windows/updater.exe
       - name: Copy Plugins to MSI Build Directory
         run: cp -r release_deps/plugins windows/
       - name: Copy Example Config
@@ -82,16 +82,16 @@ jobs:
         with:
           # either 'goreleaser' (default) or 'goreleaser-pro'
           distribution: goreleaser-pro
-          version: "v1.16.1"
+          version: "v1.18.2"
           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/collector_windows_386/observiq-otel-collector.exe windows/observiq-otel-collector.exe
+        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/updater_windows_386/updater.exe windows/updater.exe
+        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

diff --git a/.github/workflows/multi_build.yml b/.github/workflows/multi_build.yml
@@ -39,7 +39,7 @@ jobs:
           go install github.com/uw-labs/[email protected]
           lichen --config=./license.yaml $(find dist/collector_* dist/updater_*)
   build_windows:
-    runs-on: windows-2022
+    runs-on: windows-2022-8-cores
     steps:
       - name: Checkout Sources
         uses: actions/checkout@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           # either 'goreleaser' (default) or 'goreleaser-pro'
           distribution: goreleaser-pro
-          version: "v1.16.1"
+          version: "v1.18.2"
           args: build --single-target --skip-validate --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -83,7 +83,7 @@ jobs:
         with:
           # either 'goreleaser' (default) or 'goreleaser-pro'
           distribution: goreleaser-pro
-          version: "v1.16.1"
+          version: "v1.18.2"
           args: build --single-target --skip-validate --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -189,7 +189,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v4
         with:
           distribution: goreleaser-pro
-          version: "v1.16.1"
+          version: "v1.18.2"
           args: release --clean --timeout 120m
         env:
           GITHUB_TOKEN: ${{ secrets.ORG_GORELEASER_GITHUB_TOKEN }}

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, macos-11, windows-2019]
+        os: [ubuntu-20.04, macos-11, windows-2022-8-cores]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout Sources

diff --git a/Makefile b/Makefile
@@ -85,13 +85,13 @@ build-windows-x86:
 install-tools:
 	go install github.com/client9/misspell/cmd/[email protected]
 	go install github.com/google/[email protected]
-	go install github.com/goreleaser/goreleaser@v1.16.1
-	go install github.com/mgechev/revive@v1.2.3
-	go install github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen@v0.76.3
-	go install github.com/securego/gosec/v2/cmd/gosec@v2.15.0
+	go install github.com/goreleaser/goreleaser@v1.18.2
+	go install github.com/mgechev/revive@v1.3.1
+	go install github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen@v0.78.0
+	go install github.com/securego/gosec/v2/cmd/gosec@v2.16.0
 	go install github.com/sigstore/cosign/cmd/[email protected]
 	go install github.com/uw-labs/[email protected]
-	go install github.com/vektra/mockery/v2@v2.20.0
+	go install github.com/vektra/mockery/v2@v2.28.1
 	go install golang.org/x/tools/cmd/goimports@latest
 
 .PHONY: lint

diff --git a/cmd/plugindocgen/go.mod b/cmd/plugindocgen/go.mod
@@ -3,7 +3,7 @@ module github.com/observiq/observiq-otel-collector/plugindocgen
 go 1.19
 
 require (
-	github.com/observiq/observiq-otel-collector/receiver/pluginreceiver v1.25.0
+	github.com/observiq/observiq-otel-collector/receiver/pluginreceiver v1.26.0
 	github.com/spf13/pflag v1.0.5
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -32,11 +32,11 @@ require (
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.77.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.78.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/prometheus/client_golang v1.15.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/client_golang v1.15.1 // indirect
+	github.com/prometheus/client_model v0.4.0 // indirect
+	github.com/prometheus/common v0.43.0 // indirect
 	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/prometheus/statsd_exporter v0.22.7 // indirect
 	github.com/shirou/gopsutil/v3 v3.23.4 // indirect
@@ -47,18 +47,18 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	go.etcd.io/bbolt v1.3.7 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/collector v0.77.0 // indirect
-	go.opentelemetry.io/collector/component v0.77.0 // indirect
-	go.opentelemetry.io/collector/confmap v0.77.0 // indirect
-	go.opentelemetry.io/collector/consumer v0.77.0 // indirect
-	go.opentelemetry.io/collector/exporter v0.77.0 // indirect
-	go.opentelemetry.io/collector/featuregate v0.77.0 // indirect
-	go.opentelemetry.io/collector/pdata v1.0.0-rcv0011 // indirect
-	go.opentelemetry.io/collector/receiver v0.77.0 // indirect
-	go.opentelemetry.io/collector/semconv v0.77.0 // indirect
-	go.opentelemetry.io/contrib/propagators/b3 v1.15.0 // indirect
+	go.opentelemetry.io/collector v0.78.2 // indirect
+	go.opentelemetry.io/collector/component v0.78.2 // indirect
+	go.opentelemetry.io/collector/confmap v0.78.2 // indirect
+	go.opentelemetry.io/collector/consumer v0.78.2 // indirect
+	go.opentelemetry.io/collector/exporter v0.78.2 // indirect
+	go.opentelemetry.io/collector/featuregate v1.0.0-rcv0012 // indirect
+	go.opentelemetry.io/collector/pdata v1.0.0-rcv0012 // indirect
+	go.opentelemetry.io/collector/receiver v0.78.2 // indirect
+	go.opentelemetry.io/collector/semconv v0.78.2 // indirect
+	go.opentelemetry.io/contrib/propagators/b3 v1.16.1 // indirect
 	go.opentelemetry.io/otel v1.15.1 // indirect
-	go.opentelemetry.io/otel/bridge/opencensus v0.38.0 // indirect
+	go.opentelemetry.io/otel/bridge/opencensus v0.38.1 // indirect
 	go.opentelemetry.io/otel/exporters/prometheus v0.38.1 // indirect
 	go.opentelemetry.io/otel/metric v0.38.1 // indirect
 	go.opentelemetry.io/otel/sdk v1.15.1 // indirect
@@ -67,12 +67,12 @@ require (
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/net v0.9.0 // indirect
-	golang.org/x/sys v0.7.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
 	golang.org/x/text v0.9.0 // indirect
 	gonum.org/v1/gonum v0.13.0 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	google.golang.org/grpc v1.54.0 // indirect
+	google.golang.org/grpc v1.55.0 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )