Skip to content

Commit b1e1f96

Browse files
committed
feat: update otel
1 parent 7b858f0 commit b1e1f96

File tree

3 files changed

+12
-13
lines changed

3 files changed

+12
-13
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/uber-go/tally v3.4.3+incompatible
1919
go.etcd.io/bbolt v1.3.6
2020
go.opentelemetry.io/otel v1.14.0
21-
go.opentelemetry.io/otel/metric v0.31.0
21+
go.opentelemetry.io/otel/metric v0.37.0
2222
go.opentelemetry.io/otel/trace v1.14.0
2323
go.uber.org/atomic v1.10.0
2424
go.uber.org/multierr v1.9.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,8 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
495495
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
496496
go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM=
497497
go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU=
498-
go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs=
499-
go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A=
498+
go.opentelemetry.io/otel/metric v0.37.0 h1:pHDQuLQOZwYD+Km0eb657A25NaRzy0a+eLyKfDXedEs=
499+
go.opentelemetry.io/otel/metric v0.37.0/go.mod h1:DmdaHfGt54iV6UKxsV9slj2bBRJcKC1B1uvDLIioc1s=
500500
go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M=
501501
go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8=
502502
go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=

oteltg/middleware.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import (
1010
"go.opentelemetry.io/otel/attribute"
1111
"go.opentelemetry.io/otel/codes"
1212
"go.opentelemetry.io/otel/metric"
13-
"go.opentelemetry.io/otel/metric/instrument/asyncint64"
14-
"go.opentelemetry.io/otel/metric/instrument/syncfloat64"
13+
"go.opentelemetry.io/otel/metric/instrument"
1514
"go.opentelemetry.io/otel/trace"
1615

1716
"github.com/gotd/td/bin"
@@ -22,9 +21,9 @@ import (
2221

2322
// Middleware is prometheus metrics middleware for Telegram.
2423
type Middleware struct {
25-
count asyncint64.Counter
26-
failures asyncint64.Counter
27-
duration syncfloat64.Histogram
24+
count instrument.Int64Counter
25+
failures instrument.Int64Counter
26+
duration instrument.Float64Histogram
2827
tracer trace.Tracer
2928
}
3029

@@ -43,7 +42,7 @@ func (m Middleware) Handle(next tg.Invoker) telegram.InvokeFunc {
4342

4443
ctx, span := m.tracer.Start(ctx, spanName, trace.WithAttributes(attrs...))
4544
defer span.End()
46-
m.count.Observe(ctx, 1, attrs...)
45+
m.count.Add(ctx, 1, attrs...)
4746
start := time.Now()
4847

4948
// Call actual method.
@@ -67,7 +66,7 @@ func (m Middleware) Handle(next tg.Invoker) telegram.InvokeFunc {
6766
}
6867
span.RecordError(err, trace.WithAttributes(errAttrs...))
6968
attrs = append(attrs, errAttrs...)
70-
m.failures.Observe(ctx, 1, attrs...)
69+
m.failures.Add(ctx, 1, attrs...)
7170
} else {
7271
span.SetStatus(codes.Ok, "")
7372
}
@@ -99,13 +98,13 @@ func New(meterProvider metric.MeterProvider, tracerProvider trace.TracerProvider
9998
tracer: tracerProvider.Tracer(name),
10099
}
101100
var err error
102-
if m.count, err = meter.AsyncInt64().Counter("tg.rpc.count"); err != nil {
101+
if m.count, err = meter.Int64Counter("tg.rpc.count"); err != nil {
103102
return nil, err
104103
}
105-
if m.failures, err = meter.AsyncInt64().Counter("tg.rpc.failures"); err != nil {
104+
if m.failures, err = meter.Int64Counter("tg.rpc.failures"); err != nil {
106105
return nil, err
107106
}
108-
if m.duration, err = meter.SyncFloat64().Histogram("tg.rpc.duration"); err != nil {
107+
if m.duration, err = meter.Float64Histogram("tg.rpc.duration"); err != nil {
109108
return nil, err
110109
}
111110
return m, nil

0 commit comments

Comments
 (0)