Remove go 1.19 support, bump minimum to go 1.20 and add testing for 1…

….21 (#8208) Fixes #8207 --------- Co-authored-by: bryan-aguilar <[email protected]>
open-telemetry · Aug 11, 2023 · 81242fa · 81242fa
1 parent c46704a
commit 81242fa
Show file tree

Hide file tree

Showing 51 changed files with 76 additions and 54 deletions.
diff --git a/.chloggen/mx-psi_refactor-service-telemetry.yaml 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/collector/extension
 
-go 1.19
+go 1.20
 
 require (
 	github.com/stretchr/testify v1.8.4
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@