@@ -2,7 +2,6 @@ use core::fmt;
2
2
use std:: { borrow:: Cow , sync:: Arc } ;
3
3
4
4
use opentelemetry:: {
5
- global,
6
5
metrics:: {
7
6
AsyncInstrumentBuilder , Counter , Gauge , Histogram , HistogramBuilder , InstrumentBuilder ,
8
7
InstrumentProvider , MetricError , MetricResult , ObservableCounter , ObservableGauge ,
@@ -79,7 +78,7 @@ impl SdkMeter {
79
78
name: "InstrumentCreationFailed" ,
80
79
meter_name = self . scope. name. as_ref( ) ,
81
80
instrument_name = builder. name. as_ref( ) ,
82
- message = "Measurements from this counter will be ignored." ,
81
+ message = "Measurements from this Counter will be ignored." ,
83
82
reason = format!( "{}" , err)
84
83
) ;
85
84
return Counter :: new ( Arc :: new ( NoopSyncInstrument :: new ( ) ) ) ;
@@ -101,7 +100,7 @@ impl SdkMeter {
101
100
name: "InstrumentCreationFailed" ,
102
101
meter_name = self . scope. name. as_ref( ) ,
103
102
instrument_name = builder. name. as_ref( ) ,
104
- message = "Measurements from this counter will be ignored." ,
103
+ message = "Measurements from this Counter will be ignored." ,
105
104
reason = format!( "{}" , err)
106
105
) ;
107
106
Counter :: new ( Arc :: new ( NoopSyncInstrument :: new ( ) ) )
@@ -123,7 +122,7 @@ impl SdkMeter {
123
122
name: "InstrumentCreationFailed" ,
124
123
meter_name = self . scope. name. as_ref( ) ,
125
124
instrument_name = builder. name. as_ref( ) ,
126
- message = "Callbacks for this observable counter will not be invoked." ,
125
+ message = "Callbacks for this ObservableCounter will not be invoked." ,
127
126
reason = format!( "{}" , err) ) ;
128
127
return ObservableCounter :: new ( ) ;
129
128
}
@@ -141,7 +140,7 @@ impl SdkMeter {
141
140
name: "InstrumentCreationFailed" ,
142
141
meter_name = self . scope. name. as_ref( ) ,
143
142
instrument_name = builder. name. as_ref( ) ,
144
- message = "Callbacks for this observable counter will not be invoked. Check View Configuration."
143
+ message = "Callbacks for this ObservableCounter will not be invoked. Check View Configuration."
145
144
) ;
146
145
return ObservableCounter :: new ( ) ;
147
146
}
@@ -161,7 +160,7 @@ impl SdkMeter {
161
160
name: "InstrumentCreationFailed" ,
162
161
meter_name = self . scope. name. as_ref( ) ,
163
162
instrument_name = builder. name. as_ref( ) ,
164
- message = "Callbacks for this observable counter will not be invoked." ,
163
+ message = "Callbacks for this ObservableCounter will not be invoked." ,
165
164
reason = format!( "{}" , err) ) ;
166
165
ObservableCounter :: new ( )
167
166
}
@@ -182,7 +181,7 @@ impl SdkMeter {
182
181
name: "InstrumentCreationFailed" ,
183
182
meter_name = self . scope. name. as_ref( ) ,
184
183
instrument_name = builder. name. as_ref( ) ,
185
- message = "Callbacks for this observable updown counter will not be invoked." ,
184
+ message = "Callbacks for this ObservableUpDownCounter will not be invoked." ,
186
185
reason = format!( "{}" , err) ) ;
187
186
return ObservableUpDownCounter :: new ( ) ;
188
187
}
@@ -200,7 +199,7 @@ impl SdkMeter {
200
199
name: "InstrumentCreationFailed" ,
201
200
meter_name = self . scope. name. as_ref( ) ,
202
201
instrument_name = builder. name. as_ref( ) ,
203
- message = "Callbacks for this observable updown counter will not be invoked. Check View Configuration."
202
+ message = "Callbacks for this ObservableUpDownCounter will not be invoked. Check View Configuration."
204
203
) ;
205
204
return ObservableUpDownCounter :: new ( ) ;
206
205
}
@@ -220,7 +219,7 @@ impl SdkMeter {
220
219
name: "InstrumentCreationFailed" ,
221
220
meter_name = self . scope. name. as_ref( ) ,
222
221
instrument_name = builder. name. as_ref( ) ,
223
- message = "Callbacks for this observable updown counter will not be invoked." ,
222
+ message = "Callbacks for this ObservableUpDownCounter will not be invoked." ,
224
223
reason = format!( "{}" , err) ) ;
225
224
ObservableUpDownCounter :: new ( )
226
225
}
@@ -241,7 +240,7 @@ impl SdkMeter {
241
240
name: "InstrumentCreationFailed" ,
242
241
meter_name = self . scope. name. as_ref( ) ,
243
242
instrument_name = builder. name. as_ref( ) ,
244
- message = "Callbacks for this observable gauge will not be invoked." ,
243
+ message = "Callbacks for this ObservableGauge will not be invoked." ,
245
244
reason = format!( "{}" , err) ) ;
246
245
return ObservableGauge :: new ( ) ;
247
246
}
@@ -259,7 +258,7 @@ impl SdkMeter {
259
258
name: "InstrumentCreationFailed" ,
260
259
meter_name = self . scope. name. as_ref( ) ,
261
260
instrument_name = builder. name. as_ref( ) ,
262
- message = "Callbacks for this observable gauge will not be invoked. Check View Configuration."
261
+ message = "Callbacks for this ObservableGauge will not be invoked. Check View Configuration."
263
262
) ;
264
263
return ObservableGauge :: new ( ) ;
265
264
}
@@ -279,7 +278,7 @@ impl SdkMeter {
279
278
name: "InstrumentCreationFailed" ,
280
279
meter_name = self . scope. name. as_ref( ) ,
281
280
instrument_name = builder. name. as_ref( ) ,
282
- message = "Callbacks for this observable gauge will not be invoked." ,
281
+ message = "Callbacks for this ObservableGauge will not be invoked." ,
283
282
reason = format!( "{}" , err) ) ;
284
283
ObservableGauge :: new ( )
285
284
}
@@ -296,14 +295,20 @@ impl SdkMeter {
296
295
{
297
296
let validation_result = validate_instrument_config ( builder. name . as_ref ( ) , & builder. unit ) ;
298
297
if let Err ( err) = validation_result {
299
- global:: handle_error ( err) ;
298
+ otel_error ! (
299
+ name: "InstrumentCreationFailed" ,
300
+ meter_name = self . scope. name. as_ref( ) ,
301
+ instrument_name = builder. name. as_ref( ) ,
302
+ message = "Measurements from this UpDownCounter will be ignored." ,
303
+ reason = format!( "{}" , err)
304
+ ) ;
300
305
return UpDownCounter :: new ( Arc :: new ( NoopSyncInstrument :: new ( ) ) ) ;
301
306
}
302
307
303
308
match resolver
304
309
. lookup (
305
310
InstrumentKind :: UpDownCounter ,
306
- builder. name ,
311
+ builder. name . clone ( ) ,
307
312
builder. description ,
308
313
builder. unit ,
309
314
None ,
@@ -312,7 +317,13 @@ impl SdkMeter {
312
317
{
313
318
Ok ( updown_counter) => updown_counter,
314
319
Err ( err) => {
315
- global:: handle_error ( err) ;
320
+ otel_error ! (
321
+ name: "InstrumentCreationFailed" ,
322
+ meter_name = self . scope. name. as_ref( ) ,
323
+ instrument_name = builder. name. as_ref( ) ,
324
+ message = "Measurements from this UpDownCounter will be ignored." ,
325
+ reason = format!( "{}" , err)
326
+ ) ;
316
327
UpDownCounter :: new ( Arc :: new ( NoopSyncInstrument :: new ( ) ) )
317
328
}
318
329
}
@@ -328,14 +339,20 @@ impl SdkMeter {
328
339
{
329
340
let validation_result = validate_instrument_config ( builder. name . as_ref ( ) , & builder. unit ) ;
330
341
if let Err ( err) = validation_result {
331
- global:: handle_error ( err) ;
342
+ otel_error ! (
343
+ name: "InstrumentCreationFailed" ,
344
+ meter_name = self . scope. name. as_ref( ) ,
345
+ instrument_name = builder. name. as_ref( ) ,
346
+ message = "Measurements from this Gauge will be ignored." ,
347
+ reason = format!( "{}" , err)
348
+ ) ;
332
349
return Gauge :: new ( Arc :: new ( NoopSyncInstrument :: new ( ) ) ) ;
333
350
}
334
351
335
352
match resolver
336
353
. lookup (
337
354
InstrumentKind :: Gauge ,
338
- builder. name ,
355
+ builder. name . clone ( ) ,
339
356
builder. description ,
340
357
builder. unit ,
341
358
None ,
@@ -344,7 +361,13 @@ impl SdkMeter {
344
361
{
345
362
Ok ( gauge) => gauge,
346
363
Err ( err) => {
347
- global:: handle_error ( err) ;
364
+ otel_error ! (
365
+ name: "InstrumentCreationFailed" ,
366
+ meter_name = self . scope. name. as_ref( ) ,
367
+ instrument_name = builder. name. as_ref( ) ,
368
+ message = "Measurements from this Gauge will be ignored." ,
369
+ reason = format!( "{}" , err)
370
+ ) ;
348
371
Gauge :: new ( Arc :: new ( NoopSyncInstrument :: new ( ) ) )
349
372
}
350
373
}
@@ -360,14 +383,20 @@ impl SdkMeter {
360
383
{
361
384
let validation_result = validate_instrument_config ( builder. name . as_ref ( ) , & builder. unit ) ;
362
385
if let Err ( err) = validation_result {
363
- global:: handle_error ( err) ;
386
+ otel_error ! (
387
+ name: "InstrumentCreationFailed" ,
388
+ meter_name = self . scope. name. as_ref( ) ,
389
+ instrument_name = builder. name. as_ref( ) ,
390
+ message = "Measurements from this Histogram will be ignored." ,
391
+ reason = format!( "{}" , err)
392
+ ) ;
364
393
return Histogram :: new ( Arc :: new ( NoopSyncInstrument :: new ( ) ) ) ;
365
394
}
366
395
367
396
match resolver
368
397
. lookup (
369
398
InstrumentKind :: Histogram ,
370
- builder. name ,
399
+ builder. name . clone ( ) ,
371
400
builder. description ,
372
401
builder. unit ,
373
402
builder. boundaries ,
@@ -376,7 +405,13 @@ impl SdkMeter {
376
405
{
377
406
Ok ( histogram) => histogram,
378
407
Err ( err) => {
379
- global:: handle_error ( err) ;
408
+ otel_error ! (
409
+ name: "InstrumentCreationFailed" ,
410
+ meter_name = self . scope. name. as_ref( ) ,
411
+ instrument_name = builder. name. as_ref( ) ,
412
+ message = "Measurements from this Histogram will be ignored." ,
413
+ reason = format!( "{}" , err)
414
+ ) ;
380
415
Histogram :: new ( Arc :: new ( NoopSyncInstrument :: new ( ) ) )
381
416
}
382
417
}
0 commit comments