diff options
author | 2023-06-05 10:15:05 +0200 | |
---|---|---|
committer | 2023-06-05 10:15:05 +0200 | |
commit | b401bd1ccbce7fa547c75e9f0ae89e211112c1bb (patch) | |
tree | 08bf9ed438713e8c390ea60732e7dfc14b0d3191 /vendor/github.com/uptrace/bun | |
parent | [chore]: Bump github.com/minio/minio-go/v7 from 7.0.55 to 7.0.56 (#1869) (diff) | |
download | gotosocial-b401bd1ccbce7fa547c75e9f0ae89e211112c1bb.tar.xz |
[chore] update latest deps, ensure readme up to date (#1873)
* [chore] update latest deps, ensure readme up to date
* remove double entry
Diffstat (limited to 'vendor/github.com/uptrace/bun')
-rw-r--r-- | vendor/github.com/uptrace/bun/CHANGELOG.md | 9 | ||||
-rw-r--r-- | vendor/github.com/uptrace/bun/Makefile | 3 | ||||
-rw-r--r-- | vendor/github.com/uptrace/bun/dialect/pgdialect/version.go | 2 | ||||
-rw-r--r-- | vendor/github.com/uptrace/bun/dialect/sqlitedialect/version.go | 2 | ||||
-rw-r--r-- | vendor/github.com/uptrace/bun/extra/bunotel/otel.go | 14 | ||||
-rw-r--r-- | vendor/github.com/uptrace/bun/migrate/migrator.go | 6 | ||||
-rw-r--r-- | vendor/github.com/uptrace/bun/package.json | 2 | ||||
-rw-r--r-- | vendor/github.com/uptrace/bun/version.go | 2 |
8 files changed, 24 insertions, 16 deletions
diff --git a/vendor/github.com/uptrace/bun/CHANGELOG.md b/vendor/github.com/uptrace/bun/CHANGELOG.md index 89a473b5e..6280b3165 100644 --- a/vendor/github.com/uptrace/bun/CHANGELOG.md +++ b/vendor/github.com/uptrace/bun/CHANGELOG.md @@ -1,3 +1,12 @@ +## [1.1.14](https://github.com/uptrace/bun/compare/v1.1.13...v1.1.14) (2023-05-24) + + +### Bug Fixes + +* enable CompositeIn for MySQL ([9f377b5](https://github.com/uptrace/bun/commit/9f377b5e744cb38ef4aadd61213855c009e47354)) + + + ## [1.1.13](https://github.com/uptrace/bun/compare/v1.1.12...v1.1.13) (2023-05-06) diff --git a/vendor/github.com/uptrace/bun/Makefile b/vendor/github.com/uptrace/bun/Makefile index 4961a8abf..96980314f 100644 --- a/vendor/github.com/uptrace/bun/Makefile +++ b/vendor/github.com/uptrace/bun/Makefile @@ -11,12 +11,11 @@ test: done go_mod_tidy: - go get -u && go mod tidy -go=1.18 set -e; for dir in $(ALL_GO_MOD_DIRS); do \ echo "go mod tidy in $${dir}"; \ (cd "$${dir}" && \ go get -u ./... && \ - go mod tidy -go=1.18); \ + go mod tidy -go=1.19); \ done fmt: diff --git a/vendor/github.com/uptrace/bun/dialect/pgdialect/version.go b/vendor/github.com/uptrace/bun/dialect/pgdialect/version.go index af2e0959f..2f7abbf6a 100644 --- a/vendor/github.com/uptrace/bun/dialect/pgdialect/version.go +++ b/vendor/github.com/uptrace/bun/dialect/pgdialect/version.go @@ -2,5 +2,5 @@ package pgdialect // Version is the current release version. func Version() string { - return "1.1.13" + return "1.1.14" } diff --git a/vendor/github.com/uptrace/bun/dialect/sqlitedialect/version.go b/vendor/github.com/uptrace/bun/dialect/sqlitedialect/version.go index aa3ed46f3..af7cebc89 100644 --- a/vendor/github.com/uptrace/bun/dialect/sqlitedialect/version.go +++ b/vendor/github.com/uptrace/bun/dialect/sqlitedialect/version.go @@ -2,5 +2,5 @@ package sqlitedialect // Version is the current release version. func Version() string { - return "1.1.13" + return "1.1.14" } diff --git a/vendor/github.com/uptrace/bun/extra/bunotel/otel.go b/vendor/github.com/uptrace/bun/extra/bunotel/otel.go index 25000307d..b9737b0bc 100644 --- a/vendor/github.com/uptrace/bun/extra/bunotel/otel.go +++ b/vendor/github.com/uptrace/bun/extra/bunotel/otel.go @@ -10,9 +10,8 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" - "go.opentelemetry.io/otel/metric/global" - "go.opentelemetry.io/otel/metric/instrument" - semconv "go.opentelemetry.io/otel/semconv/v1.12.0" + "go.opentelemetry.io/otel/metric" + semconv "go.opentelemetry.io/otel/semconv/v1.20.0" "go.opentelemetry.io/otel/trace" "github.com/uptrace/bun" @@ -23,12 +22,12 @@ import ( var ( tracer = otel.Tracer("github.com/uptrace/bun") - meter = global.Meter("github.com/uptrace/bun") + meter = otel.Meter("github.com/uptrace/bun") queryHistogram, _ = meter.Int64Histogram( "go.sql.query_timing", - instrument.WithDescription("Timing of processed queries"), - instrument.WithUnit("milliseconds"), + metric.WithDescription("Timing of processed queries"), + metric.WithUnit("milliseconds"), ) ) @@ -75,7 +74,8 @@ func (h *QueryHook) AfterQuery(ctx context.Context, event *bun.QueryEvent) { } } - queryHistogram.Record(ctx, time.Since(event.StartTime).Milliseconds(), labels...) + dur := time.Since(event.StartTime) + queryHistogram.Record(ctx, dur.Milliseconds(), metric.WithAttributes(labels...)) span := trace.SpanFromContext(ctx) if !span.IsRecording() { diff --git a/vendor/github.com/uptrace/bun/migrate/migrator.go b/vendor/github.com/uptrace/bun/migrate/migrator.go index 5cae6ccb9..ddf5485c0 100644 --- a/vendor/github.com/uptrace/bun/migrate/migrator.go +++ b/vendor/github.com/uptrace/bun/migrate/migrator.go @@ -4,7 +4,7 @@ import ( "context" "errors" "fmt" - "io/ioutil" + "os" "path/filepath" "regexp" "time" @@ -255,7 +255,7 @@ func (m *Migrator) CreateGoMigration( fpath := filepath.Join(m.migrations.getDirectory(), fname) content := fmt.Sprintf(cfg.goTemplate, cfg.packageName) - if err := ioutil.WriteFile(fpath, []byte(content), 0o644); err != nil { + if err := os.WriteFile(fpath, []byte(content), 0o644); err != nil { return nil, err } @@ -290,7 +290,7 @@ func (m *Migrator) CreateSQLMigrations(ctx context.Context, name string) ([]*Mig func (m *Migrator) createSQL(ctx context.Context, fname string) (*MigrationFile, error) { fpath := filepath.Join(m.migrations.getDirectory(), fname) - if err := ioutil.WriteFile(fpath, []byte(sqlTemplate), 0o644); err != nil { + if err := os.WriteFile(fpath, []byte(sqlTemplate), 0o644); err != nil { return nil, err } diff --git a/vendor/github.com/uptrace/bun/package.json b/vendor/github.com/uptrace/bun/package.json index 37f67cd1a..8398427c6 100644 --- a/vendor/github.com/uptrace/bun/package.json +++ b/vendor/github.com/uptrace/bun/package.json @@ -1,6 +1,6 @@ { "name": "gobun", - "version": "1.1.13", + "version": "1.1.14", "main": "index.js", "repository": "git@github.com:uptrace/bun.git", "author": "Vladimir Mihailenco <vladimir.webdev@gmail.com>", diff --git a/vendor/github.com/uptrace/bun/version.go b/vendor/github.com/uptrace/bun/version.go index 790925f67..a92db5c7b 100644 --- a/vendor/github.com/uptrace/bun/version.go +++ b/vendor/github.com/uptrace/bun/version.go @@ -2,5 +2,5 @@ package bun // Version is the current release version. func Version() string { - return "1.1.13" + return "1.1.14" } |