[chore] update latest deps, ensure readme up to date (#1873)

* [chore] update latest deps, ensure readme up to date

* remove double entry

10 files changed, 49 insertions, 43 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"
 }
diff --git a/vendor/github.com/uptrace/opentelemetry-go-extra/otelsql/otel.go b/vendor/github.com/uptrace/opentelemetry-go-extra/otelsql/otel.go
index 0932e2759..9bd45afbd 100644
--- a/vendor/github.com/uptrace/opentelemetry-go-extra/otelsql/otel.go
+++ b/vendor/github.com/uptrace/opentelemetry-go-extra/otelsql/otel.go
@@ -11,8 +11,6 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/metric"
-	"go.opentelemetry.io/otel/metric/global"
-	"go.opentelemetry.io/otel/metric/instrument"
 	semconv "go.opentelemetry.io/otel/semconv/v1.10.0"
 	"go.opentelemetry.io/otel/trace"
 )
@@ -36,7 +34,7 @@ type config struct {
 func newConfig(opts []Option) *config {
 	c := &config{
 		tracerProvider: otel.GetTracerProvider(),
-		meterProvider:  global.MeterProvider(),
+		meterProvider:  otel.GetMeterProvider(),
 	}
 	for _, opt := range opts {
 		opt(c)
@@ -54,7 +52,7 @@ func (c *config) formatQuery(query string) string {
 type dbInstrum struct {
 	*config
 
-	queryHistogram instrument.Int64Histogram
+	queryHistogram metric.Int64Histogram
 }
 
 func newDBInstrum(opts []Option) *dbInstrum {
@@ -72,8 +70,8 @@ func newDBInstrum(opts []Option) *dbInstrum {
 	var err error
 	t.queryHistogram, err = t.meter.Int64Histogram(
 		"go.sql.query_timing",
-		instrument.WithDescription("Timing of processed queries"),
-		instrument.WithUnit("milliseconds"),
+		metric.WithDescription("Timing of processed queries"),
+		metric.WithUnit("milliseconds"),
 	)
 	if err != nil {
 		panic(err)
@@ -106,7 +104,7 @@ func (t *dbInstrum) withSpan(
 	span.End()
 
 	if query != "" {
-		t.queryHistogram.Record(ctx, time.Since(startTime).Milliseconds(), t.attrs...)
+		t.queryHistogram.Record(ctx, time.Since(startTime).Milliseconds(), metric.WithAttributes(t.attrs...))
 	}
 
 	if !span.IsRecording() {
@@ -185,57 +183,57 @@ func ReportDBStatsMetrics(db *sql.DB, opts ...Option) {
 
 	maxOpenConns, _ := meter.Int64ObservableGauge(
 		"go.sql.connections_max_open",
-		instrument.WithDescription("Maximum number of open connections to the database"),
+		metric.WithDescription("Maximum number of open connections to the database"),
 	)
 	openConns, _ := meter.Int64ObservableGauge(
 		"go.sql.connections_open",
-		instrument.WithDescription("The number of established connections both in use and idle"),
+		metric.WithDescription("The number of established connections both in use and idle"),
 	)
 	inUseConns, _ := meter.Int64ObservableGauge(
 		"go.sql.connections_in_use",
-		instrument.WithDescription("The number of connections currently in use"),
+		metric.WithDescription("The number of connections currently in use"),
 	)
 	idleConns, _ := meter.Int64ObservableGauge(
 		"go.sql.connections_idle",
-		instrument.WithDescription("The number of idle connections"),
+		metric.WithDescription("The number of idle connections"),
 	)
 	connsWaitCount, _ := meter.Int64ObservableCounter(
 		"go.sql.connections_wait_count",
-		instrument.WithDescription("The total number of connections waited for"),
+		metric.WithDescription("The total number of connections waited for"),
 	)
 	connsWaitDuration, _ := meter.Int64ObservableCounter(
 		"go.sql.connections_wait_duration",
-		instrument.WithDescription("The total time blocked waiting for a new connection"),
-		instrument.WithUnit("nanoseconds"),
+		metric.WithDescription("The total time blocked waiting for a new connection"),
+		metric.WithUnit("nanoseconds"),
 	)
 	connsClosedMaxIdle, _ := meter.Int64ObservableCounter(
 		"go.sql.connections_closed_max_idle",
-		instrument.WithDescription("The total number of connections closed due to SetMaxIdleConns"),
+		metric.WithDescription("The total number of connections closed due to SetMaxIdleConns"),
 	)
 	connsClosedMaxIdleTime, _ := meter.Int64ObservableCounter(
 		"go.sql.connections_closed_max_idle_time",
-		instrument.WithDescription("The total number of connections closed due to SetConnMaxIdleTime"),
+		metric.WithDescription("The total number of connections closed due to SetConnMaxIdleTime"),
 	)
 	connsClosedMaxLifetime, _ := meter.Int64ObservableCounter(
 		"go.sql.connections_closed_max_lifetime",
-		instrument.WithDescription("The total number of connections closed due to SetConnMaxLifetime"),
+		metric.WithDescription("The total number of connections closed due to SetConnMaxLifetime"),
 	)
 
 	if _, err := meter.RegisterCallback(
 		func(ctx context.Context, o metric.Observer) error {
 			stats := db.Stats()
 
-			o.ObserveInt64(maxOpenConns, int64(stats.MaxOpenConnections), labels...)
+			o.ObserveInt64(maxOpenConns, int64(stats.MaxOpenConnections), metric.WithAttributes(labels...))
 
-			o.ObserveInt64(openConns, int64(stats.OpenConnections), labels...)
-			o.ObserveInt64(inUseConns, int64(stats.InUse), labels...)
-			o.ObserveInt64(idleConns, int64(stats.Idle), labels...)
+			o.ObserveInt64(openConns, int64(stats.OpenConnections), metric.WithAttributes(labels...))
+			o.ObserveInt64(inUseConns, int64(stats.InUse), metric.WithAttributes(labels...))
+			o.ObserveInt64(idleConns, int64(stats.Idle), metric.WithAttributes(labels...))
 
-			o.ObserveInt64(connsWaitCount, stats.WaitCount, labels...)
-			o.ObserveInt64(connsWaitDuration, int64(stats.WaitDuration), labels...)
-			o.ObserveInt64(connsClosedMaxIdle, stats.MaxIdleClosed, labels...)
-			o.ObserveInt64(connsClosedMaxIdleTime, stats.MaxIdleTimeClosed, labels...)
-			o.ObserveInt64(connsClosedMaxLifetime, stats.MaxLifetimeClosed, labels...)
+			o.ObserveInt64(connsWaitCount, stats.WaitCount, metric.WithAttributes(labels...))
+			o.ObserveInt64(connsWaitDuration, int64(stats.WaitDuration), metric.WithAttributes(labels...))
+			o.ObserveInt64(connsClosedMaxIdle, stats.MaxIdleClosed, metric.WithAttributes(labels...))
+			o.ObserveInt64(connsClosedMaxIdleTime, stats.MaxIdleTimeClosed, metric.WithAttributes(labels...))
+			o.ObserveInt64(connsClosedMaxLifetime, stats.MaxLifetimeClosed, metric.WithAttributes(labels...))
 
 			return nil
 		},
diff --git a/vendor/github.com/uptrace/opentelemetry-go-extra/otelsql/version.go b/vendor/github.com/uptrace/opentelemetry-go-extra/otelsql/version.go
index 97134301d..95cd98269 100644
--- a/vendor/github.com/uptrace/opentelemetry-go-extra/otelsql/version.go
+++ b/vendor/github.com/uptrace/opentelemetry-go-extra/otelsql/version.go
@@ -2,5 +2,5 @@ package otelsql
 
 // Version is the current release version.
 func Version() string {
-	return "0.1.21"
+	return "0.2.1"
 }