@@ -11,7 +11,6 @@ import (
1111 "go.opentelemetry.io/otel/attribute"
1212 "go.opentelemetry.io/otel/metric"
1313 "go.opentelemetry.io/otel/metric/instrument"
14- "go.opentelemetry.io/otel/metric/instrument/syncfloat64"
1514)
1615
1716// InstrumentMetrics starts reporting OpenTelemetry Metrics.
@@ -88,39 +87,39 @@ func reportPoolStats(rdb *redis.Client, conf *config) error {
8887 idleAttrs := append (labels , attribute .String ("state" , "idle" ))
8988 usedAttrs := append (labels , attribute .String ("state" , "used" ))
9089
91- idleMax , err := conf .meter .AsyncInt64 (). UpDownCounter (
90+ idleMax , err := conf .meter .Int64ObservableUpDownCounter (
9291 "db.client.connections.idle.max" ,
9392 instrument .WithDescription ("The maximum number of idle open connections allowed" ),
9493 )
9594 if err != nil {
9695 return err
9796 }
9897
99- idleMin , err := conf .meter .AsyncInt64 (). UpDownCounter (
98+ idleMin , err := conf .meter .Int64ObservableUpDownCounter (
10099 "db.client.connections.idle.min" ,
101100 instrument .WithDescription ("The minimum number of idle open connections allowed" ),
102101 )
103102 if err != nil {
104103 return err
105104 }
106105
107- connsMax , err := conf .meter .AsyncInt64 (). UpDownCounter (
106+ connsMax , err := conf .meter .Int64ObservableUpDownCounter (
108107 "db.client.connections.max" ,
109108 instrument .WithDescription ("The maximum number of open connections allowed" ),
110109 )
111110 if err != nil {
112111 return err
113112 }
114113
115- usage , err := conf .meter .AsyncInt64 (). UpDownCounter (
114+ usage , err := conf .meter .Int64ObservableUpDownCounter (
116115 "db.client.connections.usage" ,
117116 instrument .WithDescription ("The number of connections that are currently in state described by the state attribute" ),
118117 )
119118 if err != nil {
120119 return err
121120 }
122121
123- timeouts , err := conf .meter .AsyncInt64 (). UpDownCounter (
122+ timeouts , err := conf .meter .Int64ObservableUpDownCounter (
124123 "db.client.connections.timeouts" ,
125124 instrument .WithDescription ("The number of connection timeouts that have occurred trying to obtain a connection from the pool" ),
126125 )
@@ -129,31 +128,32 @@ func reportPoolStats(rdb *redis.Client, conf *config) error {
129128 }
130129
131130 redisConf := rdb .Options ()
132- return conf .meter .RegisterCallback (
133- []instrument.Asynchronous {
134- idleMax ,
135- idleMin ,
136- connsMax ,
137- usage ,
138- timeouts ,
139- },
140- func (ctx context.Context ) {
131+ _ , err = conf .meter .RegisterCallback (
132+ func (ctx context.Context , o metric.Observer ) error {
141133 stats := rdb .PoolStats ()
142134
143- idleMax . Observe ( ctx , int64 (redisConf .MaxIdleConns ), labels ... )
144- idleMin . Observe ( ctx , int64 (redisConf .MinIdleConns ), labels ... )
145- connsMax . Observe ( ctx , int64 (redisConf .PoolSize ), labels ... )
135+ o . ObserveInt64 ( idleMax , int64 (redisConf .MaxIdleConns ), labels ... )
136+ o . ObserveInt64 ( idleMin , int64 (redisConf .MinIdleConns ), labels ... )
137+ o . ObserveInt64 ( connsMax , int64 (redisConf .PoolSize ), labels ... )
146138
147- usage . Observe ( ctx , int64 (stats .IdleConns ), idleAttrs ... )
148- usage . Observe ( ctx , int64 (stats .TotalConns - stats .IdleConns ), usedAttrs ... )
139+ o . ObserveInt64 ( usage , int64 (stats .IdleConns ), idleAttrs ... )
140+ o . ObserveInt64 ( usage , int64 (stats .TotalConns - stats .IdleConns ), usedAttrs ... )
149141
150- timeouts .Observe (ctx , int64 (stats .Timeouts ), labels ... )
142+ o .ObserveInt64 (timeouts , int64 (stats .Timeouts ), labels ... )
143+ return nil
151144 },
145+ idleMax ,
146+ idleMin ,
147+ connsMax ,
148+ usage ,
149+ timeouts ,
152150 )
151+
152+ return err
153153}
154154
155155func addMetricsHook (rdb * redis.Client , conf * config ) error {
156- createTime , err := conf .meter .SyncFloat64 (). Histogram (
156+ createTime , err := conf .meter .Float64Histogram (
157157 "db.client.connections.create_time" ,
158158 instrument .WithDescription ("The time it took to create a new connection." ),
159159 instrument .WithUnit ("ms" ),
@@ -162,7 +162,7 @@ func addMetricsHook(rdb *redis.Client, conf *config) error {
162162 return err
163163 }
164164
165- useTime , err := conf .meter .SyncFloat64 (). Histogram (
165+ useTime , err := conf .meter .Float64Histogram (
166166 "db.client.connections.use_time" ,
167167 instrument .WithDescription ("The time between borrowing a connection and returning it to the pool." ),
168168 instrument .WithUnit ("ms" ),
@@ -180,8 +180,8 @@ func addMetricsHook(rdb *redis.Client, conf *config) error {
180180}
181181
182182type metricsHook struct {
183- createTime syncfloat64. Histogram
184- useTime syncfloat64. Histogram
183+ createTime instrument. Float64Histogram
184+ useTime instrument. Float64Histogram
185185 attrs []attribute.KeyValue
186186}
187187
0 commit comments