Skip to content

Commit

Permalink
remove go 1.18 support, bump minimum to go 1.19 and add testing for 1…
Browse files Browse the repository at this point in the history
….20 (#18436)

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

Signed-off-by: Alex Boten <[email protected]>

* add quotes around 1.20

Signed-off-by: Alex Boten <[email protected]>

* update changelog

Signed-off-by: Alex Boten <[email protected]>

* bump version of builder

Signed-off-by: Alex Boten <[email protected]>

* update test to support 1.20 error message

Signed-off-by: Alex Boten <[email protected]>

---------

Signed-off-by: Alex Boten <[email protected]>
  • Loading branch information
Alex Boten authored Feb 15, 2023
1 parent e7d474e commit 9f916b7
Show file tree
Hide file tree
Showing 229 changed files with 273 additions and 239 deletions.
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. filelogreceiver)
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 related to the change
issues: [18436]

# (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:
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ jobs:
unittest-matrix:
strategy:
matrix:
go-version: [1.19, 1.18]
go-version: ["1.20", 1.19] # 1.20 is interpreted as 1.2 without quotes
group:
- receiver-0
- receiver-1
Expand Down Expand Up @@ -250,7 +250,7 @@ jobs:
if: ${{ github.actor != 'dependabot[bot]' && always() }}
strategy:
matrix:
go-version: [1.19, 1.18]
go-version: ["1.20", 1.19] # 1.20 is interpreted as 1.2 without quotes
runs-on: ubuntu-latest
needs: [setup-environment, unittest-matrix]
steps:
Expand Down
2 changes: 1 addition & 1 deletion Makefile.Common
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ lint: $(LINT) checklicense misspell
.PHONY: tidy
tidy:
rm -fr go.sum
$(GOCMD) mod tidy -compat=1.18
$(GOCMD) mod tidy -compat=1.19

.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.18
go 1.19

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.18
go 1.19

require (
github.com/stretchr/testify v1.8.1
Expand Down
19 changes: 14 additions & 5 deletions cmd/otelcontribcol/components_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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.18
go 1.19

require (
github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.71.0
Expand Down
19 changes: 14 additions & 5 deletions cmd/oteltestbedcol/components_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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.18
go 1.19

require (
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.71.0
Expand Down
2 changes: 1 addition & 1 deletion cmd/telemetrygen/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18 AS build
FROM golang:1.19 AS build

WORKDIR /src
ADD . /src
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.18
go 1.19

require (
github.com/grpc-ecosystem/go-grpc-middleware v1.3.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.18
go 1.19

require (
github.com/aws/aws-sdk-go-v2 v1.17.4
Expand Down
2 changes: 1 addition & 1 deletion examples/demo/client/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM golang:1.18 as build
FROM golang:1.19 as build
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.18
go 1.19

require (
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.39.0
Expand Down
2 changes: 1 addition & 1 deletion examples/demo/server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM golang:1.18 as build
FROM golang:1.19 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.18
go 1.19

require (
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.39.0
Expand Down
2 changes: 1 addition & 1 deletion examples/tracing/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18 AS build
FROM golang:1.19 AS build

WORKDIR /src
ADD . /src
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.18
go 1.19

require (
github.com/aliyun/aliyun-log-go-sdk v0.1.43
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.18
go 1.19

require (
github.com/aws/aws-sdk-go v1.44.200
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.18
go 1.19

require (
github.com/aws/aws-sdk-go v1.44.200
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.18
go 1.19

require (
github.com/aws/aws-sdk-go-v2 v1.17.4
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.18
go 1.19

require (
github.com/aws/aws-sdk-go v1.44.200
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.18
go 1.19

require (
github.com/Azure/azure-kusto-go v0.9.2
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.18
go 1.19

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.18
go 1.19

require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.71.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/clickhouseexporter/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/clickhouseexporter

go 1.18
go 1.19

require (
github.com/ClickHouse/clickhouse-go/v2 v2.6.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/coralogixexporter/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/coralogixexporter

go 1.18
go 1.19

require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.71.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/datadogexporter/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/datadogexporter

go 1.18
go 1.19

require (
github.com/DataDog/agent-payload/v5 v5.0.70
Expand Down
2 changes: 1 addition & 1 deletion exporter/dynatraceexporter/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/dynatraceexporter

go 1.18
go 1.19

require (
github.com/dynatrace-oss/dynatrace-metric-utils-go v0.5.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/elasticsearchexporter/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/elasticsearchexporter

go 1.18
go 1.19

require (
github.com/cenkalti/backoff/v4 v4.2.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/f5cloudexporter/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/f5cloudexporter

go 1.18
go 1.19

require (
github.com/cenkalti/backoff/v4 v4.2.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/fileexporter/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/fileexporter

go 1.18
go 1.19

require (
github.com/klauspost/compress v1.15.15
Expand Down
2 changes: 1 addition & 1 deletion exporter/googlecloudexporter/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/googlecloudexporter

go 1.18
go 1.19

require (
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.35.1
Expand Down
2 changes: 1 addition & 1 deletion exporter/googlecloudpubsubexporter/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/googlecloudpubsubexporter

go 1.18
go 1.19

require (
cloud.google.com/go/pubsub v1.28.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/googlemanagedprometheusexporter/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/googlemanagedprometheusexporter

go 1.18
go 1.19

require (
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.35.1
Expand Down
2 changes: 1 addition & 1 deletion exporter/influxdbexporter/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/influxdbexporter

go 1.18
go 1.19

require (
github.com/cenkalti/backoff/v4 v4.2.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/instanaexporter/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/instanaexporter

go 1.18
go 1.19

require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.71.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/jaegerexporter/go.mod
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Deprecated: jaeger exporter is deprecated and will be removed in July 2023. See https://github.com/open-telemetry/opentelemetry-specification/pull/2858 for more details.
module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter

go 1.18
go 1.19

require (
github.com/cenkalti/backoff/v4 v4.2.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/jaegerthrifthttpexporter/go.mod
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Deprecated: jaeger exporter is deprecated and will be removed in July 2023. See https://github.com/open-telemetry/opentelemetry-specification/pull/2858 for more details.
module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerthrifthttpexporter

go 1.18
go 1.19

require (
github.com/apache/thrift v0.17.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/kafkaexporter/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/kafkaexporter

go 1.18
go 1.19

require (
github.com/Shopify/sarama v1.38.1
Expand Down
2 changes: 1 addition & 1 deletion exporter/loadbalancingexporter/example/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18 AS build
FROM golang:1.19 AS build

WORKDIR /src
ADD . /src
Expand Down
Loading

0 comments on commit 9f916b7

Please sign in to comment.