Drop support for Go 1.17 (open-telemetry#2785)

* Remove Go 1.17 support from README * Update Makefile go-mod-tidy Use compat=1.18 instead of 1.17. * Remove 1.17 from tested compatibility * Update changelog with drop of 1.17 * Update go mod min ver
khushijain21 · Sep 22, 2022 · 2cd36e6 · 2cd36e6
1 parent 91e5196
commit 2cd36e6
Show file tree

Hide file tree

Showing 80 changed files with 85 additions and 85 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased]
 
+### Removed
+
+- Drop support for Go 1.17.
+  The project currently only supports Go 1.18 and above. (#2785)
+
 ## [0.36.0]
 
 ### Changed

diff --git a/Makefile b/Makefile
@@ -119,7 +119,7 @@ go-mod-tidy/%: DIR=$*
 go-mod-tidy/%:
 	@echo "$(GO) mod tidy in $(DIR)" \
 		&& cd $(DIR) \
-		&& $(GO) mod tidy -compat=1.17
+		&& $(GO) mod tidy -compat=1.18
 
 .PHONY: misspell
 misspell: | $(MISSPELL)

diff --git a/README.md b/README.md
@@ -46,19 +46,14 @@ This project is tested on the following systems.
 | ------- | ---------- | ------------ |
 | 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.

diff --git a/detectors/aws/ec2/go.mod b/detectors/aws/ec2/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/detectors/aws/ec2
 
-go 1.17
+go 1.18
 
 require (
 	github.com/aws/aws-sdk-go v1.44.96

diff --git a/detectors/aws/ecs/go.mod b/detectors/aws/ecs/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/detectors/aws/ecs
 
-go 1.17
+go 1.18
 
 require (
 	github.com/stretchr/testify v1.8.0

diff --git a/detectors/aws/eks/go.mod b/detectors/aws/eks/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/detectors/aws/eks
 
-go 1.17
+go 1.18
 
 require (
 	github.com/stretchr/testify v1.8.0

diff --git a/detectors/aws/lambda/go.mod b/detectors/aws/lambda/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/detectors/aws/lambda
 
-go 1.17
+go 1.18
 
 require (
 	github.com/stretchr/testify v1.8.0

diff --git a/detectors/gcp/go.mod b/detectors/gcp/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/detectors/gcp
 
-go 1.17
+go 1.18
 
 require (
 	cloud.google.com/go/compute v1.9.0

diff --git a/go.mod b/go.mod
@@ -1,3 +1,3 @@
 module go.opentelemetry.io/contrib
 
-go 1.17
+go 1.18
diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/example/go.mod b/instrumentation/github.com/Shopify/sarama/otelsarama/example/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama/example
 
-go 1.17
+go 1.18
 
 replace go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama => ../
 

diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/go.mod b/instrumentation/github.com/Shopify/sarama/otelsarama/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama
 
-go 1.17
+go 1.18
 
 require (
 	github.com/Shopify/sarama v1.36.0

diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/test/go.mod b/instrumentation/github.com/Shopify/sarama/otelsarama/test/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama/test
 
-go 1.17
+go 1.18
 
 require (
 	github.com/Shopify/sarama v1.36.0

diff --git a/instrumentation/github.com/astaxie/beego/otelbeego/example/Dockerfile b/instrumentation/github.com/astaxie/beego/otelbeego/example/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.17-alpine AS base
+FROM golang:1.18-alpine AS base
 COPY . /src/
 WORKDIR /src/instrumentation/github.com/astaxie/beego/otelbeego/example
 

diff --git a/instrumentation/github.com/astaxie/beego/otelbeego/example/go.mod b/instrumentation/github.com/astaxie/beego/otelbeego/example/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego/example
 
-go 1.17
+go 1.18
 
 replace (
 	go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego => ../

diff --git a/instrumentation/github.com/astaxie/beego/otelbeego/go.mod b/instrumentation/github.com/astaxie/beego/otelbeego/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego
 
-go 1.17
+go 1.18
 
 replace go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => ../../../../net/http/otelhttp
 

diff --git a/instrumentation/github.com/astaxie/beego/otelbeego/test/go.mod b/instrumentation/github.com/astaxie/beego/otelbeego/test/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego/test
 
-go 1.17
+go 1.18
 
 require (
 	github.com/astaxie/beego v1.12.3

diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/Dockerfile b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/Dockerfile
@@ -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 AS base
+FROM golang:1.18 AS base
 COPY . /src/
 WORKDIR /src/instrumentation/github.com/aws/aws-lambda-go/otellambda/example
 RUN apt-get update
@@ -25,4 +25,4 @@ RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2
     && ./aws/install
 RUN apt-get -y install jq
 
-CMD ["./build.sh"]
+CMD ["./build.sh"]
diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod b/instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/example
 
-go 1.17
+go 1.18
 
 replace (
 	go.opentelemetry.io/contrib/detectors/aws/lambda => ../../../../../../detectors/aws/lambda

diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/go.mod b/instrumentation/github.com/aws/aws-lambda-go/otellambda/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda
 
-go 1.17
+go 1.18
 
 require (
 	github.com/aws/aws-lambda-go v1.34.1

diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/go.mod b/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/test
 
-go 1.17
+go 1.18
 
 replace (
 	go.opentelemetry.io/contrib/detectors/aws/lambda => ../../../../../../detectors/aws/lambda

diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.mod b/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig
 
-go 1.17
+go 1.18
 
 replace (
 	go.opentelemetry.io/contrib/detectors/aws/lambda => ../../../../../../detectors/aws/lambda

diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/Dockerfile b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/Dockerfile
@@ -11,10 +11,10 @@
 # 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 AS base
+FROM golang:1.18-alpine AS base
 COPY . /src/
 WORKDIR /src/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example
 
 FROM base AS aws-client
 RUN go install ./main.go
-CMD ["/go/bin/main"]
+CMD ["/go/bin/main"]
diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example
 
-go 1.17
+go 1.18
 
 replace go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws => ../
 

diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/go.mod b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws
 
-go 1.17
+go 1.18
 
 require (
 	github.com/aws/aws-sdk-go-v2 v1.16.14

diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/go.mod b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test
 
-go 1.17
+go 1.18
 
 require (
 	github.com/aws/aws-sdk-go-v2 v1.16.14

diff --git a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/example/Dockerfile b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/example/Dockerfile
@@ -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 AS base
+FROM golang:1.18-alpine AS base
 COPY . /src/
 WORKDIR /src/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/example
 

diff --git a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/example/go.mod b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/example/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/example
 
-go 1.17
+go 1.18
 
 replace go.opentelemetry.io/contrib/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache => ../
 

diff --git a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/go.mod b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache
 
-go 1.17
+go 1.18
 
 require (
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b

diff --git a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test/go.mod b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test
 
-go 1.17
+go 1.18
 
 require (
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b

diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/example/Dockerfile b/instrumentation/github.com/emicklei/go-restful/otelrestful/example/Dockerfile
@@ -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 AS base
+FROM golang:1.18-alpine AS base
 COPY . /src/
 WORKDIR /src/instrumentation/github.com/emicklei/go-restful/otelrestful/example
 

diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/example/docker-compose.yml b/instrumentation/github.com/emicklei/go-restful/otelrestful/example/docker-compose.yml
@@ -14,7 +14,7 @@
 version: "3.7"
 services:
   go-restful-client:
-    image: golang:1.17-alpine
+    image: golang:1.18-alpine
     networks:
       - example
     command:

diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/example/go.mod b/instrumentation/github.com/emicklei/go-restful/otelrestful/example/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful/example
 
-go 1.17
+go 1.18
 
 replace (
 	go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful => ../

diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/go.mod b/instrumentation/github.com/emicklei/go-restful/otelrestful/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful
 
-go 1.17
+go 1.18
 
 replace go.opentelemetry.io/contrib/propagators/b3 => ../../../../../propagators/b3
 

diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/test/go.mod b/instrumentation/github.com/emicklei/go-restful/otelrestful/test/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful/test
 
-go 1.17
+go 1.18
 
 require (
 	github.com/emicklei/go-restful/v3 v3.9.0

diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/example/go.mod b/instrumentation/github.com/gin-gonic/gin/otelgin/example/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin/example
 
-go 1.17
+go 1.18
 
 replace (
 	go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin => ../

diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/go.mod b/instrumentation/github.com/gin-gonic/gin/otelgin/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin
 
-go 1.17
+go 1.18
 
 replace go.opentelemetry.io/contrib/propagators/b3 => ../../../../../propagators/b3
 

diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/test/go.mod b/instrumentation/github.com/gin-gonic/gin/otelgin/test/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin/test
 
-go 1.17
+go 1.18
 
 require (
 	github.com/gin-gonic/gin v1.8.1

diff --git a/instrumentation/github.com/go-kit/kit/otelkit/example/go.mod b/instrumentation/github.com/go-kit/kit/otelkit/example/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/go-kit/kit/otelkit/example
 
-go 1.17
+go 1.18
 
 require (
 	github.com/gorilla/mux v1.8.0

diff --git a/instrumentation/github.com/go-kit/kit/otelkit/go.mod b/instrumentation/github.com/go-kit/kit/otelkit/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/go-kit/kit/otelkit
 
-go 1.17
+go 1.18
 
 require (
 	github.com/go-kit/kit v0.12.0

diff --git a/instrumentation/github.com/go-kit/kit/otelkit/test/go.mod b/instrumentation/github.com/go-kit/kit/otelkit/test/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/go-kit/kit/otelkit/test
 
-go 1.17
+go 1.18
 
 require (
 	github.com/go-kit/kit v0.12.0

diff --git a/instrumentation/github.com/gocql/gocql/otelgocql/go.mod b/instrumentation/github.com/gocql/gocql/otelgocql/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql
 
-go 1.17
+go 1.18
 
 require (
 	github.com/gocql/gocql v0.0.0-20200624222514-34081eda590e

diff --git a/instrumentation/github.com/gocql/gocql/otelgocql/test/go.mod b/instrumentation/github.com/gocql/gocql/otelgocql/test/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql/test
 
-go 1.17
+go 1.18
 
 require (
 	github.com/gocql/gocql v0.0.0-20210707082121-9a3953d1826d

diff --git a/instrumentation/github.com/gorilla/mux/otelmux/example/go.mod b/instrumentation/github.com/gorilla/mux/otelmux/example/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux/example
 
-go 1.17
+go 1.18
 
 replace go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux => ../
 

diff --git a/instrumentation/github.com/gorilla/mux/otelmux/go.mod b/instrumentation/github.com/gorilla/mux/otelmux/go.mod
@@ -1,6 +1,6 @@
 module go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux
 
-go 1.17
+go 1.18
 
 require (
 	github.com/felixge/httpsnoop v1.0.3