From 9ef6c2c1a6bdb4e5d95bdf03bc45926389dc6b74 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Fri, 29 Sep 2023 07:47:15 -0700 Subject: [PATCH 1/2] Drop support for Go 1.19 - Remove CI workflow for Go 1.19 - Update Makefile compat instruction to use 1.20 - Update README.md - Update all the go.mod directives to use "go 1.20" --- .github/workflows/ci.yml | 2 +- Makefile | 2 +- README.md | 5 ----- bridges/prometheus/go.mod | 2 +- detectors/aws/ec2/go.mod | 2 +- detectors/aws/ecs/go.mod | 2 +- detectors/aws/eks/go.mod | 2 +- detectors/aws/lambda/go.mod | 2 +- detectors/gcp/go.mod | 2 +- exporters/autoexport/go.mod | 2 +- go.mod | 2 +- instrgen/driver/go.mod | 2 +- instrgen/driver/testdata/interface/go.mod | 2 +- instrgen/go.mod | 2 +- .../github.com/aws/aws-lambda-go/otellambda/example/go.mod | 2 +- .../github.com/aws/aws-lambda-go/otellambda/go.mod | 2 +- .../github.com/aws/aws-lambda-go/otellambda/test/go.mod | 2 +- .../aws/aws-lambda-go/otellambda/xrayconfig/go.mod | 2 +- .../github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod | 2 +- instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/go.mod | 2 +- .../github.com/aws/aws-sdk-go-v2/otelaws/test/go.mod | 2 +- .../emicklei/go-restful/otelrestful/example/go.mod | 2 +- .../github.com/emicklei/go-restful/otelrestful/go.mod | 2 +- .../github.com/emicklei/go-restful/otelrestful/test/go.mod | 2 +- .../github.com/gin-gonic/gin/otelgin/example/go.mod | 2 +- instrumentation/github.com/gin-gonic/gin/otelgin/go.mod | 2 +- instrumentation/github.com/gin-gonic/gin/otelgin/test/go.mod | 2 +- .../github.com/gorilla/mux/otelmux/example/go.mod | 2 +- instrumentation/github.com/gorilla/mux/otelmux/go.mod | 2 +- instrumentation/github.com/gorilla/mux/otelmux/test/go.mod | 2 +- .../github.com/labstack/echo/otelecho/example/go.mod | 2 +- instrumentation/github.com/labstack/echo/otelecho/go.mod | 2 +- .../github.com/labstack/echo/otelecho/test/go.mod | 2 +- .../go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod | 2 +- .../go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod | 2 +- .../google.golang.org/grpc/otelgrpc/example/go.mod | 2 +- instrumentation/google.golang.org/grpc/otelgrpc/go.mod | 2 +- instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod | 2 +- .../gopkg.in/macaron.v1/otelmacaron/example/go.mod | 2 +- instrumentation/gopkg.in/macaron.v1/otelmacaron/go.mod | 2 +- instrumentation/gopkg.in/macaron.v1/otelmacaron/test/go.mod | 2 +- instrumentation/host/example/go.mod | 2 +- instrumentation/host/go.mod | 2 +- .../net/http/httptrace/otelhttptrace/example/go.mod | 2 +- instrumentation/net/http/httptrace/otelhttptrace/go.mod | 2 +- instrumentation/net/http/httptrace/otelhttptrace/test/go.mod | 2 +- instrumentation/net/http/otelhttp/example/go.mod | 2 +- instrumentation/net/http/otelhttp/go.mod | 2 +- instrumentation/net/http/otelhttp/test/go.mod | 2 +- instrumentation/runtime/example/go.mod | 2 +- instrumentation/runtime/go.mod | 2 +- propagators/autoprop/go.mod | 2 +- propagators/aws/go.mod | 2 +- propagators/b3/go.mod | 2 +- propagators/jaeger/go.mod | 2 +- propagators/opencensus/examples/go.mod | 2 +- propagators/opencensus/go.mod | 2 +- propagators/ot/go.mod | 2 +- samplers/aws/xray/go.mod | 2 +- samplers/jaegerremote/example/go.mod | 2 +- samplers/jaegerremote/go.mod | 2 +- samplers/probability/consistent/go.mod | 2 +- tools/go.mod | 2 +- zpages/go.mod | 2 +- 64 files changed, 63 insertions(+), 68 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0bc37a32b31..965cc2bc73a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,7 +117,7 @@ jobs: compatibility-test: strategy: matrix: - go-version: ["~1.21.1", "~1.20.8", 1.19] + go-version: ["~1.21.1", "~1.20.8"] 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/Makefile b/Makefile index d89870b89ec..100e9640c83 100644 --- a/Makefile +++ b/Makefile @@ -140,7 +140,7 @@ go-mod-tidy/%: DIR=$* go-mod-tidy/%: @echo "$(GO) mod tidy in $(DIR)" \ && cd $(DIR) \ - && $(GO) mod tidy -compat=1.19 + && $(GO) mod tidy -compat=1.20 .PHONY: misspell misspell: | $(MISSPELL) diff --git a/README.md b/README.md index 1e802141abf..9cbe96b8b7a 100644 --- a/README.md +++ b/README.md @@ -50,19 +50,14 @@ This project is tested on the following systems. | ------- | ---------- | ------------ | | Ubuntu | 1.21 | amd64 | | Ubuntu | 1.20 | amd64 | -| Ubuntu | 1.19 | amd64 | | Ubuntu | 1.21 | 386 | | Ubuntu | 1.20 | 386 | -| Ubuntu | 1.19 | 386 | | MacOS | 1.21 | amd64 | | MacOS | 1.20 | amd64 | -| MacOS | 1.19 | amd64 | | Windows | 1.21 | amd64 | | Windows | 1.20 | amd64 | -| Windows | 1.19 | amd64 | | Windows | 1.21 | 386 | | Windows | 1.20 | 386 | -| Windows | 1.19 | 386 | While this project should work for other systems, no compatibility guarantees are made for those systems currently. diff --git a/bridges/prometheus/go.mod b/bridges/prometheus/go.mod index b3cb902cf73..d533cf79ad6 100644 --- a/bridges/prometheus/go.mod +++ b/bridges/prometheus/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/bridges/prometheus -go 1.19 +go 1.20 require ( github.com/prometheus/client_golang v1.16.0 diff --git a/detectors/aws/ec2/go.mod b/detectors/aws/ec2/go.mod index 6b53f5caa84..09fb5846905 100644 --- 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.19 +go 1.20 require ( github.com/aws/aws-sdk-go v1.45.16 diff --git a/detectors/aws/ecs/go.mod b/detectors/aws/ecs/go.mod index d766adf3a43..6b086b587f3 100644 --- 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.19 +go 1.20 require ( github.com/brunoscheufler/aws-ecs-metadata-go v0.0.0-20220812150832-b6b31c6eeeaf diff --git a/detectors/aws/eks/go.mod b/detectors/aws/eks/go.mod index 4a3ef84ca9b..bea33ab9cd6 100644 --- 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.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/detectors/aws/lambda/go.mod b/detectors/aws/lambda/go.mod index 715c0ea240a..0f133f5bd9f 100644 --- 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.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/detectors/gcp/go.mod b/detectors/gcp/go.mod index 8bb5c166588..f55dc61d399 100644 --- a/detectors/gcp/go.mod +++ b/detectors/gcp/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/detectors/gcp -go 1.19 +go 1.20 require ( cloud.google.com/go/compute/metadata v0.2.3 diff --git a/exporters/autoexport/go.mod b/exporters/autoexport/go.mod index 42a2feabc30..b720f8c5d9c 100644 --- a/exporters/autoexport/go.mod +++ b/exporters/autoexport/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/exporters/autoexport -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/go.mod b/go.mod index ead30fc0ee8..d837a9f98b4 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ module go.opentelemetry.io/contrib -go 1.19 +go 1.20 diff --git a/instrgen/driver/go.mod b/instrgen/driver/go.mod index 984af94ec6c..a7720c91e60 100644 --- a/instrgen/driver/go.mod +++ b/instrgen/driver/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrgen/driver -go 1.19 +go 1.20 replace go.opentelemetry.io/contrib/instrgen => ../ diff --git a/instrgen/driver/testdata/interface/go.mod b/instrgen/driver/testdata/interface/go.mod index a0b4c96f0d0..d1add0cf7dc 100644 --- a/instrgen/driver/testdata/interface/go.mod +++ b/instrgen/driver/testdata/interface/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrgen/testdata/interface -go 1.18 +go 1.20 replace go.opentelemetry.io/contrib/instrgen => ../../.. diff --git a/instrgen/go.mod b/instrgen/go.mod index 39bc0792326..1ed2e38026e 100644 --- a/instrgen/go.mod +++ b/instrgen/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrgen -go 1.19 +go 1.20 require ( go.opentelemetry.io/otel v1.18.0 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 index c57d1569d36..f94986f3381 100644 --- 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.18 +go 1.20 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 index 9928212beb6..ebb1ee28e64 100644 --- 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.19 +go 1.20 require ( github.com/aws/aws-lambda-go v1.41.0 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 index 986a47dc96a..3692ac7a334 100644 --- 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.19 +go 1.20 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 index 690f982d378..1e0af74e668 100644 --- 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.19 +go 1.20 replace ( go.opentelemetry.io/contrib/detectors/aws/lambda => ../../../../../../detectors/aws/lambda 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 index 64de78f30ec..4fb67c2115c 100644 --- 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.18 +go 1.20 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 index 8ffc7b5bf50..a6c213a9db9 100644 --- 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.19 +go 1.20 require ( github.com/aws/aws-sdk-go-v2 v1.21.0 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 index a47ea93ba12..10db79abe5b 100644 --- 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.19 +go 1.20 require ( github.com/aws/aws-sdk-go-v2 v1.21.0 diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/example/go.mod b/instrumentation/github.com/emicklei/go-restful/otelrestful/example/go.mod index 8ac79640690..5906f69b9ba 100644 --- 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.18 +go 1.20 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 index 55a79f7228a..73c1831fa4c 100644 --- 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.19 +go 1.20 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 index 617fcccf947..d91d9141ec3 100644 --- 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.19 +go 1.20 require ( github.com/emicklei/go-restful/v3 v3.11.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 index 402d732ee45..41ffefe1fab 100644 --- 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.18 +go 1.20 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 index 76500678bc2..adad6b552ab 100644 --- 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.19 +go 1.20 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 index 55f446e4b1e..e1954530a79 100644 --- 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.19 +go 1.20 require ( github.com/gin-gonic/gin v1.9.1 diff --git a/instrumentation/github.com/gorilla/mux/otelmux/example/go.mod b/instrumentation/github.com/gorilla/mux/otelmux/example/go.mod index 72653d55786..5702cec4e11 100644 --- 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.18 +go 1.20 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 index 1f1c3bdfb46..293d7cf572b 100644 --- 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.19 +go 1.20 require ( github.com/felixge/httpsnoop v1.0.3 diff --git a/instrumentation/github.com/gorilla/mux/otelmux/test/go.mod b/instrumentation/github.com/gorilla/mux/otelmux/test/go.mod index e76a229abad..11af49fedae 100644 --- a/instrumentation/github.com/gorilla/mux/otelmux/test/go.mod +++ b/instrumentation/github.com/gorilla/mux/otelmux/test/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux/test -go 1.19 +go 1.20 require ( github.com/gorilla/mux v1.8.0 diff --git a/instrumentation/github.com/labstack/echo/otelecho/example/go.mod b/instrumentation/github.com/labstack/echo/otelecho/example/go.mod index 9e57c740a7d..6622c9d4878 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/example/go.mod +++ b/instrumentation/github.com/labstack/echo/otelecho/example/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho/example -go 1.18 +go 1.20 replace ( go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho => ../ diff --git a/instrumentation/github.com/labstack/echo/otelecho/go.mod b/instrumentation/github.com/labstack/echo/otelecho/go.mod index bb7e85b5930..098181c8609 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/go.mod +++ b/instrumentation/github.com/labstack/echo/otelecho/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho -go 1.19 +go 1.20 replace go.opentelemetry.io/contrib/propagators/b3 => ../../../../../propagators/b3 diff --git a/instrumentation/github.com/labstack/echo/otelecho/test/go.mod b/instrumentation/github.com/labstack/echo/otelecho/test/go.mod index 3e74bf83d0b..a9e25c7398d 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/test/go.mod +++ b/instrumentation/github.com/labstack/echo/otelecho/test/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho/test -go 1.19 +go 1.20 require ( github.com/labstack/echo/v4 v4.11.1 diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod index 654aa50fcd2..eadfbc6eb5b 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo -go 1.19 +go 1.20 require ( go.mongodb.org/mongo-driver v1.12.1 diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod index bd35859b3cc..777cd9e5c63 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod b/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod index 1e89e3371bc..ee2c31dc6c4 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod +++ b/instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/example -go 1.18 +go 1.20 replace go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => ../ diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/go.mod b/instrumentation/google.golang.org/grpc/otelgrpc/go.mod index fb3ed7c6cb8..ec2fda6d333 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/go.mod +++ b/instrumentation/google.golang.org/grpc/otelgrpc/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod b/instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod index 17691b46a12..8c1cd18f1f4 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod +++ b/instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/test -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/instrumentation/gopkg.in/macaron.v1/otelmacaron/example/go.mod b/instrumentation/gopkg.in/macaron.v1/otelmacaron/example/go.mod index fcc19c37124..60d39e64821 100644 --- a/instrumentation/gopkg.in/macaron.v1/otelmacaron/example/go.mod +++ b/instrumentation/gopkg.in/macaron.v1/otelmacaron/example/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron/example -go 1.18 +go 1.20 replace ( go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron => ../ diff --git a/instrumentation/gopkg.in/macaron.v1/otelmacaron/go.mod b/instrumentation/gopkg.in/macaron.v1/otelmacaron/go.mod index c97e776f0de..816b31ebad3 100644 --- a/instrumentation/gopkg.in/macaron.v1/otelmacaron/go.mod +++ b/instrumentation/gopkg.in/macaron.v1/otelmacaron/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron -go 1.19 +go 1.20 replace go.opentelemetry.io/contrib/propagators/b3 => ../../../../propagators/b3 diff --git a/instrumentation/gopkg.in/macaron.v1/otelmacaron/test/go.mod b/instrumentation/gopkg.in/macaron.v1/otelmacaron/test/go.mod index 0e8c7f12f26..da50f2b39ca 100644 --- a/instrumentation/gopkg.in/macaron.v1/otelmacaron/test/go.mod +++ b/instrumentation/gopkg.in/macaron.v1/otelmacaron/test/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron/test -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/instrumentation/host/example/go.mod b/instrumentation/host/example/go.mod index 5d54b586f6d..ad118158974 100644 --- a/instrumentation/host/example/go.mod +++ b/instrumentation/host/example/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/host/example -go 1.18 +go 1.20 replace go.opentelemetry.io/contrib/instrumentation/host => ../ diff --git a/instrumentation/host/go.mod b/instrumentation/host/go.mod index fe77d1b92fa..f2f40a32f2f 100644 --- a/instrumentation/host/go.mod +++ b/instrumentation/host/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/host -go 1.19 +go 1.20 require ( github.com/shirou/gopsutil/v3 v3.23.8 diff --git a/instrumentation/net/http/httptrace/otelhttptrace/example/go.mod b/instrumentation/net/http/httptrace/otelhttptrace/example/go.mod index 93ec369ee69..25e4cfaeaf2 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/example/go.mod +++ b/instrumentation/net/http/httptrace/otelhttptrace/example/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace/example -go 1.18 +go 1.20 replace ( go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace => ../ diff --git a/instrumentation/net/http/httptrace/otelhttptrace/go.mod b/instrumentation/net/http/httptrace/otelhttptrace/go.mod index 641cbc827b5..3b702eb2111 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/go.mod +++ b/instrumentation/net/http/httptrace/otelhttptrace/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace -go 1.19 +go 1.20 require ( github.com/google/go-cmp v0.5.9 diff --git a/instrumentation/net/http/httptrace/otelhttptrace/test/go.mod b/instrumentation/net/http/httptrace/otelhttptrace/test/go.mod index c37c07a0bdb..c8151bbdc54 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/test/go.mod +++ b/instrumentation/net/http/httptrace/otelhttptrace/test/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace/test -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/instrumentation/net/http/otelhttp/example/go.mod b/instrumentation/net/http/otelhttp/example/go.mod index c684447a875..e5cb5987182 100644 --- a/instrumentation/net/http/otelhttp/example/go.mod +++ b/instrumentation/net/http/otelhttp/example/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/example -go 1.18 +go 1.20 replace go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => ../ diff --git a/instrumentation/net/http/otelhttp/go.mod b/instrumentation/net/http/otelhttp/go.mod index f0275e8d3ee..b0cf56542d4 100644 --- a/instrumentation/net/http/otelhttp/go.mod +++ b/instrumentation/net/http/otelhttp/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp -go 1.19 +go 1.20 require ( github.com/felixge/httpsnoop v1.0.3 diff --git a/instrumentation/net/http/otelhttp/test/go.mod b/instrumentation/net/http/otelhttp/test/go.mod index 442f5d0c9df..c6f721bba32 100644 --- a/instrumentation/net/http/otelhttp/test/go.mod +++ b/instrumentation/net/http/otelhttp/test/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/test -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/instrumentation/runtime/example/go.mod b/instrumentation/runtime/example/go.mod index 6c4c1b489bf..080e12231dd 100644 --- a/instrumentation/runtime/example/go.mod +++ b/instrumentation/runtime/example/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/runtime/example -go 1.18 +go 1.20 replace go.opentelemetry.io/contrib/instrumentation/runtime => ../ diff --git a/instrumentation/runtime/go.mod b/instrumentation/runtime/go.mod index 2805dcd5a32..19f3e84105b 100644 --- a/instrumentation/runtime/go.mod +++ b/instrumentation/runtime/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/instrumentation/runtime -go 1.19 +go 1.20 require ( go.opentelemetry.io/otel v1.19.0 diff --git a/propagators/autoprop/go.mod b/propagators/autoprop/go.mod index b91094ca55b..c665bb30f1c 100644 --- a/propagators/autoprop/go.mod +++ b/propagators/autoprop/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/propagators/autoprop -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/propagators/aws/go.mod b/propagators/aws/go.mod index 21818ddff38..58a23d4eef6 100644 --- a/propagators/aws/go.mod +++ b/propagators/aws/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/propagators/aws -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/propagators/b3/go.mod b/propagators/b3/go.mod index b84a1470bc3..55955fd8c06 100644 --- a/propagators/b3/go.mod +++ b/propagators/b3/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/propagators/b3 -go 1.19 +go 1.20 require ( github.com/google/go-cmp v0.5.9 diff --git a/propagators/jaeger/go.mod b/propagators/jaeger/go.mod index 6bb351b241b..34dce75a05a 100644 --- a/propagators/jaeger/go.mod +++ b/propagators/jaeger/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/propagators/jaeger -go 1.19 +go 1.20 require ( github.com/google/go-cmp v0.5.9 diff --git a/propagators/opencensus/examples/go.mod b/propagators/opencensus/examples/go.mod index 1a9793d5fec..27d73f8fd54 100644 --- a/propagators/opencensus/examples/go.mod +++ b/propagators/opencensus/examples/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/propagators/opencensus/examples -go 1.19 +go 1.20 require ( go.opencensus.io v0.24.0 diff --git a/propagators/opencensus/go.mod b/propagators/opencensus/go.mod index 39c43bbf64f..5d0584eb18a 100644 --- a/propagators/opencensus/go.mod +++ b/propagators/opencensus/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/propagators/opencensus -go 1.19 +go 1.20 require ( github.com/google/go-cmp v0.5.9 diff --git a/propagators/ot/go.mod b/propagators/ot/go.mod index c876fe62121..f9e1b8ec600 100644 --- a/propagators/ot/go.mod +++ b/propagators/ot/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/propagators/ot -go 1.19 +go 1.20 require ( github.com/google/go-cmp v0.5.9 diff --git a/samplers/aws/xray/go.mod b/samplers/aws/xray/go.mod index 2ecf5739fdb..282f7487a7e 100644 --- a/samplers/aws/xray/go.mod +++ b/samplers/aws/xray/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/samplers/aws/xray -go 1.19 +go 1.20 require ( github.com/go-logr/logr v1.2.4 diff --git a/samplers/jaegerremote/example/go.mod b/samplers/jaegerremote/example/go.mod index 1d9841252f0..daccd8146dc 100644 --- a/samplers/jaegerremote/example/go.mod +++ b/samplers/jaegerremote/example/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/samplers/jaegerremote/example -go 1.18 +go 1.20 require ( github.com/davecgh/go-spew v1.1.1 diff --git a/samplers/jaegerremote/go.mod b/samplers/jaegerremote/go.mod index daf8aeb4768..3090ea7c87c 100644 --- a/samplers/jaegerremote/go.mod +++ b/samplers/jaegerremote/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/samplers/jaegerremote -go 1.19 +go 1.20 require ( github.com/go-logr/logr v1.2.4 diff --git a/samplers/probability/consistent/go.mod b/samplers/probability/consistent/go.mod index 34ab2dbf9d8..a4d3e288cde 100644 --- a/samplers/probability/consistent/go.mod +++ b/samplers/probability/consistent/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/samplers/probability/consistent -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 diff --git a/tools/go.mod b/tools/go.mod index ca5aa8ba637..f45112ca4fd 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/tools -go 1.19 +go 1.20 exclude github.com/blizzy78/varnamelen v0.6.1 diff --git a/zpages/go.mod b/zpages/go.mod index cda483fb6c7..53dcd9253a2 100644 --- a/zpages/go.mod +++ b/zpages/go.mod @@ -1,6 +1,6 @@ module go.opentelemetry.io/contrib/zpages -go 1.19 +go 1.20 require ( github.com/stretchr/testify v1.8.4 From c3d417ef21db5c959731b69448305d6e3b4d482d Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Fri, 29 Sep 2023 07:50:31 -0700 Subject: [PATCH 2/2] Add change to changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8a9aea6226..710e7a3c99f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Add the new `go.opentelemetry.io/contrib/instrgen` package to provide auto-generated source code instrumentation. (#3068, #3108) - Add `WithSamplingStrategyFetcher` which sets custom fetcher implementation. (#4045) +### Changed + +- Dropped compatibility testing for [Go 1.19]. + The project no longer guarantees support for this version of Go. (#4352) + ### Fixed - Do not panic when the default HTTP round-tripper is not `*http.Transport`. (#4045)