Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove go 1.18 support, bump minimum to go 1.19 and add testing for 1.20 #7151

Merged
merged 3 commits into from
Feb 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .chloggen/go1-20.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# 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.18 support, bump minimum to go 1.19 and add testing for 1.20

# One or more tracking issues or pull requests related to the change
issues: [7151]

# (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:
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
unittest:
strategy:
matrix:
go-version: [1.19, 1.18]
go-version: ["1.20", 1.19] # 1.20 needs quotes otherwise it's interpreted as 1.2
runs-on: ubuntu-latest
needs: [setup-environment]
steps:
Expand Down
2 changes: 1 addition & 1 deletion Makefile.Common
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ fmt: $(GOIMPORTS)
.PHONY: tidy
tidy:
rm -fr go.sum
$(GOCMD) mod tidy -compat=1.18
$(GOCMD) mod tidy -compat=1.19

.PHONY: lint
lint: $(LINT)
Expand Down
2 changes: 1 addition & 1 deletion cmd/builder/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

module go.opentelemetry.io/collector/cmd/builder

go 1.18
go 1.19

require (
github.com/knadh/koanf v1.5.0
Expand Down
2 changes: 1 addition & 1 deletion cmd/builder/internal/builder/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,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.18")
cmd := exec.Command(cfg.Distribution.Go, "mod", "tidy", "-compat=1.19")
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)
Expand Down
2 changes: 1 addition & 1 deletion cmd/builder/internal/builder/templates/go.mod.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module {{.Distribution.Module}}

go 1.18
go 1.19

require (
{{- range .Connectors}}
Expand Down
2 changes: 1 addition & 1 deletion cmd/otelcorecol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module go.opentelemetry.io/collector/cmd/otelcorecol

go 1.18
go 1.19

require (
github.com/stretchr/testify v1.8.1
Expand Down
2 changes: 1 addition & 1 deletion component/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/component

go 1.18
go 1.19

require (
github.com/stretchr/testify v1.8.1
Expand Down
2 changes: 1 addition & 1 deletion confmap/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/confmap

go 1.18
go 1.19

require (
github.com/knadh/koanf v1.5.0
Expand Down
2 changes: 1 addition & 1 deletion connector/forwardconnector/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/connector/forwardconnector

go 1.18
go 1.19

require (
github.com/stretchr/testify v1.8.1
Expand Down
2 changes: 1 addition & 1 deletion consumer/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/consumer

go 1.18
go 1.19

require (
github.com/stretchr/testify v1.8.1
Expand Down
2 changes: 1 addition & 1 deletion exporter/loggingexporter/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/exporter/loggingexporter

go 1.18
go 1.19

require (
github.com/stretchr/testify v1.8.1
Expand Down
2 changes: 1 addition & 1 deletion exporter/otlpexporter/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/exporter/otlpexporter

go 1.18
go 1.19

require (
github.com/stretchr/testify v1.8.1
Expand Down
2 changes: 1 addition & 1 deletion exporter/otlphttpexporter/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/exporter/otlphttpexporter

go 1.18
go 1.19

require (
github.com/stretchr/testify v1.8.1
Expand Down
2 changes: 1 addition & 1 deletion extension/ballastextension/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/extension/ballastextension

go 1.18
go 1.19

require (
github.com/stretchr/testify v1.8.1
Expand Down
2 changes: 1 addition & 1 deletion extension/zpagesextension/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/extension/zpagesextension

go 1.18
go 1.19

require (
github.com/stretchr/testify v1.8.1
Expand Down
2 changes: 1 addition & 1 deletion featuregate/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/featuregate

go 1.18
go 1.19

require (
github.com/stretchr/testify v1.8.1
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector

go 1.18
go 1.19

require (
contrib.go.opencensus.io/exporter/prometheus v0.4.2
Expand Down
2 changes: 1 addition & 1 deletion internal/tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/internal/tools

go 1.18
go 1.19

require (
github.com/client9/misspell v0.3.4
Expand Down
2 changes: 1 addition & 1 deletion pdata/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/pdata

go 1.18
go 1.19

require (
github.com/gogo/protobuf v1.3.2
Expand Down
2 changes: 1 addition & 1 deletion processor/batchprocessor/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/processor/batchprocessor

go 1.18
go 1.19

require (
contrib.go.opencensus.io/exporter/prometheus v0.4.2
Expand Down
2 changes: 1 addition & 1 deletion processor/memorylimiterprocessor/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/processor/memorylimiterprocessor

go 1.18
go 1.19

require (
github.com/stretchr/testify v1.8.1
Expand Down
2 changes: 1 addition & 1 deletion receiver/otlpreceiver/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/receiver/otlpreceiver

go 1.18
go 1.19

require (
github.com/gogo/protobuf v1.3.2
Expand Down
2 changes: 1 addition & 1 deletion semconv/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/collector/semconv

go 1.18
go 1.19

require github.com/stretchr/testify v1.8.1

Expand Down