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.

Sign up for GitHub

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

Replace go 1.21 with go 1.22 in go mod #6047

Merged
merged 4 commits into from
Aug 27, 2024
Merged

Replace go 1.21 with go 1.22 in go mod #6047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e78229
Replace go 1.21 with go 1.22 in go mod
XSAM Aug 26, 2024
1b9012e
Update CHANGELOG
XSAM Aug 26, 2024
4801c15
Merge branch 'main' into drop-go-1.21
XSAM Aug 26, 2024
1b9bf12
Merge branch 'main' into drop-go-1.21
XSAM Aug 27, 2024
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

### Removed

- Drop support for [Go 1.21]. (#6046)
- Drop support for [Go 1.21]. (#6046, #6047)

<!-- Released section -->
<!-- Don't change this section unless doing release -->
Expand Down
2 changes: 1 addition & 1 deletion bridges/otellogrus/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/bridges/otellogrus

go 1.21
go 1.22

require (
github.com/sirupsen/logrus v1.9.3
Expand Down
2 changes: 1 addition & 1 deletion bridges/otelslog/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/bridges/otelslog

go 1.21
go 1.22

require (
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion bridges/otelzap/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/bridges/otelzap

go 1.21
go 1.22

require (
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion bridges/prometheus/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/bridges/prometheus

go 1.21
go 1.22

require (
github.com/prometheus/client_golang v1.20.2
Expand Down
2 changes: 1 addition & 1 deletion config/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/config

go 1.21
go 1.22

require (
github.com/prometheus/client_golang v1.20.2
Expand Down
2 changes: 1 addition & 1 deletion detectors/aws/ec2/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/detectors/aws/ec2

go 1.21
go 1.22

require (
github.com/aws/aws-sdk-go v1.55.5
Expand Down
2 changes: 1 addition & 1 deletion detectors/aws/ecs/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/detectors/aws/ecs

go 1.21
go 1.22

require (
github.com/brunoscheufler/aws-ecs-metadata-go v0.0.0-20221221133751-67e37ae746cd
Expand Down
2 changes: 1 addition & 1 deletion detectors/aws/eks/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/detectors/aws/eks

go 1.21
go 1.22

require (
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion detectors/aws/lambda/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/detectors/aws/lambda

go 1.21
go 1.22

require (
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion detectors/azure/azurevm/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/detectors/azure/azurevm

go 1.21
go 1.22

require (
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion detectors/gcp/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/detectors/gcp

go 1.21
go 1.22

require (
cloud.google.com/go/compute/metadata v0.5.0
Expand Down
2 changes: 1 addition & 1 deletion exporters/autoexport/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/exporters/autoexport

go 1.21
go 1.22

require (
github.com/prometheus/client_golang v1.20.2
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module go.opentelemetry.io/contrib

go 1.21
go 1.22
2 changes: 1 addition & 1 deletion instrgen/driver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrgen/driver

go 1.21
go 1.22

replace go.opentelemetry.io/contrib/instrgen => ../

Expand Down
2 changes: 1 addition & 1 deletion instrgen/driver/testdata/interface/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrgen/testdata/interface

go 1.21
go 1.22

replace go.opentelemetry.io/contrib/instrgen => ../../..

Expand Down
2 changes: 1 addition & 1 deletion instrgen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrgen

go 1.21
go 1.22

require (
go.opentelemetry.io/otel v1.29.0
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/aws/aws-lambda-go/otellambda/example/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/example

go 1.21
go 1.22

replace (
go.opentelemetry.io/contrib/detectors/aws/lambda => ../../../../../../detectors/aws/lambda
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/aws/aws-lambda-go/otellambda/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda

go 1.21
go 1.22

require (
github.com/aws/aws-lambda-go v1.47.0
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/aws/aws-lambda-go/otellambda/test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/test

go 1.21
go 1.22

replace (
go.opentelemetry.io/contrib/detectors/aws/lambda => ../../../../../../detectors/aws/lambda
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig

go 1.21
go 1.22

replace (
go.opentelemetry.io/contrib/detectors/aws/lambda => ../../../../../../detectors/aws/lambda
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example

go 1.21
go 1.22

replace go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws => ../

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws

go 1.21
go 1.22

require (
github.com/aws/aws-sdk-go-v2 v1.30.4
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test

go 1.21
go 1.22

require (
github.com/aws/aws-sdk-go-v2 v1.30.4
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/emicklei/go-restful/otelrestful/example/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful/example

go 1.21
go 1.22

replace (
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful => ../
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/emicklei/go-restful/otelrestful/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful

go 1.21
go 1.22

replace go.opentelemetry.io/contrib/propagators/b3 => ../../../../../propagators/b3

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/emicklei/go-restful/otelrestful/test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful/test

go 1.21
go 1.22

require (
github.com/emicklei/go-restful/v3 v3.12.1
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/gin-gonic/gin/otelgin/example/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin/example

go 1.21.0
go 1.22

toolchain go1.23.0

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/gin-gonic/gin/otelgin/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin

go 1.21.0
go 1.22

toolchain go1.23.0

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/gin-gonic/gin/otelgin/test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin/test

go 1.21.0
go 1.22

toolchain go1.23.0

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/gorilla/mux/otelmux/example/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux/example

go 1.21
go 1.22

replace go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux => ../

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/gorilla/mux/otelmux/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux

go 1.21
go 1.22

require (
github.com/felixge/httpsnoop v1.0.4
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/gorilla/mux/otelmux/test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux/test

go 1.21
go 1.22

require (
github.com/gorilla/mux v1.8.1
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/labstack/echo/otelecho/example/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Deprecated: otelecho has no Code Owner.
module go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho/example

go 1.21
go 1.22

replace (
go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho => ../
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/labstack/echo/otelecho/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Deprecated: otelecho has no Code Owner.
module go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho

go 1.21
go 1.22

replace go.opentelemetry.io/contrib/propagators/b3 => ../../../../../propagators/b3

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/github.com/labstack/echo/otelecho/test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Deprecated: otelecho has no Code Owner.
module go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho/test

go 1.21
go 1.22

require (
github.com/labstack/echo/v4 v4.12.0
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo

go 1.21
go 1.22

require (
go.mongodb.org/mongo-driver v1.16.1
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test

go 1.21
go 1.22

require (
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/google.golang.org/grpc/otelgrpc/example/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/example

go 1.21
go 1.22

replace go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => ../

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/google.golang.org/grpc/otelgrpc/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc

go 1.21
go 1.22

require (
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/google.golang.org/grpc/otelgrpc/test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/test

go 1.21
go 1.22

require (
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/gopkg.in/macaron.v1/otelmacaron/example/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Deprecated: otelmacaron has no Code Owner.
module go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron/example

go 1.21
go 1.22

replace (
go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron => ../
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/gopkg.in/macaron.v1/otelmacaron/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Deprecated: otelmacaron has no Code Owner.
module go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron

go 1.21
go 1.22

replace go.opentelemetry.io/contrib/propagators/b3 => ../../../../propagators/b3

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/gopkg.in/macaron.v1/otelmacaron/test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Deprecated: otelmacaron has no Code Owner.
module go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron/test

go 1.21
go 1.22

require (
github.com/stretchr/testify v1.9.0
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/host/example/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/host/example

go 1.21
go 1.22

replace go.opentelemetry.io/contrib/instrumentation/host => ../

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/host/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/host

go 1.21
go 1.22

require (
github.com/shirou/gopsutil/v4 v4.24.7
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/net/http/httptrace/otelhttptrace/example/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace/example

go 1.21
go 1.22

replace (
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace => ../
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/net/http/httptrace/otelhttptrace/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace

go 1.21
go 1.22

require (
github.com/google/go-cmp v0.6.0
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/net/http/httptrace/otelhttptrace/test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace/test

go 1.21
go 1.22

require (
github.com/stretchr/testify v1.9.0
Expand Down
Loading
Loading