Skip to content

Commit

Permalink
Merge pull request #122 from uptrace/release/v0.2.4
Browse files Browse the repository at this point in the history 
Release/v0.2.4
  • Loading branch information
@vmihailenco
vmihailenco authored Mar 18, 2024
2 parents 5665e97 + 3519d4b commit 31fd20c
Show file tree
Hide file tree
Showing 32 changed files with 54 additions and 45 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
## [0.2.4](https://github.com/uptrace/opentelemetry-go-extra/compare/v0.2.3...v0.2.4) (2024-03-18)


### Bug Fixes

* **otelsql:** record error and status when SQL returns an error ([1716db5](https://github.com/uptrace/opentelemetry-go-extra/commit/1716db5b3554b0e6c87f8378c2c9a85f33bb6806)), closes [#115](https://github.com/uptrace/opentelemetry-go-extra/issues/115)



## [0.2.3](https://github.com/uptrace/opentelemetry-go-extra/compare/v0.2.2...v0.2.3) (2023-09-27)


Expand Down
2 changes: 1 addition & 1 deletion example/beego/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,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.2.3
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.4
go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego v0.43.0
go.opentelemetry.io/otel/trace v1.24.0
)
Expand Down
2 changes: 1 addition & 1 deletion example/echo/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/labstack/echo/v4 v4.11.4
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.4
go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.49.0
go.opentelemetry.io/otel/trace v1.24.0
)
Expand Down
2 changes: 1 addition & 1 deletion example/gin/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/gin-gonic/gin v1.9.1
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.4
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.49.0
go.opentelemetry.io/otel/trace v1.24.0
)
Expand Down
2 changes: 1 addition & 1 deletion example/gocql/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/gocql/gocql v1.6.0
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.4
go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql v0.43.0
go.opentelemetry.io/otel v1.24.0
go.opentelemetry.io/otel/trace v1.24.0
Expand Down
2 changes: 1 addition & 1 deletion example/gomemcache/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.4
go.opentelemetry.io/contrib/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache v0.43.0
go.opentelemetry.io/otel v1.24.0
go.opentelemetry.io/otel/trace v1.24.0
Expand Down
2 changes: 1 addition & 1 deletion example/gorilla-mux/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/gorilla/mux v1.8.1
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.4
go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.49.0
go.opentelemetry.io/otel/trace v1.24.0
)
Expand Down
2 changes: 1 addition & 1 deletion example/grpc/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/golang/protobuf v1.5.4
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.4
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0
go.opentelemetry.io/otel/trace v1.24.0
google.golang.org/grpc v1.62.1
Expand Down
2 changes: 1 addition & 1 deletion example/mongo-driver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ toolchain go1.22.1
replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.4
go.mongodb.org/mongo-driver v1.14.0
go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo v0.49.0
go.opentelemetry.io/otel v1.24.0
Expand Down
2 changes: 1 addition & 1 deletion example/net-http/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ toolchain go1.22.1
replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.4
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0
go.opentelemetry.io/otel/trace v1.24.0
)
Expand Down
2 changes: 1 addition & 1 deletion instrum-example/version.go
View file
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.2.3"
return "0.2.4"
}
6 changes: 3 additions & 3 deletions otelgorm/example/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,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.2.3
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.2.4
gorm.io/driver/sqlite v1.5.5
gorm.io/gorm v1.25.7
)
Expand All @@ -24,7 +24,7 @@ require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // 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.2.3 // indirect
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.4 // indirect
go.opentelemetry.io/contrib/instrumentation/runtime v0.49.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
Expand All @@ -42,7 +42,7 @@ require (

require (
github.com/mattn/go-sqlite3 v1.14.22 // indirect
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.4
github.com/uptrace/uptrace-go v1.23.1 // indirect
go.opentelemetry.io/otel v1.24.0
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion otelgorm/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ toolchain go1.22.1
replace github.com/uptrace/opentelemetry-go-extra/otelsql => ../otelsql

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

require (
github.com/stretchr/testify v1.8.4
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.2.4
go.opentelemetry.io/otel v1.24.0
go.opentelemetry.io/otel/sdk v1.24.0
go.opentelemetry.io/otel/trace v1.24.0
Expand All @@ -26,7 +26,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.2.3 // indirect
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.4 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
golang.org/x/sys v0.17.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
2 changes: 1 addition & 1 deletion otelgorm/version.go
View file
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.2.3"
return "0.2.4"
}
6 changes: 3 additions & 3 deletions otelgraphql/example/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay
require (
github.com/google/uuid v1.6.0
github.com/graph-gophers/graphql-go v1.5.0
github.com/uptrace/opentelemetry-go-extra/otelgraphql v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelgraphql v0.2.4
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.4
)

require (
Expand All @@ -23,7 +23,7 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.3 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.4 // indirect
github.com/uptrace/uptrace-go v1.23.1 // indirect
go.opentelemetry.io/contrib v1.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/runtime v0.49.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion otelgraphql/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,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.4
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.4
go.opentelemetry.io/contrib v1.24.0
go.opentelemetry.io/otel v1.24.0
go.opentelemetry.io/otel/sdk v1.24.0
Expand Down
2 changes: 1 addition & 1 deletion otelgraphql/version.go
View file
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.2.3"
return "0.2.4"
}
6 changes: 3 additions & 3 deletions otellogrus/example/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/sirupsen/logrus v1.9.3
github.com/uptrace/opentelemetry-go-extra/otellogrus v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.3
github.com/uptrace/opentelemetry-go-extra/otellogrus v0.2.4
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.4
go.opentelemetry.io/otel v1.24.0
)

Expand All @@ -23,7 +23,7 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.3 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.4 // indirect
github.com/uptrace/uptrace-go v1.23.1 // indirect
go.opentelemetry.io/contrib/instrumentation/runtime v0.49.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.24.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion otellogrus/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelutil => ../otelutil
require (
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.8.4
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.4
go.opentelemetry.io/otel v1.24.0
go.opentelemetry.io/otel/sdk v1.24.0
go.opentelemetry.io/otel/trace v1.24.0
Expand Down
2 changes: 1 addition & 1 deletion otellogrus/version.go
View file
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.2.3"
return "0.2.4"
}
4 changes: 2 additions & 2 deletions otelsql/example/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,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.2.3
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.4
go.opentelemetry.io/otel v1.24.0
modernc.org/sqlite v1.29.5
)
Expand Down Expand Up @@ -53,5 +53,5 @@ require (

require (
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.4
)
2 changes: 1 addition & 1 deletion otelsql/internal/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelsql => ../

require (
github.com/stretchr/testify v1.8.4
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.4
go.opentelemetry.io/otel v1.24.0
go.opentelemetry.io/otel/sdk v1.24.0
go.opentelemetry.io/otel/trace v1.24.0
Expand Down
2 changes: 1 addition & 1 deletion otelsql/version.go
View file
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.2.3"
return "0.2.4"
}
6 changes: 3 additions & 3 deletions otelsqlx/example/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,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.2.3
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelsqlx v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.4
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.4
github.com/uptrace/opentelemetry-go-extra/otelsqlx v0.2.4
go.opentelemetry.io/otel v1.24.0
modernc.org/sqlite v1.29.5
)
Expand Down
2 changes: 1 addition & 1 deletion otelsqlx/go.mod
View file
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/jmoiron/sqlx v1.3.5
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.4
)

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

require (
github.com/stretchr/testify v1.8.4
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelsqlx v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.4
github.com/uptrace/opentelemetry-go-extra/otelsqlx v0.2.4
go.opentelemetry.io/otel v1.24.0
go.opentelemetry.io/otel/sdk v1.24.0
modernc.org/sqlite v1.20.3
Expand Down
6 changes: 3 additions & 3 deletions otelzap/example/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,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.2.3
github.com/uptrace/opentelemetry-go-extra/otelzap v0.2.4
go.opentelemetry.io/otel v1.24.0
go.uber.org/zap v1.27.0
)

require github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.3
require github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.4

require (
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.3 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.4 // indirect
github.com/uptrace/uptrace-go v1.23.1 // indirect
go.opentelemetry.io/contrib/instrumentation/runtime v0.49.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.24.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion otelzap/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelutil => ../otelutil

require (
github.com/stretchr/testify v1.8.4
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.3
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.4
go.opentelemetry.io/otel v1.24.0
go.opentelemetry.io/otel/sdk v1.24.0
go.opentelemetry.io/otel/trace v1.24.0
Expand Down
2 changes: 1 addition & 1 deletion otelzap/version.go
View file
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.2.3"
return "0.2.4"
}
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "opentelemetry-go-extra",
"version": "0.2.3"
"version": "0.2.4"
}
4 changes: 2 additions & 2 deletions scripts/release.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ PACKAGE_DIRS=$(find . -mindepth 2 -type f -name 'go.mod' -exec dirname {} \; \
for dir in $PACKAGE_DIRS
do
printf "${dir}: go mod tidy\n"
(cd ./${dir} && go mod tidy -go=1.18)
(cd ./${dir} && go mod tidy -go=1.21)
done

for dir in $PACKAGE_DIRS
Expand All @@ -61,7 +61,7 @@ do
sed --in-place "s/\(return \)\"[^\"]*\"/\1\"${TAG#v}\"/" ${dir}/version.go
fi

(cd ./${dir} && go mod tidy -go=1.18)
(cd ./${dir} && go mod tidy -go=1.21)
done

sed --in-place "s/\(\"version\": \)\"[^\"]*\"/\1\"${TAG#v}\"/" ./package.json
Expand Down

0 comments on commit 31fd20c

Please sign in to comment.