Skip to content

Commit 01be2e5

Browse files
yordisyordis
committed
feat(acp-nats): align metrics with OTEL SemConv naming (#32)
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
1 parent 1e2a8f6 commit 01be2e5

File tree

11 files changed

+183
-70
lines changed

11 files changed

+183
-70
lines changed

‎rsworkspace/crates/acp-nats/src/agent/authenticate.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ mod tests {
102102
.flat_map(|rm| rm.scope_metrics())
103103
.any(|sm| {
104104
sm.metrics().any(|metric| {
105-
if metric.name() != "acp.request.count" {
105+
if metric.name() != "acp.requests" {
106106
return false;
107107
}
108108
let data = metric.data();
@@ -126,7 +126,7 @@ mod tests {
126126
});
127127
assert!(
128128
found,
129-
"expected acp.request.count datapoint with method=authenticate, success={}",
129+
"expected acp.requests datapoint with method=authenticate, success={}",
130130
expected_success
131131
);
132132
}

‎rsworkspace/crates/acp-nats/src/agent/cancel.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ mod tests {
126126
.iter()
127127
.flat_map(|rm| rm.scope_metrics())
128128
.flat_map(|sm| sm.metrics())
129-
.find(|m| m.name() == "acp.request.count")
129+
.find(|m| m.name() == "acp.requests")
130130
.and_then(|metric| {
131131
let data = metric.data();
132132
if let AggregatedMetrics::U64(MetricData::Sum(s)) = data {
@@ -160,7 +160,7 @@ mod tests {
160160
.iter()
161161
.flat_map(|rm| rm.scope_metrics())
162162
.flat_map(|sm| sm.metrics())
163-
.find(|m| m.name() == "acp.errors.total")
163+
.find(|m| m.name() == "acp.errors")
164164
.and_then(|metric| {
165165
let data = metric.data();
166166
if let AggregatedMetrics::U64(MetricData::Sum(s)) = data {
@@ -222,11 +222,11 @@ mod tests {
222222
let finished_metrics = exporter.get_finished_metrics().unwrap();
223223
assert!(
224224
has_request_metric(&finished_metrics, "cancel", false),
225-
"expected acp.request.count with method=cancel, success=false on validation failure"
225+
"expected acp.requests with method=cancel, success=false on validation failure"
226226
);
227227
assert!(
228228
has_error_metric(&finished_metrics, "cancel", "invalid_session_id"),
229-
"expected acp.errors.total with operation=cancel, reason=invalid_session_id"
229+
"expected acp.errors with operation=cancel, reason=invalid_session_id"
230230
);
231231
provider.shutdown().unwrap();
232232
}
@@ -241,7 +241,7 @@ mod tests {
241241
let finished_metrics = exporter.get_finished_metrics().unwrap();
242242
assert!(
243243
has_request_metric(&finished_metrics, "cancel", true),
244-
"expected acp.request.count with method=cancel, success=true"
244+
"expected acp.requests with method=cancel, success=true"
245245
);
246246
provider.shutdown().unwrap();
247247
}
@@ -257,7 +257,7 @@ mod tests {
257257
let finished_metrics = exporter.get_finished_metrics().unwrap();
258258
assert!(
259259
has_error_metric(&finished_metrics, "cancel", "cancel_publish_failed"),
260-
"expected acp.errors.total with operation=cancel, reason=cancel_publish_failed"
260+
"expected acp.errors with operation=cancel, reason=cancel_publish_failed"
261261
);
262262
assert!(
263263
has_request_metric(&finished_metrics, "cancel", false),
@@ -275,7 +275,7 @@ mod tests {
275275
let provider = SdkMeterProvider::builder().with_reader(reader).build();
276276
let meter = provider.meter("test");
277277
let histogram = meter
278-
.f64_histogram("acp.request.count")
278+
.f64_histogram("acp.requests")
279279
.with_description("test")
280280
.build();
281281
histogram.record(1.0, &[]);
@@ -294,7 +294,7 @@ mod tests {
294294
let provider = SdkMeterProvider::builder().with_reader(reader).build();
295295
let meter = provider.meter("test");
296296
let histogram = meter
297-
.f64_histogram("acp.errors.total")
297+
.f64_histogram("acp.errors")
298298
.with_description("test")
299299
.build();
300300
histogram.record(1.0, &[]);

‎rsworkspace/crates/acp-nats/src/agent/ext_method.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ mod tests {
166166
.iter()
167167
.flat_map(|rm| rm.scope_metrics())
168168
.flat_map(|sm| sm.metrics())
169-
.find(|m| m.name() == "acp.request.count")
169+
.find(|m| m.name() == "acp.requests")
170170
.and_then(|metric| {
171171
let data = metric.data();
172172
if let AggregatedMetrics::U64(MetricData::Sum(s)) = data {
@@ -200,7 +200,7 @@ mod tests {
200200
.iter()
201201
.flat_map(|rm| rm.scope_metrics())
202202
.flat_map(|sm| sm.metrics())
203-
.find(|m| m.name() == "acp.errors.total")
203+
.find(|m| m.name() == "acp.errors")
204204
.and_then(|metric| {
205205
let data = metric.data();
206206
if let AggregatedMetrics::U64(MetricData::Sum(s)) = data {
@@ -286,11 +286,11 @@ mod tests {
286286
let finished_metrics = exporter.get_finished_metrics().unwrap();
287287
assert!(
288288
has_error_metric(&finished_metrics, "ext_method", "invalid_method_name"),
289-
"expected acp.errors.total with operation=ext_method, reason=invalid_method_name"
289+
"expected acp.errors with operation=ext_method, reason=invalid_method_name"
290290
);
291291
assert!(
292292
has_request_metric(&finished_metrics, "ext_method", false),
293-
"expected acp.request.count with method=ext_method, success=false on validation failure"
293+
"expected acp.requests with method=ext_method, success=false on validation failure"
294294
);
295295
provider.shutdown().unwrap();
296296
}
@@ -314,7 +314,7 @@ mod tests {
314314
let finished_metrics = exporter.get_finished_metrics().unwrap();
315315
assert!(
316316
has_request_metric(&finished_metrics, "ext_method", true),
317-
"expected acp.request.count with method=ext_method, success=true"
317+
"expected acp.requests with method=ext_method, success=true"
318318
);
319319
provider.shutdown().unwrap();
320320
}
@@ -333,7 +333,7 @@ mod tests {
333333
let finished_metrics = exporter.get_finished_metrics().unwrap();
334334
assert!(
335335
has_request_metric(&finished_metrics, "ext_method", false),
336-
"expected acp.request.count with method=ext_method, success=false"
336+
"expected acp.requests with method=ext_method, success=false"
337337
);
338338
provider.shutdown().unwrap();
339339
}
@@ -347,7 +347,7 @@ mod tests {
347347
let provider = SdkMeterProvider::builder().with_reader(reader).build();
348348
let meter = provider.meter("test");
349349
let histogram = meter
350-
.f64_histogram("acp.request.count")
350+
.f64_histogram("acp.requests")
351351
.with_description("test")
352352
.build();
353353
histogram.record(1.0, &[]);
@@ -366,7 +366,7 @@ mod tests {
366366
let provider = SdkMeterProvider::builder().with_reader(reader).build();
367367
let meter = provider.meter("test");
368368
let histogram = meter
369-
.f64_histogram("acp.errors.total")
369+
.f64_histogram("acp.errors")
370370
.with_description("test")
371371
.build();
372372
histogram.record(1.0, &[]);

‎rsworkspace/crates/acp-nats/src/agent/ext_notification.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ mod tests {
131131
.iter()
132132
.flat_map(|rm| rm.scope_metrics())
133133
.flat_map(|sm| sm.metrics())
134-
.find(|m| m.name() == "acp.request.count")
134+
.find(|m| m.name() == "acp.requests")
135135
.and_then(|metric| {
136136
let data = metric.data();
137137
if let AggregatedMetrics::U64(MetricData::Sum(s)) = data {
@@ -165,7 +165,7 @@ mod tests {
165165
.iter()
166166
.flat_map(|rm| rm.scope_metrics())
167167
.flat_map(|sm| sm.metrics())
168-
.find(|m| m.name() == "acp.errors.total")
168+
.find(|m| m.name() == "acp.errors")
169169
.and_then(|metric| {
170170
let data = metric.data();
171171
if let AggregatedMetrics::U64(MetricData::Sum(s)) = data {
@@ -234,11 +234,11 @@ mod tests {
234234
let finished_metrics = exporter.get_finished_metrics().unwrap();
235235
assert!(
236236
has_request_metric(&finished_metrics, "ext_notification", false),
237-
"expected acp.request.count with method=ext_notification, success=false on validation failure"
237+
"expected acp.requests with method=ext_notification, success=false on validation failure"
238238
);
239239
assert!(
240240
has_error_metric(&finished_metrics, "ext_notification", "invalid_method_name"),
241-
"expected acp.errors.total with operation=ext_notification, reason=invalid_method_name"
241+
"expected acp.errors with operation=ext_notification, reason=invalid_method_name"
242242
);
243243
provider.shutdown().unwrap();
244244
}
@@ -258,7 +258,7 @@ mod tests {
258258
let finished_metrics = exporter.get_finished_metrics().unwrap();
259259
assert!(
260260
has_request_metric(&finished_metrics, "ext_notification", true),
261-
"expected acp.request.count with method=ext_notification, success=true"
261+
"expected acp.requests with method=ext_notification, success=true"
262262
);
263263
provider.shutdown().unwrap();
264264
}
@@ -295,7 +295,7 @@ mod tests {
295295
"ext_notification",
296296
"ext_notification_publish_failed"
297297
),
298-
"expected acp.errors.total with operation=ext_notification, reason=ext_notification_publish_failed"
298+
"expected acp.errors with operation=ext_notification, reason=ext_notification_publish_failed"
299299
);
300300
assert!(
301301
has_request_metric(&finished_metrics, "ext_notification", true),
@@ -313,7 +313,7 @@ mod tests {
313313
let provider = SdkMeterProvider::builder().with_reader(reader).build();
314314
let meter = provider.meter("test");
315315
let histogram = meter
316-
.f64_histogram("acp.request.count")
316+
.f64_histogram("acp.requests")
317317
.with_description("test")
318318
.build();
319319
histogram.record(1.0, &[]);
@@ -336,7 +336,7 @@ mod tests {
336336
let provider = SdkMeterProvider::builder().with_reader(reader).build();
337337
let meter = provider.meter("test");
338338
let histogram = meter
339-
.f64_histogram("acp.errors.total")
339+
.f64_histogram("acp.errors")
340340
.with_description("test")
341341
.build();
342342
histogram.record(1.0, &[]);

‎rsworkspace/crates/acp-nats/src/agent/initialize.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ mod tests {
109109
.flat_map(|rm| rm.scope_metrics())
110110
.any(|sm| {
111111
sm.metrics().any(|metric| {
112-
if metric.name() != "acp.request.count" {
112+
if metric.name() != "acp.requests" {
113113
return false;
114114
}
115115
let data = metric.data();
@@ -133,7 +133,7 @@ mod tests {
133133
});
134134
assert!(
135135
found,
136-
"expected acp.request.count datapoint with method=initialize, success={}",
136+
"expected acp.requests datapoint with method=initialize, success={}",
137137
expected_success
138138
);
139139
}

‎rsworkspace/crates/acp-nats/src/agent/load_session.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ mod tests {
161161
.iter()
162162
.flat_map(|rm| rm.scope_metrics())
163163
.flat_map(|sm| sm.metrics())
164-
.find(|m| m.name() == "acp.errors.total")
164+
.find(|m| m.name() == "acp.errors")
165165
.and_then(|metric| {
166166
let data = metric.data();
167167
if let AggregatedMetrics::U64(MetricData::Sum(s)) = data {
@@ -192,7 +192,7 @@ mod tests {
192192
) {
193193
assert!(
194194
has_session_ready_error_metric(finished_metrics),
195-
"expected acp.errors.total datapoint with operation=session_ready, reason=session_ready_publish_failed"
195+
"expected acp.errors datapoint with operation=session_ready, reason=session_ready_publish_failed"
196196
);
197197
}
198198

@@ -204,7 +204,7 @@ mod tests {
204204
.iter()
205205
.flat_map(|rm| rm.scope_metrics())
206206
.flat_map(|sm| sm.metrics())
207-
.find(|m| m.name() == "acp.request.count")
207+
.find(|m| m.name() == "acp.requests")
208208
.and_then(|metric| {
209209
let data = metric.data();
210210
if let AggregatedMetrics::U64(MetricData::Sum(s)) = data {
@@ -235,7 +235,7 @@ mod tests {
235235
) {
236236
assert!(
237237
has_load_session_metric(finished_metrics, expected_success),
238-
"expected acp.request.count datapoint with method=load_session, success={}",
238+
"expected acp.requests datapoint with method=load_session, success={}",
239239
expected_success
240240
);
241241
}
@@ -415,7 +415,7 @@ mod tests {
415415
let provider = SdkMeterProvider::builder().with_reader(reader).build();
416416
let meter = provider.meter("test");
417417
let histogram = meter
418-
.f64_histogram("acp.errors.total")
418+
.f64_histogram("acp.errors")
419419
.with_description("test")
420420
.build();
421421
histogram.record(1.0, &[]);
@@ -434,7 +434,7 @@ mod tests {
434434
let provider = SdkMeterProvider::builder().with_reader(reader).build();
435435
let meter = provider.meter("test");
436436
let histogram = meter
437-
.f64_histogram("acp.request.count")
437+
.f64_histogram("acp.requests")
438438
.with_description("test")
439439
.build();
440440
histogram.record(1.0, &[]);

‎rsworkspace/crates/acp-nats/src/agent/new_session.rs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ pub async fn handle<N: RequestClient + PublishClient + FlushClient, C: GetElapse
8282
Span::current().record("session_id", response.session_id.to_string().as_str());
8383
info!(session_id = %response.session_id, "Session created");
8484

85+
bridge.metrics.record_session_created();
86+
8587
let nats = bridge.nats.clone();
8688
let prefix = bridge.config.acp_prefix.clone();
8789
let session_id = response.session_id.clone();
@@ -155,7 +157,7 @@ mod tests {
155157
.iter()
156158
.flat_map(|rm| rm.scope_metrics())
157159
.flat_map(|sm| sm.metrics())
158-
.find(|m| m.name() == "acp.errors.total")
160+
.find(|m| m.name() == "acp.errors")
159161
.and_then(|metric| {
160162
let data = metric.data();
161163
if let AggregatedMetrics::U64(MetricData::Sum(s)) = data {
@@ -186,7 +188,7 @@ mod tests {
186188
) {
187189
assert!(
188190
has_session_ready_error_metric(finished_metrics),
189-
"expected acp.errors.total datapoint with operation=session_ready, reason=session_ready_publish_failed"
191+
"expected acp.errors datapoint with operation=session_ready, reason=session_ready_publish_failed"
190192
);
191193
}
192194

@@ -198,7 +200,7 @@ mod tests {
198200
.iter()
199201
.flat_map(|rm| rm.scope_metrics())
200202
.flat_map(|sm| sm.metrics())
201-
.find(|m| m.name() == "acp.request.count")
203+
.find(|m| m.name() == "acp.requests")
202204
.and_then(|metric| {
203205
let data = metric.data();
204206
if let AggregatedMetrics::U64(MetricData::Sum(s)) = data {
@@ -229,7 +231,7 @@ mod tests {
229231
) {
230232
assert!(
231233
has_new_session_metric(finished_metrics, expected_success),
232-
"expected acp.request.count datapoint with method=new_session, success={}",
234+
"expected acp.requests datapoint with method=new_session, success={}",
233235
expected_success
234236
);
235237
}
@@ -402,7 +404,7 @@ mod tests {
402404
let provider = SdkMeterProvider::builder().with_reader(reader).build();
403405
let meter = provider.meter("test");
404406
let histogram = meter
405-
.f64_histogram("acp.errors.total")
407+
.f64_histogram("acp.errors")
406408
.with_description("test")
407409
.build();
408410
histogram.record(1.0, &[]);
@@ -421,7 +423,7 @@ mod tests {
421423
let provider = SdkMeterProvider::builder().with_reader(reader).build();
422424
let meter = provider.meter("test");
423425
let histogram = meter
424-
.f64_histogram("acp.request.count")
426+
.f64_histogram("acp.requests")
425427
.with_description("test")
426428
.build();
427429
histogram.record(1.0, &[]);

0 commit comments

Comments
 (0)