diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2023-06-05 10:15:05 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-06-05 10:15:05 +0200 |
| commit | b401bd1ccbce7fa547c75e9f0ae89e211112c1bb (patch) | |
| tree | 08bf9ed438713e8c390ea60732e7dfc14b0d3191 /vendor/github.com/uptrace/bun/extra | |
| 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/extra')
| -rw-r--r-- | vendor/github.com/uptrace/bun/extra/bunotel/otel.go | 14 |
1 files changed, 7 insertions, 7 deletions
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() { |