diff --git a/.chloggen/mx-psi_refactor-service-telemetry.yaml b/.chloggen/mx-psi_refactor-service-telemetry.yaml new file mode 100755 index 00000000000..2d892493de8 --- /dev/null +++ b/.chloggen/mx-psi_refactor-service-telemetry.yaml @@ -0,0 +1,18 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: all + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Remove go 1.19 support, bump minimum to go 1.20 and add testing for 1.21 + +# One or more tracking issues or pull requests related to the change +issues: [8207] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +change_logs: [api] diff --git a/.github/workflows/api-compatibility.yml b/.github/workflows/api-compatibility.yml index b79d4a477b2..efde72848da 100644 --- a/.github/workflows/api-compatibility.yml +++ b/.github/workflows/api-compatibility.yml @@ -34,7 +34,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.19.12 + go-version: ~1.20.7 # Generate apidiff states of Main - name: Generate-States diff --git a/.github/workflows/build-and-test-windows.yaml b/.github/workflows/build-and-test-windows.yaml index 8c8a54f30d2..2be1b453c35 100644 --- a/.github/workflows/build-and-test-windows.yaml +++ b/.github/workflows/build-and-test-windows.yaml @@ -19,7 +19,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.19.12 + go-version: ~1.20.7 - name: Cache Go uses: actions/cache@v3 env: diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index ca168501b1f..003daa73189 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.19.12 + go-version: ~1.20.7 - name: Cache Go id: go-cache uses: actions/cache@v3 @@ -41,7 +41,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.19.12 + go-version: ~1.20.7 - name: Cache Go id: go-cache uses: actions/cache@v3 @@ -64,7 +64,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.19.12 + go-version: ~1.20.7 - name: Cache Go id: go-cache uses: actions/cache@v3 @@ -88,7 +88,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.19.12 + go-version: ~1.20.7 - name: Cache Go id: go-cache uses: actions/cache@v3 @@ -133,7 +133,7 @@ jobs: unittest-matrix: strategy: matrix: - go-version: ["1.20", 1.19] # 1.20 needs quotes otherwise it's interpreted as 1.2 + go-version: ["1.21", "1.20"] # 1.20 needs quotes otherwise it's interpreted as 1.2 runs-on: ubuntu-latest needs: [setup-environment] steps: @@ -249,7 +249,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.19.12 + go-version: ~1.20.7 - name: Cache Go id: go-cache uses: actions/cache@v3 diff --git a/.github/workflows/builder-integration-test.yaml b/.github/workflows/builder-integration-test.yaml index df04fdec852..a8a19a8890e 100644 --- a/.github/workflows/builder-integration-test.yaml +++ b/.github/workflows/builder-integration-test.yaml @@ -30,6 +30,6 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.19.12 + go-version: ~1.20.7 - name: Test run: make builder-integration-test diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml index 6d72c9131c1..745bba75932 100644 --- a/.github/workflows/builder-release.yaml +++ b/.github/workflows/builder-release.yaml @@ -16,7 +16,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.19.12 + go-version: ~1.20.7 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v4 with: diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index f2c03323b72..2d3b99822b5 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -29,7 +29,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.19.12 + go-version: ~1.20.7 - name: Cache Go id: go-cache uses: actions/cache@v3 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 40b4341c98d..7d8c1ae40ae 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.19.12 + go-version: ~1.20.7 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/contrib-tests.yml b/.github/workflows/contrib-tests.yml index 5841156c76b..095001c2074 100644 --- a/.github/workflows/contrib-tests.yml +++ b/.github/workflows/contrib-tests.yml @@ -23,7 +23,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.19.12 + go-version: ~1.20.7 - name: Run Contrib Tests run: | contrib_path=/tmp/opentelemetry-collector-contrib diff --git a/.github/workflows/create-dependabot-pr.yml b/.github/workflows/create-dependabot-pr.yml index a3330728fb6..43a2ded0831 100644 --- a/.github/workflows/create-dependabot-pr.yml +++ b/.github/workflows/create-dependabot-pr.yml @@ -11,7 +11,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.19.12 + go-version: ~1.20.7 - name: Run dependabot-pr.sh run: ./.github/workflows/scripts/dependabot-pr.sh env: diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 5b79469bb38..017e23bb9e2 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -13,7 +13,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.19.12 + go-version: ~1.20.7 - name: Run benchmark run: make gobenchmark diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index ec51d982552..63e9b36e5db 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -53,7 +53,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: ~1.19.12 + go-version: ~1.20.7 # Prepare Core for release. # - Update CHANGELOG.md file, this is done via chloggen # - Run make prepare-release PREVIOUS_VERSION=1.0.0 RELEASE_CANDIDATE=1.1.0 MODSET=stable diff --git a/.github/workflows/tidy-dependencies.yml b/.github/workflows/tidy-dependencies.yml index d708a77352c..7f6e793aba3 100644 --- a/.github/workflows/tidy-dependencies.yml +++ b/.github/workflows/tidy-dependencies.yml @@ -18,7 +18,7 @@ jobs: token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} - uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: ~1.20.7 cache: false - name: Cache Go id: go-cache diff --git a/Makefile.Common b/Makefile.Common index a5807ab84c3..6b51e353ec1 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -67,7 +67,7 @@ fmt: $(GOIMPORTS) .PHONY: tidy tidy: rm -fr go.sum - $(GOCMD) mod tidy -compat=1.19 + $(GOCMD) mod tidy -compat=1.20 .PHONY: lint lint: $(LINT) diff --git a/cmd/builder/go.mod b/cmd/builder/go.mod index c5bf9eb9d08..7a3cbadae79 100644 --- a/cmd/builder/go.mod +++ b/cmd/builder/go.mod @@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/cmd/builder -go 1.19 +go 1.20 require ( github.com/knadh/koanf/parsers/yaml v0.1.0 diff --git a/cmd/builder/internal/builder/main.go b/cmd/builder/internal/builder/main.go index 765763b90c5..0267b071c52 100644 --- a/cmd/builder/internal/builder/main.go +++ b/cmd/builder/internal/builder/main.go @@ -112,7 +112,7 @@ func GetModules(cfg Config) error { } // #nosec G204 -- cfg.Distribution.Go is trusted to be a safe path - cmd := exec.Command(cfg.Distribution.Go, "mod", "tidy", "-compat=1.19") + cmd := exec.Command(cfg.Distribution.Go, "mod", "tidy", "-compat=1.20") cmd.Dir = cfg.Distribution.OutputPath if out, err := cmd.CombinedOutput(); err != nil { return fmt.Errorf("failed to update go.mod: %w. Output:\n%s", err, out) diff --git a/cmd/builder/internal/builder/main_test.go b/cmd/builder/internal/builder/main_test.go index 15d3512b593..7c3b09b27c7 100644 --- a/cmd/builder/internal/builder/main_test.go +++ b/cmd/builder/internal/builder/main_test.go @@ -36,6 +36,10 @@ func TestGenerateInvalidOutputPath(t *testing.T) { } func TestSkipGenerate(t *testing.T) { + if runtime.GOOS == "windows" { + t.Skip("skipping the test on Windows, see https://github.com/open-telemetry/opentelemetry-collector/issues/5403") + } + cfg := NewDefaultConfig() cfg.Distribution.OutputPath = t.TempDir() cfg.SkipGenerate = true diff --git a/cmd/builder/internal/builder/templates/go.mod.tmpl b/cmd/builder/internal/builder/templates/go.mod.tmpl index 1260b820e8c..5aebc67da17 100644 --- a/cmd/builder/internal/builder/templates/go.mod.tmpl +++ b/cmd/builder/internal/builder/templates/go.mod.tmpl @@ -2,7 +2,7 @@ module {{.Distribution.Module}} -go 1.19 +go 1.20 require ( {{- range .Connectors}} diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 32e8f3f835f..ed618d5ac08 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -2,7 +2,7 @@ module go.opentelemetry.io/collector/cmd/otelcorecol -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/component/go.mod b/component/go.mod index a6d8d0d8955..f65308888ea 100644 --- a/component/go.mod +++ b/component/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/component -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/config/configauth/go.mod b/config/configauth/go.mod index 189814a490c..6e5f037b97c 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/configauth -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/config/configcompression/go.mod b/config/configcompression/go.mod index 5877dbc78ea..e6f8e8db75a 100644 --- a/config/configcompression/go.mod +++ b/config/configcompression/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/configcompression -go 1.19 +go 1.20 require github.com/stretchr/testify v1.8.4 diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index a4f82daee9c..bd5734b144f 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/configgrpc -go 1.19 +go 1.20 require ( github.com/mostynb/go-grpc-compression v1.2.0 diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 0d29cf01840..f6c6b4ff759 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/confighttp -go 1.19 +go 1.20 require ( github.com/golang/snappy v0.0.4 diff --git a/config/confignet/go.mod b/config/confignet/go.mod index 73b322ed1db..a8650a87137 100644 --- a/config/confignet/go.mod +++ b/config/confignet/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/confignet -go 1.19 +go 1.20 require github.com/stretchr/testify v1.8.4 diff --git a/config/configopaque/go.mod b/config/configopaque/go.mod index 582e6a19dea..e0d2e0c702a 100644 --- a/config/configopaque/go.mod +++ b/config/configopaque/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/configopaque -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/config/configtelemetry/go.mod b/config/configtelemetry/go.mod index 90526b90946..84ee9c3c62b 100644 --- a/config/configtelemetry/go.mod +++ b/config/configtelemetry/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/configtelemetry -go 1.19 +go 1.20 require github.com/stretchr/testify v1.8.4 diff --git a/config/configtls/go.mod b/config/configtls/go.mod index af4020eecdd..93427b9fc32 100644 --- a/config/configtls/go.mod +++ b/config/configtls/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/configtls -go 1.19 +go 1.20 require ( github.com/fsnotify/fsnotify v1.6.0 diff --git a/config/internal/go.mod b/config/internal/go.mod index 1b7cac10655..abf205b4f6a 100644 --- a/config/internal/go.mod +++ b/config/internal/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/config/internal -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/confmap/go.mod b/confmap/go.mod index 88ac23ad6b0..bce150e4ed8 100644 --- a/confmap/go.mod +++ b/confmap/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/confmap -go 1.19 +go 1.20 require ( github.com/knadh/koanf/maps v0.1.1 diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index a298bc1a3b6..b20985ddcf9 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/connector/forwardconnector -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/connector/go.mod b/connector/go.mod index f09e2f8a4f5..2141769130b 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/connector -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/consumer/go.mod b/consumer/go.mod index a1b6020989e..7675c16d0b0 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/consumer -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/exporter/go.mod b/exporter/go.mod index bde12d5045f..add762d5591 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/exporter -go 1.19 +go 1.20 require ( github.com/cenkalti/backoff/v4 v4.2.1 diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 371ce42a9ee..f628f6db4e6 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/exporter/loggingexporter -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index df8cb1108f1..850b9ba2e40 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/exporter/otlpexporter -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 98d8d3eefa3..b62bc8c3d53 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/exporter/otlphttpexporter -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/extension/auth/go.mod b/extension/auth/go.mod index fb9168a2f39..26812fffdd7 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/extension/auth -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index 1ef4829d586..5aa559347f3 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/extension/ballastextension -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/extension/go.mod b/extension/go.mod index 3115e3bbc43..172a158d690 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/extension -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index cff2bfa9c4d..3f0170b6e35 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/extension/zpagesextension -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/featuregate/go.mod b/featuregate/go.mod index 0868759864d..1597ac80cc6 100644 --- a/featuregate/go.mod +++ b/featuregate/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/featuregate -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/go.mod b/go.mod index 8c3ffd2cd25..33df9747753 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector -go 1.19 +go 1.20 require ( contrib.go.opencensus.io/exporter/prometheus v0.4.2 diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 30a5955d7bc..2eb1ceba8d3 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/internal/tools -go 1.19 +go 1.20 require ( github.com/a8m/envsubst v1.4.2 diff --git a/pdata/go.mod b/pdata/go.mod index bd62a86c929..63c6096c99b 100644 --- a/pdata/go.mod +++ b/pdata/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/pdata -go 1.19 +go 1.20 require ( github.com/gogo/protobuf v1.3.2 diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 35126b289b0..99a20526ab3 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/processor/batchprocessor -go 1.19 +go 1.20 require ( contrib.go.opencensus.io/exporter/prometheus v0.4.2 diff --git a/processor/go.mod b/processor/go.mod index af1486646d9..04b4aa19da3 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/processor -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index 18e1cd37823..9f00b15d14c 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/processor/memorylimiterprocessor -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/receiver/go.mod b/receiver/go.mod index ccaf0de7827..283825ac40c 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/receiver -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index e34a0145005..edc7f066870 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/receiver/otlpreceiver -go 1.19 +go 1.20 require ( github.com/gogo/protobuf v1.3.2 diff --git a/semconv/go.mod b/semconv/go.mod index f323e77abc9..d5dd356474c 100644 --- a/semconv/go.mod +++ b/semconv/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/collector/semconv -go 1.19 +go 1.20 require ( github.com/hashicorp/go-version v1.6.0