Skip to content

Commit

Permalink
Merge pull request #103 from uptrace/release/v0.2.0
Browse files Browse the repository at this point in the history 
chore: release v0.2.0 (release.sh)
  • Loading branch information
@vmihailenco
vmihailenco authored May 4, 2023
2 parents e200bca + 8de5941 commit e7c12ac
Show file tree
Hide file tree
Showing 33 changed files with 58 additions and 50 deletions.
7 changes: 1 addition & 6 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: [1.18.x, 1.19.x]
go-version: [1.19.x, 1.20.x]

steps:
- name: Set up Go ${{ matrix.go-version }}
Expand All @@ -24,10 +24,5 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2

- name: install golangci-lint
run:
wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh |
sh -s -- -b $(go env GOPATH)/bin v1.45.2

- name: Test
run: ./scripts/test.sh
14 changes: 14 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# [0.2.0](https://github.com/uptrace/opentelemetry-go-extra/compare/v0.1.21...v0.2.0) (2023-05-04)


### chore

* bump otelsql to use opentelemetry-go v1.15.1/v0.38.1 ([cd21a6a](https://github.com/uptrace/opentelemetry-go-extra/commit/cd21a6aef53766ba4413da42efaba2ede86b264b))


### BREAKING CHANGES

* https://github.com/open-telemetry/opentelemetry-go/pull/3971



## [0.1.21](https://github.com/uptrace/opentelemetry-go-extra/compare/v0.1.20...v0.1.21) (2023-02-09)


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 @@ -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.21
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.0
go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego v0.41.1
go.opentelemetry.io/otel/trace v1.15.1
)
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 @@ -6,7 +6,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/labstack/echo/v4 v4.10.2
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.21
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.0
go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.41.1
go.opentelemetry.io/otel/trace v1.15.1
)
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 @@ -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.21
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.0
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.41.1
go.opentelemetry.io/otel/trace v1.15.1
)
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 @@ -6,7 +6,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/gocql/gocql v1.4.0
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.21
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.0
go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql v0.41.1
go.opentelemetry.io/otel v1.15.1
go.opentelemetry.io/otel/trace v1.15.1
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 @@ -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.21
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.0
go.opentelemetry.io/contrib/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache v0.41.1
go.opentelemetry.io/otel v1.15.1
go.opentelemetry.io/otel/trace v1.15.1
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 @@ -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.21
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.0
go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.41.1
go.opentelemetry.io/otel/trace v1.15.1
)
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 @@ -6,7 +6,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelplay => ../../otelplay

require (
github.com/golang/protobuf v1.5.3
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.21
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1
go.opentelemetry.io/otel/trace v1.15.1
google.golang.org/grpc v1.54.0
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 @@ -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.21
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.0
go.mongodb.org/mongo-driver v1.11.4
go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo v0.41.1
go.opentelemetry.io/otel v1.15.1
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 @@ -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.21
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1
go.opentelemetry.io/otel/trace v1.15.1
)
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.1.21"
return "0.2.0"
}
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/otelplay => ../../otelplay
replace github.com/uptrace/uptrace-go/uptrace => ../../uptrace-go

require (
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.1.21
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.2.0
gorm.io/driver/sqlite v1.4.4
gorm.io/gorm v1.24.5
)
Expand All @@ -24,7 +24,7 @@ require (
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // 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.21 // indirect
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.0 // indirect
go.opentelemetry.io/contrib/instrumentation/runtime v0.41.1 // indirect
go.opentelemetry.io/otel/exporters/jaeger v1.15.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.15.0 // indirect
Expand All @@ -43,7 +43,7 @@ require (

require (
github.com/mattn/go-sqlite3 v1.14.16 // indirect
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.21
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.0
github.com/uptrace/uptrace-go v1.15.0 // indirect
go.opentelemetry.io/otel v1.15.1
go.opentelemetry.io/proto/otlp v0.19.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 @@ -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.21
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.0
go.opentelemetry.io/otel v1.15.1
go.opentelemetry.io/otel/trace v1.15.1
gorm.io/gorm v1.24.5
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 @@ -8,7 +8,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelsql => ./../../../otelsql

require (
github.com/stretchr/testify v1.8.2
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.1.21
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.2.0
go.opentelemetry.io/otel v1.15.1
go.opentelemetry.io/otel/sdk v1.15.1
go.opentelemetry.io/otel/trace v1.15.1
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.21 // indirect
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.0 // indirect
go.opentelemetry.io/otel/metric v0.38.1 // indirect
golang.org/x/sys v0.7.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.1.21"
return "0.2.0"
}
6 changes: 3 additions & 3 deletions otelgraphql/example/go.mod
View file
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.21
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.21
github.com/uptrace/opentelemetry-go-extra/otelgraphql v0.2.0
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.0
)

require (
Expand All @@ -21,7 +21,7 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.21 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.0 // indirect
github.com/uptrace/uptrace-go v1.15.0 // indirect
go.opentelemetry.io/contrib v1.16.1 // indirect
go.opentelemetry.io/contrib/instrumentation/runtime v0.41.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 @@ -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.2
github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.21
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.0
go.opentelemetry.io/contrib v1.16.1
go.opentelemetry.io/otel v1.15.1
go.opentelemetry.io/otel/sdk v1.15.1
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.1.21"
return "0.2.0"
}
6 changes: 3 additions & 3 deletions otellogrus/example/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/otelplay => ../../otelplay

require (
github.com/sirupsen/logrus v1.9.0
github.com/uptrace/opentelemetry-go-extra/otellogrus v0.1.21
github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.21
github.com/uptrace/opentelemetry-go-extra/otellogrus v0.2.0
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.0
go.opentelemetry.io/otel v1.15.1
)

Expand All @@ -21,7 +21,7 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.21 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.0 // indirect
github.com/uptrace/uptrace-go v1.15.0 // indirect
go.opentelemetry.io/contrib/instrumentation/runtime v0.41.0 // indirect
go.opentelemetry.io/otel/exporters/jaeger v1.15.1 // 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 @@ -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.2
github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.21
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.0
go.opentelemetry.io/otel v1.15.1
go.opentelemetry.io/otel/sdk v1.15.1
go.opentelemetry.io/otel/trace v1.15.1
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.1.21"
return "0.2.0"
}
4 changes: 2 additions & 2 deletions otelsql/example/go.mod
View file
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.21
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.0
go.opentelemetry.io/otel v1.15.1
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.21
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.0
golang.org/x/tools v0.6.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
View file
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.2
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.21
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.0
go.opentelemetry.io/otel v1.15.1
go.opentelemetry.io/otel/sdk v1.15.1
go.opentelemetry.io/otel/trace v1.15.1
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.1.21"
return "0.2.0"
}
6 changes: 3 additions & 3 deletions otelsqlx/example/go.mod
View file
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.21
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.21
github.com/uptrace/opentelemetry-go-extra/otelsqlx v0.1.21
github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.0
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.0
github.com/uptrace/opentelemetry-go-extra/otelsqlx v0.2.0
go.opentelemetry.io/otel v1.15.1
modernc.org/sqlite v1.20.3
)
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 @@ -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.21
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.0
)

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 @@ -8,8 +8,8 @@ replace github.com/uptrace/opentelemetry-go-extra/otelsql => ../../otelsql

require (
github.com/stretchr/testify v1.8.2
github.com/uptrace/opentelemetry-go-extra/otelsql v0.1.21
github.com/uptrace/opentelemetry-go-extra/otelsqlx v0.1.21
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.0
github.com/uptrace/opentelemetry-go-extra/otelsqlx v0.2.0
go.opentelemetry.io/otel v1.15.1
go.opentelemetry.io/otel/sdk v1.15.1
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 @@ -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.21
github.com/uptrace/opentelemetry-go-extra/otelzap v0.2.0
go.opentelemetry.io/otel v1.15.1
go.uber.org/zap v1.24.0
)

require github.com/uptrace/opentelemetry-go-extra/otelplay v0.1.21
require github.com/uptrace/opentelemetry-go-extra/otelplay v0.2.0

require (
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.21 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.0 // indirect
github.com/uptrace/uptrace-go v1.15.0 // indirect
go.opentelemetry.io/contrib/instrumentation/runtime v0.41.0 // indirect
go.opentelemetry.io/otel/exporters/jaeger v1.15.1 // 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 @@ -6,7 +6,7 @@ replace github.com/uptrace/opentelemetry-go-extra/otelutil => ../otelutil

require (
github.com/stretchr/testify v1.8.2
github.com/uptrace/opentelemetry-go-extra/otelutil v0.1.21
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.0
go.opentelemetry.io/otel v1.15.1
go.opentelemetry.io/otel/sdk v1.15.1
go.opentelemetry.io/otel/trace v1.15.1
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.1.21"
return "0.2.0"
}
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.1.21"
"version": "0.2.0"
}
1 change: 0 additions & 1 deletion scripts/test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@ do
go test ./... -short -race
go test ./... -run=NONE -bench=.
go vet ./...
golangci-lint run
)
done

0 comments on commit e7c12ac

Please sign in to comment.