Skip to content

Commit

Permalink
Removes go1.17, replaces with go1.18 (#3179)
Browse files Browse the repository at this point in the history
* Removes go1.17, replaces with go1.18

* Update Changelog

Co-authored-by: Chester Cheung <cheung.zhy.csu@gmail.com>
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
  • Loading branch information
3 people committed Sep 20, 2022
1 parent cce6304 commit b6d4335
Show file tree
Hide file tree
Showing 32 changed files with 28 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yml
Expand Up @@ -4,7 +4,7 @@ on:
branches:
- main
env:
DEFAULT_GO_VERSION: 1.17
DEFAULT_GO_VERSION: 1.18
jobs:
benchmark:
name: Benchmarks
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Expand Up @@ -109,7 +109,7 @@ jobs:
compatibility-test:
strategy:
matrix:
go-version: [1.19, 1.18, 1.17]
go-version: [1.19, 1.18]
os: [ubuntu-latest, macos-latest, windows-latest]
# GitHub Actions does not support arm* architectures on default
# runners. It is possible to acomplish this with a self-hosted runner
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependabot.yml
Expand Up @@ -13,7 +13,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: actions/setup-go@v3
with:
go-version: '^1.17.0'
go-version: '^1.18.0'
- uses: evantorrie/mott-the-tidier@v1-beta
id: modtidy
with:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -14,6 +14,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

- The metric SDK in `go.opentelemetry.io/otel/sdk/metric` is completely refactored to comply with the OpenTelemetry specification.
Please see the package documentation for how the new SDK is initialized and configured. (#3175)
- Update the minimum supported go version to go1.18. Removes support for go1.17 (#3179)

### Removed

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -156,7 +156,7 @@ go-mod-tidy/%: DIR=$*
go-mod-tidy/%: | crosslink
@echo "$(GO) mod tidy in $(DIR)" \
&& cd $(DIR) \
&& $(GO) mod tidy -compat=1.17
&& $(GO) mod tidy -compat=1.18

.PHONY: lint-modules
lint-modules: go-mod-tidy
Expand Down
5 changes: 0 additions & 5 deletions README.md
Expand Up @@ -52,19 +52,14 @@ Currently, this project supports the following environments.
| ------- | ---------- | ------------ |
| Ubuntu | 1.19 | amd64 |
| Ubuntu | 1.18 | amd64 |
| Ubuntu | 1.17 | amd64 |
| Ubuntu | 1.19 | 386 |
| Ubuntu | 1.18 | 386 |
| Ubuntu | 1.17 | 386 |
| MacOS | 1.19 | amd64 |
| MacOS | 1.18 | amd64 |
| MacOS | 1.17 | amd64 |
| Windows | 1.19 | amd64 |
| Windows | 1.18 | amd64 |
| Windows | 1.17 | amd64 |
| Windows | 1.19 | 386 |
| Windows | 1.18 | 386 |
| Windows | 1.17 | 386 |

While this project should work for other systems, no compatibility guarantees
are made for those systems currently.
Expand Down
2 changes: 1 addition & 1 deletion bridge/opencensus/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/bridge/opencensus

go 1.17
go 1.18

require (
go.opencensus.io v0.22.6-0.20201102222123-380f4078db9f
Expand Down
2 changes: 1 addition & 1 deletion bridge/opencensus/test/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/bridge/opencensus/test

go 1.17
go 1.18

require (
go.opencensus.io v0.23.0
Expand Down
2 changes: 1 addition & 1 deletion bridge/opentracing/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/bridge/opentracing

go 1.17
go 1.18

replace go.opentelemetry.io/otel => ../..

Expand Down
2 changes: 1 addition & 1 deletion example/fib/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/example/fib

go 1.17
go 1.18

require (
go.opentelemetry.io/otel v1.10.0
Expand Down
2 changes: 1 addition & 1 deletion example/jaeger/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/example/jaeger

go 1.17
go 1.18

replace (
go.opentelemetry.io/otel => ../..
Expand Down
2 changes: 1 addition & 1 deletion example/namedtracer/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/example/namedtracer

go 1.17
go 1.18

replace (
go.opentelemetry.io/otel => ../..
Expand Down
2 changes: 1 addition & 1 deletion example/otel-collector/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/example/otel-collector

go 1.17
go 1.18

replace (
go.opentelemetry.io/otel => ../..
Expand Down
2 changes: 1 addition & 1 deletion example/passthrough/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/example/passthrough

go 1.17
go 1.18

require (
go.opentelemetry.io/otel v1.10.0
Expand Down
2 changes: 1 addition & 1 deletion example/zipkin/Dockerfile
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.17-alpine
FROM golang:1.18-alpine
COPY . /go/src/github.com/open-telemetry/opentelemetry-go/
WORKDIR /go/src/github.com/open-telemetry/opentelemetry-go/example/zipkin/
RUN go install ./main.go
Expand Down
2 changes: 1 addition & 1 deletion example/zipkin/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/example/zipkin

go 1.17
go 1.18

replace (
go.opentelemetry.io/otel => ../..
Expand Down
2 changes: 1 addition & 1 deletion exporters/jaeger/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/exporters/jaeger

go 1.17
go 1.18

require (
github.com/google/go-cmp v0.5.8
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/internal/retry/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/exporters/otlp/internal/retry

go 1.17
go 1.18

require (
github.com/cenkalti/backoff/v4 v4.1.3
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/otlptrace/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/exporters/otlp/otlptrace

go 1.17
go 1.18

require (
github.com/google/go-cmp v0.5.8
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/otlptrace/otlptracegrpc/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc

go 1.17
go 1.18

require (
github.com/stretchr/testify v1.7.1
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/otlptrace/otlptracehttp/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp

go 1.17
go 1.18

require (
github.com/stretchr/testify v1.7.1
Expand Down
2 changes: 1 addition & 1 deletion exporters/stdout/stdouttrace/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/exporters/stdout/stdouttrace

go 1.17
go 1.18

replace (
go.opentelemetry.io/otel => ../../..
Expand Down
2 changes: 1 addition & 1 deletion exporters/zipkin/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/exporters/zipkin

go 1.17
go 1.18

require (
github.com/google/go-cmp v0.5.8
Expand Down
2 changes: 1 addition & 1 deletion go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel

go 1.17
go 1.18

require (
github.com/go-logr/logr v1.2.3
Expand Down
2 changes: 1 addition & 1 deletion internal/tools/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/internal/tools

go 1.17
go 1.18

require (
github.com/client9/misspell v0.3.4
Expand Down
2 changes: 1 addition & 1 deletion metric/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/metric

go 1.17
go 1.18

require (
github.com/stretchr/testify v1.7.1
Expand Down
2 changes: 1 addition & 1 deletion schema/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/schema

go 1.17
go 1.18

require (
github.com/Masterminds/semver/v3 v3.1.1
Expand Down
2 changes: 1 addition & 1 deletion sdk/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/sdk

go 1.17
go 1.18

replace go.opentelemetry.io/otel => ../

Expand Down
3 changes: 0 additions & 3 deletions sdk/metric/aggregation/aggregation.go
Expand Up @@ -12,9 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build go1.17
// +build go1.17

// Package aggregation contains configuration types that define the
// aggregation operation used to summarizes recorded measurements.
package aggregation // import "go.opentelemetry.io/otel/sdk/metric/aggregation"
Expand Down
3 changes: 0 additions & 3 deletions sdk/metric/aggregation/aggregation_test.go
Expand Up @@ -12,9 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build go1.17
// +build go1.17

package aggregation

import (
Expand Down
2 changes: 0 additions & 2 deletions sdk/metric/metricdata/temporality.go
Expand Up @@ -13,8 +13,6 @@
// limitations under the License.

//go:generate stringer -type=Temporality
//go:build go1.17
// +build go1.17

package metricdata // import "go.opentelemetry.io/otel/sdk/metric/metricdata"

Expand Down
2 changes: 1 addition & 1 deletion trace/go.mod
@@ -1,6 +1,6 @@
module go.opentelemetry.io/otel/trace

go 1.17
go 1.18

replace go.opentelemetry.io/otel => ../

Expand Down

0 comments on commit b6d4335

Please sign in to comment.