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.19 support, bump minimum to go 1.20 and add testing for 1.21 #25162

Merged
merged 7 commits into from
Aug 13, 2023
Merged
Show file tree
Hide file tree
Changes from 6 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
13 changes: 13 additions & 0 deletions .chloggen/go1-21.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# 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]

change_logs: [api]
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
run: Install-WindowsFeature -name Web-Server -IncludeManagementTools
- uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false
- name: Cache Go
id: go-mod-cache
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false
- name: Cache Go
id: go-cache
Expand All @@ -163,7 +163,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -225,7 +225,7 @@ jobs:
unittest-matrix:
strategy:
matrix:
go-version: ["1.20", 1.19] # 1.20 is interpreted as 1.2 without quotes
go-version: ["1.21", "1.20"] # 1.20 is interpreted as 1.2 without quotes
group:
- receiver-0
- receiver-1
Expand Down Expand Up @@ -316,7 +316,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false
- name: Cache Go
id: go-cache
Expand All @@ -337,7 +337,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false
- name: Cache Go
id: go-cache
Expand All @@ -363,7 +363,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -427,7 +427,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -559,7 +559,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false
- name: Mkdir bin and dist
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false
- name: Cache Go
id: go-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false

# Initializes the CodeQL tools for scanning.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-dependabot-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
run: sudo apt-get update; sudo apt-get install zsh
- uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false
- name: Run dependabot-pr.sh
run: ./.github/workflows/scripts/dependabot-pr.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false
- name: Cache Go
id: go-cache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/load-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false
- name: Cache Go
id: go-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prepare-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
path: opentelemetry-collector-contrib
- uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false
- name: Prepare release for contrib
working-directory: opentelemetry-collector-contrib
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prometheus-compliance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
path: opentelemetry-collector-contrib
- uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false
- name: Cache Go
id: go-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tidy-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}
- uses: actions/setup-go@v4
with:
go-version: ~1.19.12
go-version: ~1.20.7
cache: false
- name: Cache Go
id: go-cache
Expand Down
2 changes: 1 addition & 1 deletion Makefile.Common
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ govulncheck: $(GOVULNCHECK)
.PHONY: tidy
tidy:
rm -fr go.sum
$(GOCMD) mod tidy -compat=1.19
$(GOCMD) mod tidy -compat=1.20

.PHONY: misspell
misspell: $(TOOLS_BIN_DIR)/misspell
Expand Down
2 changes: 1 addition & 1 deletion cmd/configschema/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/configschema

go 1.19
go 1.20

require (
github.com/fatih/structtag v1.2.0
Expand Down
2 changes: 1 addition & 1 deletion cmd/mdatagen/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen

go 1.19
go 1.20

require (
github.com/google/go-cmp v0.5.9
Expand Down
2 changes: 1 addition & 1 deletion cmd/opampsupervisor/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor

go 1.19
go 1.20

require (
github.com/cenkalti/backoff/v4 v4.2.0
Expand Down
2 changes: 1 addition & 1 deletion cmd/otelcontribcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/otelcontribcol

go 1.19
go 1.20

require (
github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.82.0
Expand Down
2 changes: 1 addition & 1 deletion cmd/oteltestbedcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/oteltestbedcol

go 1.19
go 1.20
dmitryax marked this conversation as resolved.
Show resolved Hide resolved

require (
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.82.0
Expand Down
2 changes: 1 addition & 1 deletion cmd/telemetrygen/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen

go 1.19
go 1.20

require (
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
Expand Down
2 changes: 1 addition & 1 deletion confmap/provider/s3provider/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider

go 1.19
go 1.20

require (
github.com/aws/aws-sdk-go-v2 v1.20.1
Expand Down
2 changes: 1 addition & 1 deletion connector/countconnector/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector

go 1.19
go 1.20

require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.82.0
Expand Down
2 changes: 1 addition & 1 deletion connector/exceptionsconnector/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector

go 1.19
go 1.20

require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.82.0
Expand Down
2 changes: 1 addition & 1 deletion connector/routingconnector/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector

go 1.19
go 1.20

require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.82.0
Expand Down
2 changes: 1 addition & 1 deletion connector/spanmetricsconnector/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector

go 1.19
go 1.20

require (
github.com/hashicorp/golang-lru v1.0.2
Expand Down
2 changes: 1 addition & 1 deletion examples/demo/client/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0
FROM golang:1.20 as build
FROM golang:1.20.7 as build
dmitryax marked this conversation as resolved.
Show resolved Hide resolved
WORKDIR /app/
COPY . .
RUN go env -w GOPROXY=direct
Expand Down
2 changes: 1 addition & 1 deletion examples/demo/client/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/examples/demo/client

go 1.19
go 1.20

require (
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0
Expand Down
2 changes: 1 addition & 1 deletion examples/demo/server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0
FROM golang:1.20 as build
FROM golang:1.20.7 as build
WORKDIR /app/
COPY . .
RUN go env -w GOPROXY=direct
Expand Down
2 changes: 1 addition & 1 deletion examples/demo/server/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/examples/demo/server

go 1.19
go 1.20

require (
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/alibabacloudlogserviceexporter/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter

go 1.19
go 1.20

require (
github.com/aliyun/aliyun-log-go-sdk v0.1.51
Expand Down
2 changes: 1 addition & 1 deletion exporter/awscloudwatchlogsexporter/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter

go 1.19
go 1.20

require (
github.com/aws/aws-sdk-go v1.44.319
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsemfexporter/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter

go 1.19
go 1.20

require (
github.com/aws/aws-sdk-go v1.44.319
Expand Down
2 changes: 1 addition & 1 deletion exporter/awskinesisexporter/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awskinesisexporter

go 1.19
go 1.20

require (
github.com/aws/aws-sdk-go-v2 v1.20.1
Expand Down
2 changes: 1 addition & 1 deletion exporter/awss3exporter/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter

go 1.19
go 1.20

require (
github.com/aws/aws-sdk-go v1.44.319
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter

go 1.19
go 1.20

require (
github.com/aws/aws-sdk-go v1.44.319
Expand Down
2 changes: 1 addition & 1 deletion exporter/azuredataexplorerexporter/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter

go 1.19
go 1.20

require (
github.com/Azure/azure-kusto-go v0.13.1
Expand Down
2 changes: 1 addition & 1 deletion exporter/azuremonitorexporter/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter

go 1.19
go 1.20

require (
github.com/microsoft/ApplicationInsights-Go v0.4.4
Expand Down
2 changes: 1 addition & 1 deletion exporter/carbonexporter/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter

go 1.19
go 1.20

require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.82.0
Expand Down
Loading
Loading