Skip to content

Commit 836b2b3

Browse files
djaglowskidjaglowski
committed
Run integration tests with snake case metric names
1 parent 1a1d65a commit 836b2b3

File tree

5 files changed

+132
-94
lines changed

5 files changed

+132
-94
lines changed

‎service/documentation.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66

77
The following telemetry is emitted by this component.
88

9-
### otelcol.connector.consumed.items
9+
### otelcol_connector_consumed_items
1010

1111
Number of items passed to the connector.
1212

1313
| Unit | Metric Type | Value Type | Monotonic |
1414
| ---- | ----------- | ---------- | --------- |
1515
| {item} | Sum | Int | true |
1616

17-
### otelcol.connector.produced.items
17+
### otelcol_connector_produced_items
1818

1919
Number of items emitted from the connector.
2020

2121
| Unit | Metric Type | Value Type | Monotonic |
2222
| ---- | ----------- | ---------- | --------- |
2323
| {item} | Sum | Int | true |
2424

25-
### otelcol.exporter.consumed.items
25+
### otelcol_exporter_consumed_items
2626

2727
Number of items passed to the exporter.
2828

@@ -78,23 +78,23 @@ Uptime of the process [alpha]
7878
| ---- | ----------- | ---------- | --------- |
7979
| s | Sum | Double | true |
8080

81-
### otelcol.processor.consumed.items
81+
### otelcol_processor_consumed_items
8282

8383
Number of items passed to the processor.
8484

8585
| Unit | Metric Type | Value Type | Monotonic |
8686
| ---- | ----------- | ---------- | --------- |
8787
| {item} | Sum | Int | true |
8888

89-
### otelcol.processor.produced.items
89+
### otelcol_processor_produced_items
9090

9191
Number of items emitted from the processor.
9292

9393
| Unit | Metric Type | Value Type | Monotonic |
9494
| ---- | ----------- | ---------- | --------- |
9595
| {item} | Sum | Int | true |
9696

97-
### otelcol.receiver.produced.items
97+
### otelcol_receiver_produced_items
9898

9999
Number of items emitted from the receiver.
100100

‎service/internal/graph/obs_test.go

+54-28
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,8 @@ func TestComponentInstrumentation(t *testing.T) {
196196
attribute.String("otelcol.component.id", "examplereceiver/foo"),
197197
attribute.String("otelcol.signal", "traces"),
198198
): simpleMetricMap{
199-
"otelcol.receiver.produced.items": simpleMetric{
199+
// "otelcol.receiver.produced.items": simpleMetric{
200+
"otelcol_receiver_produced_items": simpleMetric{
200201
attribute.NewSet(
201202
attribute.String("outcome", "success"),
202203
): 5,
@@ -208,12 +209,14 @@ func TestComponentInstrumentation(t *testing.T) {
208209
attribute.String("otelcol.pipeline.id", "traces/in"),
209210
attribute.String("otelcol.signal", "traces"),
210211
): simpleMetricMap{
211-
"otelcol.processor.consumed.items": simpleMetric{
212+
// "otelcol.processor.consumed.items": simpleMetric{
213+
"otelcol_processor_consumed_items": simpleMetric{
212214
attribute.NewSet(
213215
attribute.String("outcome", "success"),
214216
): 5,
215217
},
216-
"otelcol.processor.produced.items": simpleMetric{
218+
// "otelcol.processor.produced.items": simpleMetric{
219+
"otelcol_processor_produced_items": simpleMetric{
217220
attribute.NewSet(
218221
attribute.String("outcome", "success"),
219222
): 5,
@@ -225,12 +228,14 @@ func TestComponentInstrumentation(t *testing.T) {
225228
attribute.String("otelcol.signal", "traces"),
226229
attribute.String("otelcol.signal.output", "traces"),
227230
): simpleMetricMap{
228-
"otelcol.connector.consumed.items": simpleMetric{
231+
// "otelcol.connector.consumed.items": simpleMetric{
232+
"otelcol_connector_consumed_items": simpleMetric{
229233
attribute.NewSet(
230234
attribute.String("outcome", "success"),
231235
): 5,
232236
},
233-
"otelcol.connector.produced.items": simpleMetric{
237+
// "otelcol.connector.produced.items": simpleMetric{
238+
"otelcol_connector_produced_items": simpleMetric{
234239
attribute.NewSet(
235240
attribute.String("outcome", "success"),
236241
attribute.String("otelcol.pipeline.id", "traces/right"),
@@ -246,7 +251,8 @@ func TestComponentInstrumentation(t *testing.T) {
246251
attribute.String("otelcol.component.id", "exampleexporter/right"),
247252
attribute.String("otelcol.signal", "traces"),
248253
): simpleMetricMap{
249-
"otelcol.exporter.consumed.items": simpleMetric{
254+
// "otelcol.exporter.consumed.items": simpleMetric{
255+
"otelcol_exporter_consumed_items": simpleMetric{
250256
attribute.NewSet(
251257
attribute.String("outcome", "success"),
252258
): 3,
@@ -257,7 +263,8 @@ func TestComponentInstrumentation(t *testing.T) {
257263
attribute.String("otelcol.component.id", "exampleexporter/left"),
258264
attribute.String("otelcol.signal", "traces"),
259265
): simpleMetricMap{
260-
"otelcol.exporter.consumed.items": simpleMetric{
266+
// "otelcol.exporter.consumed.items": simpleMetric{
267+
"otelcol_exporter_consumed_items": simpleMetric{
261268
attribute.NewSet(
262269
attribute.String("outcome", "success"),
263270
): 2,
@@ -270,7 +277,8 @@ func TestComponentInstrumentation(t *testing.T) {
270277
attribute.String("otelcol.component.id", "examplereceiver/foo"),
271278
attribute.String("otelcol.signal", "metrics"),
272279
): simpleMetricMap{
273-
"otelcol.receiver.produced.items": simpleMetric{
280+
// "otelcol.receiver.produced.items": simpleMetric{
281+
"otelcol_receiver_produced_items": simpleMetric{
274282
attribute.NewSet(
275283
attribute.String("outcome", "success"),
276284
): 18, // GenerateMetrics(9) produces 18 data points
@@ -282,12 +290,13 @@ func TestComponentInstrumentation(t *testing.T) {
282290
attribute.String("otelcol.pipeline.id", "metrics/in"),
283291
attribute.String("otelcol.signal", "metrics"),
284292
): simpleMetricMap{
285-
"otelcol.processor.consumed.items": simpleMetric{
293+
// "otelcol.processor.consumed.items": simpleMetric{
294+
"otelcol_processor_consumed_items": simpleMetric{
286295
attribute.NewSet(
287296
attribute.String("outcome", "success"),
288297
): 18, // GenerateMetrics(9) produces 18 data points
289298
},
290-
"otelcol.processor.produced.items": simpleMetric{
299+
"otelcol_processor_produced_items": simpleMetric{
291300
attribute.NewSet(
292301
attribute.String("outcome", "success"),
293302
): 18, // GenerateMetrics(9) produces 18 data points
@@ -299,12 +308,14 @@ func TestComponentInstrumentation(t *testing.T) {
299308
attribute.String("otelcol.signal", "metrics"),
300309
attribute.String("otelcol.signal.output", "metrics"),
301310
): simpleMetricMap{
302-
"otelcol.connector.consumed.items": simpleMetric{
311+
// "otelcol.connector.consumed.items": simpleMetric{
312+
"otelcol_connector_consumed_items": simpleMetric{
303313
attribute.NewSet(
304314
attribute.String("outcome", "success"),
305315
): 18, // GenerateMetrics(9) produces 18 data points
306316
},
307-
"otelcol.connector.produced.items": simpleMetric{
317+
// "otelcol.connector.produced.items": simpleMetric{
318+
"otelcol_connector_produced_items": simpleMetric{
308319
attribute.NewSet(
309320
attribute.String("outcome", "success"),
310321
attribute.String("otelcol.pipeline.id", "metrics/right"),
@@ -320,7 +331,8 @@ func TestComponentInstrumentation(t *testing.T) {
320331
attribute.String("otelcol.component.id", "exampleexporter/right"),
321332
attribute.String("otelcol.signal", "metrics"),
322333
): simpleMetricMap{
323-
"otelcol.exporter.consumed.items": simpleMetric{
334+
// "otelcol.exporter.consumed.items": simpleMetric{
335+
"otelcol_exporter_consumed_items": simpleMetric{
324336
attribute.NewSet(
325337
attribute.String("outcome", "success"),
326338
): 10, // GenerateMetrics(5) produces 10 data points
@@ -331,7 +343,8 @@ func TestComponentInstrumentation(t *testing.T) {
331343
attribute.String("otelcol.component.id", "exampleexporter/left"),
332344
attribute.String("otelcol.signal", "metrics"),
333345
): simpleMetricMap{
334-
"otelcol.exporter.consumed.items": simpleMetric{
346+
// "otelcol.exporter.consumed.items": simpleMetric{
347+
"otelcol_exporter_consumed_items": simpleMetric{
335348
attribute.NewSet(
336349
attribute.String("outcome", "success"),
337350
): 8, // GenerateMetrics(4) produces 8 data points
@@ -344,7 +357,8 @@ func TestComponentInstrumentation(t *testing.T) {
344357
attribute.String("otelcol.component.id", "examplereceiver/foo"),
345358
attribute.String("otelcol.signal", "logs"),
346359
): simpleMetricMap{
347-
"otelcol.receiver.produced.items": simpleMetric{
360+
// "otelcol.receiver.produced.items": simpleMetric{
361+
"otelcol_receiver_produced_items": simpleMetric{
348362
attribute.NewSet(
349363
attribute.String("outcome", "success"),
350364
): 13,
@@ -356,12 +370,13 @@ func TestComponentInstrumentation(t *testing.T) {
356370
attribute.String("otelcol.pipeline.id", "logs/in"),
357371
attribute.String("otelcol.signal", "logs"),
358372
): simpleMetricMap{
359-
"otelcol.processor.consumed.items": simpleMetric{
373+
// "otelcol.processor.consumed.items": simpleMetric{
374+
"otelcol_processor_consumed_items": simpleMetric{
360375
attribute.NewSet(
361376
attribute.String("outcome", "success"),
362377
): 13,
363378
},
364-
"otelcol.processor.produced.items": simpleMetric{
379+
"otelcol_processor_produced_items": simpleMetric{
365380
attribute.NewSet(
366381
attribute.String("outcome", "success"),
367382
): 13,
@@ -373,12 +388,14 @@ func TestComponentInstrumentation(t *testing.T) {
373388
attribute.String("otelcol.signal", "logs"),
374389
attribute.String("otelcol.signal.output", "logs"),
375390
): simpleMetricMap{
376-
"otelcol.connector.consumed.items": simpleMetric{
391+
// "otelcol.connector.consumed.items": simpleMetric{
392+
"otelcol_connector_consumed_items": simpleMetric{
377393
attribute.NewSet(
378394
attribute.String("outcome", "success"),
379395
): 13,
380396
},
381-
"otelcol.connector.produced.items": simpleMetric{
397+
// "otelcol.connector.produced.items": simpleMetric{
398+
"otelcol_connector_produced_items": simpleMetric{
382399
attribute.NewSet(
383400
attribute.String("outcome", "success"),
384401
attribute.String("otelcol.pipeline.id", "logs/right"),
@@ -394,7 +411,8 @@ func TestComponentInstrumentation(t *testing.T) {
394411
attribute.String("otelcol.component.id", "exampleexporter/right"),
395412
attribute.String("otelcol.signal", "logs"),
396413
): simpleMetricMap{
397-
"otelcol.exporter.consumed.items": simpleMetric{
414+
// "otelcol.exporter.consumed.items": simpleMetric{
415+
"otelcol_exporter_consumed_items": simpleMetric{
398416
attribute.NewSet(
399417
attribute.String("outcome", "success"),
400418
): 7,
@@ -405,7 +423,8 @@ func TestComponentInstrumentation(t *testing.T) {
405423
attribute.String("otelcol.component.id", "exampleexporter/left"),
406424
attribute.String("otelcol.signal", "logs"),
407425
): simpleMetricMap{
408-
"otelcol.exporter.consumed.items": simpleMetric{
426+
// "otelcol.exporter.consumed.items": simpleMetric{
427+
"otelcol_exporter_consumed_items": simpleMetric{
409428
attribute.NewSet(
410429
attribute.String("outcome", "success"),
411430
): 6,
@@ -418,7 +437,8 @@ func TestComponentInstrumentation(t *testing.T) {
418437
attribute.String("otelcol.component.id", "examplereceiver/foo"),
419438
attribute.String("otelcol.signal", "profiles"),
420439
): simpleMetricMap{
421-
"otelcol.receiver.produced.items": simpleMetric{
440+
// "otelcol.receiver.produced.items": simpleMetric{
441+
"otelcol_receiver_produced_items": simpleMetric{
422442
attribute.NewSet(
423443
attribute.String("outcome", "success"),
424444
): 17,
@@ -430,12 +450,14 @@ func TestComponentInstrumentation(t *testing.T) {
430450
attribute.String("otelcol.pipeline.id", "profiles/in"),
431451
attribute.String("otelcol.signal", "profiles"),
432452
): simpleMetricMap{
433-
"otelcol.processor.consumed.items": simpleMetric{
453+
// "otelcol.processor.consumed.items": simpleMetric{
454+
"otelcol_processor_consumed_items": simpleMetric{
434455
attribute.NewSet(
435456
attribute.String("outcome", "success"),
436457
): 17,
437458
},
438-
"otelcol.processor.produced.items": simpleMetric{
459+
// "otelcol.processor.produced.items": simpleMetric{
460+
"otelcol_processor_produced_items": simpleMetric{
439461
attribute.NewSet(
440462
attribute.String("outcome", "success"),
441463
): 17,
@@ -447,12 +469,14 @@ func TestComponentInstrumentation(t *testing.T) {
447469
attribute.String("otelcol.signal", "profiles"),
448470
attribute.String("otelcol.signal.output", "profiles"),
449471
): simpleMetricMap{
450-
"otelcol.connector.consumed.items": simpleMetric{
472+
// "otelcol.connector.consumed.items": simpleMetric{
473+
"otelcol_connector_consumed_items": simpleMetric{
451474
attribute.NewSet(
452475
attribute.String("outcome", "success"),
453476
): 17,
454477
},
455-
"otelcol.connector.produced.items": simpleMetric{
478+
// "otelcol.connector.produced.items": simpleMetric{
479+
"otelcol_connector_produced_items": simpleMetric{
456480
attribute.NewSet(
457481
attribute.String("outcome", "success"),
458482
attribute.String("otelcol.pipeline.id", "profiles/right"),
@@ -468,7 +492,8 @@ func TestComponentInstrumentation(t *testing.T) {
468492
attribute.String("otelcol.component.id", "exampleexporter/right"),
469493
attribute.String("otelcol.signal", "profiles"),
470494
): simpleMetricMap{
471-
"otelcol.exporter.consumed.items": simpleMetric{
495+
// "otelcol.exporter.consumed.items": simpleMetric{
496+
"otelcol_exporter_consumed_items": simpleMetric{
472497
attribute.NewSet(
473498
attribute.String("outcome", "success"),
474499
): 9,
@@ -479,7 +504,8 @@ func TestComponentInstrumentation(t *testing.T) {
479504
attribute.String("otelcol.component.id", "exampleexporter/left"),
480505
attribute.String("otelcol.signal", "profiles"),
481506
): simpleMetricMap{
482-
"otelcol.exporter.consumed.items": simpleMetric{
507+
// "otelcol.exporter.consumed.items": simpleMetric{
508+
"otelcol_exporter_consumed_items": simpleMetric{
483509
attribute.NewSet(
484510
attribute.String("outcome", "success"),
485511
): 8,

‎service/internal/metadata/generated_telemetry.go

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)