deps: Bump OTel to v0.95.0 (#1497)

* bump otel to v0.95.0 * update mdatagen, make generate * test reverting go mod version * bump go version to 1.21
observIQ · Feb 26, 2024 · e68a335 · e68a335
1 parent 1e95468
commit e68a335
Show file tree

Hide file tree

Showing 73 changed files with 3,490 additions and 2,658 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -25,7 +25,7 @@ jobs:
 
   check-fmt:
     runs-on: "ubuntu-20.04"
-    needs: 
+    needs:
       - setup-tools
     steps:
       - name: Checkout Sources
@@ -49,7 +49,7 @@ jobs:
 
   check-license:
     runs-on: "ubuntu-20.04"
-    needs: 
+    needs:
       - setup-tools
     steps:
       - name: Checkout Sources
@@ -73,7 +73,7 @@ jobs:
 
   gosec:
     runs-on: ubuntu-20.04
-    needs: 
+    needs:
       - setup-tools
     steps:
       - name: Checkout Source
@@ -97,7 +97,7 @@ jobs:
 
   misspell:
     runs-on: "ubuntu-20.04"
-    needs: 
+    needs:
       - setup-tools
     steps:
       - name: Checkout Sources
@@ -143,7 +143,7 @@ jobs:
       - name: Run Revive Linter
         run: make lint
 
-# Below checks don't need to run `make install-tools`
+  # Below checks don't need to run `make install-tools`
   check-plugin-docs:
     runs-on: "ubuntu-20.04"
     steps:
@@ -152,7 +152,7 @@ jobs:
       - name: Setup Go
         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/manual_msi_build.yml b/.github/workflows/manual_msi_build.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup Go
         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
@@ -75,7 +75,7 @@ jobs:
       - name: Setup Go
         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

diff --git a/.github/workflows/multi_build.yml b/.github/workflows/multi_build.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.21"
           check-latest: true
       - name: Build
         run: make build-linux
@@ -30,7 +30,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.21"
           check-latest: true
       - name: Build
         run: make build-darwin
@@ -46,7 +46,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.21"
           check-latest: true
       - name: Build
         run: make build-windows

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,9 +13,9 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.21"
           check-latest: true
-          cache-dependency-path: '**/go.sum'
+          cache-dependency-path: "**/go.sum"
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v5
         with:
@@ -73,9 +73,9 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.21"
           check-latest: true
-          cache-dependency-path: '**/go.sum'
+          cache-dependency-path: "**/go.sum"
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v5
         with:
@@ -139,9 +139,9 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.21"
           check-latest: true
-          cache-dependency-path: '**/go.sum'
+          cache-dependency-path: "**/go.sum"
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v2
@@ -193,7 +193,7 @@ jobs:
           COSIGN_PWD: ${{ secrets.ORG_COSIGN_PWD }}
       # Create artifact bundle and upload to release
       - name: Create artifact archive
-        run : |
+        run: |
           mkdir artifacts
           cp ./scripts/install/*.sh ./artifacts
           cp ./observiq-otel-collector.msi/observiq-otel-collector.msi ./artifacts
@@ -208,7 +208,7 @@ jobs:
         uses: AButler/[email protected]
         with:
           repo-token: ${{ secrets.ORG_GORELEASER_GITHUB_TOKEN }}
-          files: 'observiq-otel-collector-${{ github.ref_name }}-artifacts.tar.gz'
+          files: "observiq-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

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version: "1.21"
           check-latest: true
       - name: Run Tests
         run: make test

diff --git a/Makefile b/Makefile
@@ -95,7 +95,7 @@ install-tools:
 	go install github.com/client9/misspell/cmd/[email protected]
 	go install github.com/google/[email protected]
 	go install github.com/mgechev/[email protected]
-	go install github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen@v0.94.0
+	go install github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen@v0.95.0
 	go install github.com/securego/gosec/v2/cmd/[email protected]
 # update cosign in release.yml when updating this version
 	go install github.com/sigstore/cosign/cmd/[email protected]

diff --git a/cmd/plugindocgen/go.mod b/cmd/plugindocgen/go.mod
@@ -1,6 +1,8 @@
 module github.com/observiq/bindplane-agent/plugindocgen
 
-go 1.20
+go 1.21
+
+toolchain go1.21.6
 
 require (
 	github.com/observiq/bindplane-agent/receiver/pluginreceiver v1.45.0
@@ -25,15 +27,15 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/knadh/koanf v1.5.0 // indirect
-	github.com/knadh/koanf/v2 v2.0.2 // indirect
+	github.com/knadh/koanf/v2 v2.1.0 // indirect
 	github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
 	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.94.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.95.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/prometheus/client_golang v1.18.0 // indirect
 	github.com/prometheus/client_model v0.5.0 // indirect
@@ -47,42 +49,48 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.3 // indirect
 	go.etcd.io/bbolt v1.3.8 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/collector v0.94.1 // indirect
-	go.opentelemetry.io/collector/component v0.94.1 // indirect
-	go.opentelemetry.io/collector/config/configtelemetry v0.94.1 // indirect
-	go.opentelemetry.io/collector/confmap v0.94.1 // indirect
-	go.opentelemetry.io/collector/connector v0.94.1 // indirect
-	go.opentelemetry.io/collector/consumer v0.94.1 // indirect
-	go.opentelemetry.io/collector/exporter v0.94.1 // indirect
-	go.opentelemetry.io/collector/extension v0.94.1 // indirect
-	go.opentelemetry.io/collector/featuregate v1.1.0 // indirect
-	go.opentelemetry.io/collector/otelcol v0.94.1 // indirect
-	go.opentelemetry.io/collector/pdata v1.1.0 // indirect
-	go.opentelemetry.io/collector/processor v0.94.1 // indirect
-	go.opentelemetry.io/collector/receiver v0.94.1 // indirect
-	go.opentelemetry.io/collector/semconv v0.94.1 // indirect
-	go.opentelemetry.io/collector/service v0.94.1 // indirect
+	go.opentelemetry.io/collector v0.95.0 // indirect
+	go.opentelemetry.io/collector/component v0.95.0 // indirect
+	go.opentelemetry.io/collector/config/configtelemetry v0.95.0 // indirect
+	go.opentelemetry.io/collector/confmap v0.95.0 // indirect
+	go.opentelemetry.io/collector/confmap/converter/expandconverter v0.95.0 // indirect
+	go.opentelemetry.io/collector/confmap/provider/envprovider v0.95.0 // indirect
+	go.opentelemetry.io/collector/confmap/provider/fileprovider v0.95.0 // indirect
+	go.opentelemetry.io/collector/confmap/provider/httpprovider v0.95.0 // indirect
+	go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.95.0 // indirect
+	go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.95.0 // indirect
+	go.opentelemetry.io/collector/connector v0.95.0 // indirect
+	go.opentelemetry.io/collector/consumer v0.95.0 // indirect
+	go.opentelemetry.io/collector/exporter v0.95.0 // indirect
+	go.opentelemetry.io/collector/extension v0.95.0 // indirect
+	go.opentelemetry.io/collector/featuregate v1.2.0 // indirect
+	go.opentelemetry.io/collector/otelcol v0.95.0 // indirect
+	go.opentelemetry.io/collector/pdata v1.2.0 // indirect
+	go.opentelemetry.io/collector/processor v0.95.0 // indirect
+	go.opentelemetry.io/collector/receiver v0.95.0 // indirect
+	go.opentelemetry.io/collector/semconv v0.95.0 // indirect
+	go.opentelemetry.io/collector/service v0.95.0 // indirect
 	go.opentelemetry.io/contrib/config v0.3.0 // indirect
-	go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect
-	go.opentelemetry.io/otel v1.23.0 // indirect
-	go.opentelemetry.io/otel/bridge/opencensus v0.45.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.45.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.45.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.23.0 // indirect
-	go.opentelemetry.io/otel/exporters/prometheus v0.45.1 // indirect
-	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.45.0 // indirect
-	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.23.0 // indirect
-	go.opentelemetry.io/otel/metric v1.23.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.23.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.23.0 // indirect
-	go.opentelemetry.io/otel/trace v1.23.0 // indirect
+	go.opentelemetry.io/contrib/propagators/b3 v1.23.0 // indirect
+	go.opentelemetry.io/otel v1.23.1 // indirect
+	go.opentelemetry.io/otel/bridge/opencensus v1.23.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.23.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.23.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.23.1 // indirect
+	go.opentelemetry.io/otel/exporters/prometheus v0.45.2 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.23.1 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.23.1 // indirect
+	go.opentelemetry.io/otel/metric v1.23.1 // indirect
+	go.opentelemetry.io/otel/sdk v1.23.1 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.23.1 // indirect
+	go.opentelemetry.io/otel/trace v1.23.1 // indirect
 	go.opentelemetry.io/proto/otlp v1.1.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
-	golang.org/x/net v0.20.0 // indirect
-	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/net v0.21.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	gonum.org/v1/gonum v0.14.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect