Skip to content

Commit

Permalink
Merge pull request #93 from uptrace/release/v0.1.20
Browse files Browse the repository at this point in the history
Release/v0.1.20
  • Loading branch information
vmihailenco authored Feb 1, 2023
2 parents 79862c2 + 50bbb2a commit b7f6881
Show file tree
Hide file tree
Showing 33 changed files with 58 additions and 45 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## [0.1.20](https://github.com/uptrace/opentelemetry-go-extra/compare/v0.1.19...v0.1.20) (2023-02-01)



## [0.1.19](https://github.com/uptrace/opentelemetry-go-extra/compare/v0.1.18...v0.1.19) (2023-01-31)


Expand Down
2 changes: 1 addition & 1 deletion example/beego/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/astaxie/beego v1.12.3
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.20
go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego v0.38.0
go.opentelemetry.io/otel/trace v1.12.0
)
Expand Down
2 changes: 1 addition & 1 deletion example/echo/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/labstack/echo/v4 v4.10.0
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.20
go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.38.0
go.opentelemetry.io/otel/trace v1.12.0
)
Expand Down
2 changes: 1 addition & 1 deletion example/gin/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/gin-gonic/gin v1.8.2
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.20
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.38.0
go.opentelemetry.io/otel/trace v1.12.0
)
Expand Down
2 changes: 1 addition & 1 deletion example/gocql/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/gocql/gocql v1.3.1
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.20
go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql v0.38.0
go.opentelemetry.io/otel v1.12.0
go.opentelemetry.io/otel/trace v1.12.0
Expand Down
2 changes: 1 addition & 1 deletion example/gomemcache/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/bradfitz/gomemcache v0.0.0-20230124162541-5f7a7d875746
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.20
go.opentelemetry.io/contrib/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache v0.38.0
go.opentelemetry.io/otel v1.12.0
go.opentelemetry.io/otel/trace v1.12.0
Expand Down
2 changes: 1 addition & 1 deletion example/gorilla-mux/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/gorilla/mux v1.8.0
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.20
go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.38.0
go.opentelemetry.io/otel/trace v1.12.0
)
Expand Down
2 changes: 1 addition & 1 deletion example/grpc/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/golang/protobuf v1.5.2
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.20
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.26.0
go.opentelemetry.io/otel/trace v1.12.0
google.golang.org/grpc v1.52.3
Expand Down
2 changes: 1 addition & 1 deletion example/mongo-driver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.18
replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.20
go.mongodb.org/mongo-driver v1.11.1
go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo v0.38.0
go.opentelemetry.io/otel v1.12.0
Expand Down
2 changes: 1 addition & 1 deletion example/net-http/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.18
replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.20
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.38.0
go.opentelemetry.io/otel/trace v1.12.0
)
Expand Down
2 changes: 1 addition & 1 deletion instrum-example/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ package otelpackage

// Version is the current release version.
func Version() string {
return "0.1.19"
return "0.1.20"
}
6 changes: 3 additions & 3 deletions otelgorm/example/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelgorm => ./..
replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.1.20
gorm.io/driver/sqlite v1.4.4
gorm.io/gorm v1.24.3
)
Expand All @@ -22,7 +22,7 @@ require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.19 // indirect
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.20 // indirect
go.opentelemetry.io/contrib/instrumentation/runtime v0.38.0 // indirect
go.opentelemetry.io/otel/exporters/jaeger v1.12.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.12.0 // indirect
Expand All @@ -41,7 +41,7 @@ require (

require (
github.com/mattn/go-sqlite3 v1.14.16 // indirect
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.20
github.com/uptrace/uptrace-go v1.12.0 // indirect
go.opentelemetry.io/otel v1.12.0
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion otelgorm/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.18
replace github.com/uptrace/opentelemetry-go-extra/otelsql => ../otelsql

require (
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.20
go.opentelemetry.io/otel v1.12.0
go.opentelemetry.io/otel/trace v1.12.0
gorm.io/gorm v1.24.3
Expand Down
4 changes: 2 additions & 2 deletions otelgorm/internal/e2etest/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelsql => ./../../../otelsql

require (
github.com/stretchr/testify v1.8.1
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.1.20
go.opentelemetry.io/otel v1.12.0
go.opentelemetry.io/otel/sdk v1.0.1
go.opentelemetry.io/otel/trace v1.12.0
Expand All @@ -24,7 +24,7 @@ require (
github.com/jinzhu/now v1.1.5 // indirect
github.com/mattn/go-sqlite3 v1.14.15 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.19 // indirect
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.20 // indirect
go.opentelemetry.io/otel/metric v0.35.0 // indirect
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
2 changes: 1 addition & 1 deletion otelgorm/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ package otelgorm

// Version is the current release version.
func Version() string {
return "0.1.19"
return "0.1.20"
}
6 changes: 3 additions & 3 deletions otelgraphql/example/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay
require (
github.com/google/uuid v1.3.0
github.com/graph-gophers/graphql-go v1.5.0
github.com/uptrace/opentelemetry-go-extra/otelgraphql v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelgraphql v0.1.20
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.20
)

require (
Expand All @@ -21,7 +21,7 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.19 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.20 // indirect
github.com/uptrace/uptrace-go v1.12.0 // indirect
go.opentelemetry.io/contrib v1.13.0 // indirect
go.opentelemetry.io/contrib/instrumentation/runtime v0.38.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion otelgraphql/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelutil => ../otelutil
require (
github.com/graph-gophers/graphql-go v1.5.0
github.com/stretchr/testify v1.8.1
github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.20
go.opentelemetry.io/contrib v1.13.0
go.opentelemetry.io/otel v1.12.0
go.opentelemetry.io/otel/sdk v1.1.0
Expand Down
2 changes: 1 addition & 1 deletion otelgraphql/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ package otelgraphql

// Version is the current release version.
func Version() string {
return "0.1.19"
return "0.1.20"
}
6 changes: 3 additions & 3 deletions otellogrus/example/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/sirupsen/logrus v1.9.0
github.com/uptrace/opentelemetry-go-extra/otellogrus v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.19
github.com/uptrace/opentelemetry-go-extra/otellogrus v0.1.20
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.20
go.opentelemetry.io/otel v1.12.0
)

Expand All @@ -21,7 +21,7 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.19 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.20 // indirect
github.com/uptrace/uptrace-go v1.12.0 // indirect
go.opentelemetry.io/contrib/instrumentation/runtime v0.38.0 // indirect
go.opentelemetry.io/otel/exporters/jaeger v1.12.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion otellogrus/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelutil => ../otelutil
require (
github.com/sirupsen/logrus v1.9.0
github.com/stretchr/testify v1.8.1
github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.20
go.opentelemetry.io/otel v1.12.0
go.opentelemetry.io/otel/sdk v1.0.1
go.opentelemetry.io/otel/trace v1.12.0
Expand Down
2 changes: 1 addition & 1 deletion otellogrus/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ package otellogrus

// Version is the current release version.
func Version() string {
return "0.1.19"
return "0.1.20"
}
4 changes: 2 additions & 2 deletions otelsql/example/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelsql => ./..
replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.20
go.opentelemetry.io/otel v1.12.0
modernc.org/sqlite v1.20.3
)
Expand Down Expand Up @@ -54,7 +54,7 @@ require (

require (
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.20
golang.org/x/tools v0.5.0 // indirect
lukechampine.com/uint128 v1.2.0 // indirect
modernc.org/ccgo/v3 v3.16.13 // indirect
Expand Down
2 changes: 1 addition & 1 deletion otelsql/internal/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelsql => ../

require (
github.com/stretchr/testify v1.8.1
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.20
go.opentelemetry.io/otel v1.12.0
go.opentelemetry.io/otel/sdk v1.0.1
go.opentelemetry.io/otel/trace v1.12.0
Expand Down
9 changes: 9 additions & 0 deletions otelsql/otel.go
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,15 @@ func ReportDBStatsMetrics(db *sql.DB, opts ...Option) {

return nil
},
maxOpenConns,
openConns,
inUseConns,
idleConns,
connsWaitCount,
connsWaitDuration,
connsClosedMaxIdle,
connsClosedMaxIdleTime,
connsClosedMaxLifetime,
); err != nil {
panic(err)
}
Expand Down
2 changes: 1 addition & 1 deletion otelsql/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ package otelsql

// Version is the current release version.
func Version() string {
return "0.1.19"
return "0.1.20"
}
6 changes: 3 additions & 3 deletions otelsqlx/example/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ replace github.com/uptrace/opentelemetry-go-extra/otelsql => ../../otelsql
replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelsqlx v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.20
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.20
github.com/uptrace/opentelemetry-go-extra/otelsqlx v0.1.20
go.opentelemetry.io/otel v1.12.0
modernc.org/sqlite v1.20.3
)
Expand Down
2 changes: 1 addition & 1 deletion otelsqlx/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelsql => ../otelsql

require (
github.com/jmoiron/sqlx v1.3.5
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.20
)

require (
Expand Down
4 changes: 2 additions & 2 deletions otelsqlx/internal/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ replace github.com/uptrace/opentelemetry-go-extra/otelsql => ../../otelsql

require (
github.com/stretchr/testify v1.8.1
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelsqlx v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.20
github.com/uptrace/opentelemetry-go-extra/otelsqlx v0.1.20
go.opentelemetry.io/otel v1.12.0
go.opentelemetry.io/otel/sdk v1.0.1
modernc.org/sqlite v1.13.3
Expand Down
6 changes: 3 additions & 3 deletions otelzap/example/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ replace github.com/uptrace/opentelemetry-go-extra/otelutil => ../../otelutil
replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/uptrace/opentelemetry-go-extra/otelzap v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelzap v0.1.20
go.opentelemetry.io/otel v1.12.0
go.uber.org/zap v1.24.0
)

require github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.19
require github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.20

require (
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.19 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.20 // indirect
github.com/uptrace/uptrace-go v1.12.0 // indirect
go.opentelemetry.io/contrib/instrumentation/runtime v0.38.0 // indirect
go.opentelemetry.io/otel/exporters/jaeger v1.12.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion otelzap/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelutil => ../otelutil

require (
github.com/stretchr/testify v1.8.1
github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.19
github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.20
go.opentelemetry.io/otel v1.12.0
go.opentelemetry.io/otel/sdk v1.0.1
go.opentelemetry.io/otel/trace v1.12.0
Expand Down
2 changes: 1 addition & 1 deletion otelzap/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ package otelzap

// Version is the current release version.
func Version() string {
return "0.1.19"
return "0.1.20"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "opentelemetry-go-extra",
"version": "0.1.19"
"version": "0.1.20"
}
4 changes: 2 additions & 2 deletions scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ PACKAGE_DIRS=$(find . -mindepth 2 -type f -name 'go.mod' -exec dirname {} \; \

for dir in $PACKAGE_DIRS
do
printf "${dir}: go get -u && go mod tidy\n"
(cd ./${dir} && go get -u && go mod tidy -go=1.18)
printf "${dir}: go mod tidy\n"
(cd ./${dir} && go mod tidy -go=1.18)
done

for dir in $PACKAGE_DIRS
Expand Down

0 comments on commit b7f6881

Please sign in to comment.