Skip to content

Commit d37279d

Browse files
codebotencodeboten
committed
update many more metrics
Signed-off-by: Alex Boten <[email protected]>
1 parent aa93753 commit d37279d

File tree

11 files changed

+98
-98
lines changed

11 files changed

+98
-98
lines changed

‎component/componenttest/otelprometheuschecker.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ type prometheusChecker struct {
2525
func (pc *prometheusChecker) checkScraperMetrics(receiver component.ID, scraper component.ID, scrapedMetricPoints, erroredMetricPoints int64) error {
2626
scraperAttrs := attributesForScraperMetrics(receiver, scraper)
2727
return multierr.Combine(
28-
pc.checkCounter("scraper_scraped_metric_points", scrapedMetricPoints, scraperAttrs),
29-
pc.checkCounter("scraper_errored_metric_points", erroredMetricPoints, scraperAttrs))
28+
pc.checkCounter("otelcol_scraper_scraped_metric_points", scrapedMetricPoints, scraperAttrs),
29+
pc.checkCounter("otelcol_scraper_errored_metric_points", erroredMetricPoints, scraperAttrs))
3030
}
3131

3232
func (pc *prometheusChecker) checkReceiverTraces(receiver component.ID, protocol string, accepted, dropped int64) error {
@@ -44,8 +44,8 @@ func (pc *prometheusChecker) checkReceiverMetrics(receiver component.ID, protoco
4444
func (pc *prometheusChecker) checkReceiver(receiver component.ID, datatype, protocol string, acceptedMetricPoints, droppedMetricPoints int64) error {
4545
receiverAttrs := attributesForReceiverMetrics(receiver, protocol)
4646
return multierr.Combine(
47-
pc.checkCounter(fmt.Sprintf("receiver_accepted_%s", datatype), acceptedMetricPoints, receiverAttrs),
48-
pc.checkCounter(fmt.Sprintf("receiver_refused_%s", datatype), droppedMetricPoints, receiverAttrs))
47+
pc.checkCounter(fmt.Sprintf("otelcol_receiver_accepted_%s", datatype), acceptedMetricPoints, receiverAttrs),
48+
pc.checkCounter(fmt.Sprintf("otelcol_receiver_refused_%s", datatype), droppedMetricPoints, receiverAttrs))
4949
}
5050

5151
func (pc *prometheusChecker) checkProcessorTraces(processor component.ID, accepted, refused, dropped int64) error {
@@ -63,9 +63,9 @@ func (pc *prometheusChecker) checkProcessorLogs(processor component.ID, accepted
6363
func (pc *prometheusChecker) checkProcessor(processor component.ID, datatype string, accepted, refused, dropped int64) error {
6464
processorAttrs := attributesForProcessorMetrics(processor)
6565
return multierr.Combine(
66-
pc.checkCounter(fmt.Sprintf("processor_accepted_%s", datatype), accepted, processorAttrs),
67-
pc.checkCounter(fmt.Sprintf("processor_refused_%s", datatype), refused, processorAttrs),
68-
pc.checkCounter(fmt.Sprintf("processor_dropped_%s", datatype), dropped, processorAttrs))
66+
pc.checkCounter(fmt.Sprintf("otelcol_processor_accepted_%s", datatype), accepted, processorAttrs),
67+
pc.checkCounter(fmt.Sprintf("otelcol_processor_refused_%s", datatype), refused, processorAttrs),
68+
pc.checkCounter(fmt.Sprintf("otelcol_processor_dropped_%s", datatype), dropped, processorAttrs))
6969
}
7070

7171
func (pc *prometheusChecker) checkExporterTraces(exporter component.ID, sent, sendFailed int64) error {
@@ -82,10 +82,10 @@ func (pc *prometheusChecker) checkExporterMetrics(exporter component.ID, sent, s
8282

8383
func (pc *prometheusChecker) checkExporter(exporter component.ID, datatype string, sent, sendFailed int64) error {
8484
exporterAttrs := attributesForExporterMetrics(exporter)
85-
errs := pc.checkCounter(fmt.Sprintf("exporter_sent_%s", datatype), sent, exporterAttrs)
85+
errs := pc.checkCounter(fmt.Sprintf("otelcol_exporter_sent_%s", datatype), sent, exporterAttrs)
8686
if sendFailed > 0 {
8787
errs = multierr.Append(errs,
88-
pc.checkCounter(fmt.Sprintf("exporter_send_failed_%s", datatype), sendFailed, exporterAttrs))
88+
pc.checkCounter(fmt.Sprintf("otelcol_exporter_send_failed_%s", datatype), sendFailed, exporterAttrs))
8989
}
9090
return errs
9191
}
@@ -95,7 +95,7 @@ func (pc *prometheusChecker) checkExporterEnqueueFailed(exporter component.ID, d
9595
return nil
9696
}
9797
exporterAttrs := attributesForExporterMetrics(exporter)
98-
return pc.checkCounter(fmt.Sprintf("exporter_enqueue_failed_%s", datatype), enqueueFailed, exporterAttrs)
98+
return pc.checkCounter(fmt.Sprintf("otelcol_exporter_enqueue_failed_%s", datatype), enqueueFailed, exporterAttrs)
9999
}
100100

101101
func (pc *prometheusChecker) checkExporterMetricGauge(exporter component.ID, metric string, val int64) error {

‎component/componenttest/otelprometheuschecker_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ func TestPromChecker(t *testing.T) {
4343
transport := "fakeTransport"
4444

4545
assert.NoError(t,
46-
pc.checkCounter("receiver_accepted_spans", 42, []attribute.KeyValue{attribute.String("receiver", receiver.String()), attribute.String("transport", transport)}),
46+
pc.checkCounter("otelcol_receiver_accepted_spans", 42, []attribute.KeyValue{attribute.String("receiver", receiver.String()), attribute.String("transport", transport)}),
4747
"correct assertion should return no error",
4848
)
4949

5050
assert.Error(t,
51-
pc.checkCounter("receiver_accepted_spans", 15, []attribute.KeyValue{attribute.String("receiver", receiver.String()), attribute.String("transport", transport)}),
51+
pc.checkCounter("otelcol_receiver_accepted_spans", 15, []attribute.KeyValue{attribute.String("receiver", receiver.String()), attribute.String("transport", transport)}),
5252
"invalid value should return error",
5353
)
5454

@@ -58,7 +58,7 @@ func TestPromChecker(t *testing.T) {
5858
)
5959

6060
assert.Error(t,
61-
pc.checkCounter("receiver_accepted_spans", 42, []attribute.KeyValue{attribute.String("receiver", "notFakeReceiver"), attribute.String("transport", transport)}),
61+
pc.checkCounter("otelcol_receiver_accepted_spans", 42, []attribute.KeyValue{attribute.String("receiver", "notFakeReceiver"), attribute.String("transport", transport)}),
6262
"invalid attributes should return error",
6363
)
6464

‎component/componenttest/testdata/prometheus_response‎

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,72 @@
1-
# HELP exporter_send_failed_spans Number of spans in failed attempts to send to destination.
2-
# TYPE exporter_send_failed_spans counter
3-
exporter_send_failed_spans{exporter="fakeExporter"} 14
4-
# HELP exporter_sent_spans Number of spans successfully sent to destination.
5-
# TYPE exporter_sent_spans counter
6-
exporter_sent_spans{exporter="fakeExporter"} 43
7-
# HELP exporter_send_failed_metric_points Number of metrics in failed attempts to send to destination.
8-
# TYPE exporter_send_failed_metric_points counter
9-
exporter_send_failed_metric_points{exporter="fakeExporter"} 42
10-
# HELP exporter_sent_metric_points Number of metrics successfully sent to destination.
11-
# TYPE exporter_sent_metric_points counter
12-
exporter_sent_metric_points{exporter="fakeExporter"} 8
13-
# HELP exporter_send_failed_log_records Number of logs in failed attempts to send to destination.
14-
# TYPE exporter_send_failed_log_records counter
15-
exporter_send_failed_log_records{exporter="fakeExporter"} 36
16-
# HELP exporter_sent_log_records Number of logs successfully sent to destination.
17-
# TYPE exporter_sent_log_records counter
18-
exporter_sent_log_records{exporter="fakeExporter"} 103
19-
# HELP processor_accepted_spans Number of spans successfully pushed into the next component in the pipeline.
20-
# TYPE processor_accepted_spans counter
21-
processor_accepted_spans{processor="fakeProcessor"} 42
22-
# HELP processor_refused_spans Number of spans that were rejected by the next component in the pipeline.
23-
# TYPE processor_refused_spans counter
24-
processor_refused_spans{processor="fakeProcessor"} 13
25-
# HELP processor_dropped_spans Number of spans that were dropped.
26-
# TYPE processor_dropped_spans counter
27-
processor_dropped_spans{processor="fakeProcessor"} 7
28-
# HELP processor_accepted_metric_points Number of metric points successfully pushed into the next component in the pipeline.
29-
# TYPE processor_accepted_metric_points counter
30-
processor_accepted_metric_points{processor="fakeProcessor"} 7
31-
# HELP processor_refused_metric_points Number of metric points that were rejected by the next component in the pipeline.
32-
# TYPE processor_refused_metric_points counter
33-
processor_refused_metric_points{processor="fakeProcessor"} 41
34-
# HELP processor_dropped_metric_points Number of metric points that were dropped.
35-
# TYPE processor_dropped_metric_points counter
36-
processor_dropped_metric_points{processor="fakeProcessor"} 13
37-
# HELP processor_accepted_log_records Number of log records successfully pushed into the next component in the pipeline.
38-
# TYPE processor_accepted_log_records counter
39-
processor_accepted_log_records{processor="fakeProcessor"} 102
40-
# HELP processor_refused_log_records Number of log records that were rejected by the next component in the pipeline.
41-
# TYPE processor_refused_log_records counter
42-
processor_refused_log_records{processor="fakeProcessor"} 35
43-
# HELP processor_dropped_log_records Number of log records that were dropped.
44-
# TYPE processor_dropped_log_records counter
45-
processor_dropped_log_records{processor="fakeProcessor"} 14
46-
# HELP receiver_accepted_log_records Number of log records successfully pushed into the pipeline.
47-
# TYPE receiver_accepted_log_records counter
48-
receiver_accepted_log_records{receiver="fakeReceiver",transport="fakeTransport"} 102
49-
# HELP receiver_accepted_metric_points Number of metric points successfully pushed into the pipeline.
50-
# TYPE receiver_accepted_metric_points counter
51-
receiver_accepted_metric_points{receiver="fakeReceiver",transport="fakeTransport"} 7
52-
# HELP receiver_accepted_spans Number of spans successfully pushed into the pipeline.
53-
# TYPE receiver_accepted_spans counter
54-
receiver_accepted_spans{receiver="fakeReceiver",transport="fakeTransport"} 42
55-
# HELP receiver_refused_log_records Number of log records that could not be pushed into the pipeline.
56-
# TYPE receiver_refused_log_records counter
57-
receiver_refused_log_records{receiver="fakeReceiver",transport="fakeTransport"} 35
58-
# HELP receiver_refused_metric_points Number of metric points that could not be pushed into the pipeline.
59-
# TYPE receiver_refused_metric_points counter
60-
receiver_refused_metric_points{receiver="fakeReceiver",transport="fakeTransport"} 41
61-
# HELP receiver_refused_spans Number of spans that could not be pushed into the pipeline.
62-
# TYPE receiver_refused_spans counter
63-
receiver_refused_spans{receiver="fakeReceiver",transport="fakeTransport"} 13
64-
# HELP scraper_scraped_metric_points Number of metric points successfully scraped.
65-
# TYPE scraper_scraped_metric_points counter
66-
scraper_scraped_metric_points{receiver="fakeReceiver",scraper="fakeScraper"} 7
67-
# HELP scraper_errored_metric_points Number of metric points that were unable to be scraped.
68-
# TYPE scraper_errored_metric_points counter
69-
scraper_errored_metric_points{receiver="fakeReceiver",scraper="fakeScraper"} 41
70-
# HELP gauge_metric A simple gauge metric
71-
# TYPE gauge_metric gauge
72-
gauge_metric 49
1+
# HELP otelcol_exporter_send_failed_spans Number of spans in failed attempts to send to destination.
2+
# TYPE otelcol_exporter_send_failed_spans counter
3+
otelcol_exporter_send_failed_spans{exporter="fakeExporter"} 14
4+
# HELP otelcol_exporter_sent_spans Number of spans successfully sent to destination.
5+
# TYPE otelcol_exporter_sent_spans counter
6+
otelcol_exporter_sent_spans{exporter="fakeExporter"} 43
7+
# HELP otelcol_exporter_send_failed_metric_points Number of metrics in failed attempts to send to destination.
8+
# TYPE otelcol_exporter_send_failed_metric_points counter
9+
otelcol_exporter_send_failed_metric_points{exporter="fakeExporter"} 42
10+
# HELP otelcol_exporter_sent_metric_points Number of metrics successfully sent to destination.
11+
# TYPE otelcol_exporter_sent_metric_points counter
12+
otelcol_exporter_sent_metric_points{exporter="fakeExporter"} 8
13+
# HELP otelcol_exporter_send_failed_log_records Number of logs in failed attempts to send to destination.
14+
# TYPE otelcol_exporter_send_failed_log_records counter
15+
otelcol_exporter_send_failed_log_records{exporter="fakeExporter"} 36
16+
# HELP otelcol_exporter_sent_log_records Number of logs successfully sent to destination.
17+
# TYPE otelcol_exporter_sent_log_records counter
18+
otelcol_exporter_sent_log_records{exporter="fakeExporter"} 103
19+
# HELP otelcol_processor_accepted_spans Number of spans successfully pushed into the next component in the pipeline.
20+
# TYPE otelcol_processor_accepted_spans counter
21+
otelcol_processor_accepted_spans{processor="fakeProcessor"} 42
22+
# HELP otelcol_processor_refused_spans Number of spans that were rejected by the next component in the pipeline.
23+
# TYPE otelcol_processor_refused_spans counter
24+
otelcol_processor_refused_spans{processor="fakeProcessor"} 13
25+
# HELP otelcol_processor_dropped_spans Number of spans that were dropped.
26+
# TYPE otelcol_processor_dropped_spans counter
27+
otelcol_processor_dropped_spans{processor="fakeProcessor"} 7
28+
# HELP otelcol_processor_accepted_metric_points Number of metric points successfully pushed into the next component in the pipeline.
29+
# TYPE otelcol_processor_accepted_metric_points counter
30+
otelcol_processor_accepted_metric_points{processor="fakeProcessor"} 7
31+
# HELP otelcol_processor_refused_metric_points Number of metric points that were rejected by the next component in the pipeline.
32+
# TYPE otelcol_processor_refused_metric_points counter
33+
otelcol_processor_refused_metric_points{processor="fakeProcessor"} 41
34+
# HELP otelcol_processor_dropped_metric_points Number of metric points that were dropped.
35+
# TYPE otelcol_processor_dropped_metric_points counter
36+
otelcol_processor_dropped_metric_points{processor="fakeProcessor"} 13
37+
# HELP otelcol_processor_accepted_log_records Number of log records successfully pushed into the next component in the pipeline.
38+
# TYPE otelcol_processor_accepted_log_records counter
39+
otelcol_processor_accepted_log_records{processor="fakeProcessor"} 102
40+
# HELP otelcol_processor_refused_log_records Number of log records that were rejected by the next component in the pipeline.
41+
# TYPE otelcol_processor_refused_log_records counter
42+
otelcol_processor_refused_log_records{processor="fakeProcessor"} 35
43+
# HELP otelcol_processor_dropped_log_records Number of log records that were dropped.
44+
# TYPE otelcol_processor_dropped_log_records counter
45+
otelcol_processor_dropped_log_records{processor="fakeProcessor"} 14
46+
# HELP otelcol_receiver_accepted_log_records Number of log records successfully pushed into the pipeline.
47+
# TYPE otelcol_receiver_accepted_log_records counter
48+
otelcol_receiver_accepted_log_records{receiver="fakeReceiver",transport="fakeTransport"} 102
49+
# HELP otelcol_receiver_accepted_metric_points Number of metric points successfully pushed into the pipeline.
50+
# TYPE otelcol_receiver_accepted_metric_points counter
51+
otelcol_receiver_accepted_metric_points{receiver="fakeReceiver",transport="fakeTransport"} 7
52+
# HELP otelcol_receiver_accepted_spans Number of spans successfully pushed into the pipeline.
53+
# TYPE otelcol_receiver_accepted_spans counter
54+
otelcol_receiver_accepted_spans{receiver="fakeReceiver",transport="fakeTransport"} 42
55+
# HELP otelcol_receiver_refused_log_records Number of log records that could not be pushed into the pipeline.
56+
# TYPE otelcol_receiver_refused_log_records counter
57+
otelcol_receiver_refused_log_records{receiver="fakeReceiver",transport="fakeTransport"} 35
58+
# HELP otelcol_receiver_refused_metric_points Number of metric points that could not be pushed into the pipeline.
59+
# TYPE otelcol_receiver_refused_metric_points counter
60+
otelcol_receiver_refused_metric_points{receiver="fakeReceiver",transport="fakeTransport"} 41
61+
# HELP otelcol_receiver_refused_spans Number of spans that could not be pushed into the pipeline.
62+
# TYPE otelcol_receiver_refused_spans counter
63+
otelcol_receiver_refused_spans{receiver="fakeReceiver",transport="fakeTransport"} 13
64+
# HELP otelcol_scraper_scraped_metric_points Number of metric points successfully scraped.
65+
# TYPE otelcol_scraper_scraped_metric_points counter
66+
otelcol_scraper_scraped_metric_points{receiver="fakeReceiver",scraper="fakeScraper"} 7
67+
# HELP otelcol_scraper_errored_metric_points Number of metric points that were unable to be scraped.
68+
# TYPE otelcol_scraper_errored_metric_points counter
69+
otelcol_scraper_errored_metric_points{receiver="fakeReceiver",scraper="fakeScraper"} 41
70+
# HELP otelcol_gauge_metric A simple gauge metric
71+
# TYPE otelcol_gauge_metric gauge
72+
otelcol_gauge_metric 49

‎internal/obsreportconfig/obsmetrics/obs_exporter.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const (
3131

3232
var (
3333
ExporterPrefix = ExporterKey + SpanNameSep
34-
ExporterMetricPrefix = ExporterKey + MetricNameSep
34+
ExporterMetricPrefix = otelcolPrefix + MetricNameSep + ExporterKey + MetricNameSep
3535
ExportTraceDataOperationSuffix = SpanNameSep + "traces"
3636
ExportMetricsOperationSuffix = SpanNameSep + "metrics"
3737
ExportLogsOperationSuffix = SpanNameSep + "logs"

‎internal/obsreportconfig/obsmetrics/obs_processor.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ const (
1818
)
1919

2020
var (
21-
ProcessorMetricPrefix = ProcessorKey + MetricNameSep
21+
ProcessorMetricPrefix = otelcolPrefix + MetricNameSep + ProcessorKey + MetricNameSep
2222
)

‎internal/obsreportconfig/obsmetrics/obs_receiver.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const (
3131

3232
var (
3333
ReceiverPrefix = ReceiverKey + SpanNameSep
34-
ReceiverMetricPrefix = ReceiverKey + MetricNameSep
34+
ReceiverMetricPrefix = otelcolPrefix + MetricNameSep + ReceiverKey + MetricNameSep
3535
ReceiveTraceDataOperationSuffix = SpanNameSep + "TraceDataReceived"
3636
ReceiverMetricsOperationSuffix = SpanNameSep + "MetricsReceived"
3737
ReceiverLogsOperationSuffix = SpanNameSep + "LogsReceived"

‎internal/obsreportconfig/obsmetrics/obs_scraper.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package obsmetrics // import "go.opentelemetry.io/collector/internal/obsreportco
66
const (
77
// ScraperKey used to identify scrapers in metrics and traces.
88
ScraperKey = "scraper"
9-
109
// ScrapedMetricPointsKey used to identify metric points scraped by the
1110
// Collector.
1211
ScrapedMetricPointsKey = "scraped_metric_points"
@@ -17,6 +16,6 @@ const (
1716

1817
const (
1918
ScraperPrefix = ScraperKey + SpanNameSep
20-
ScraperMetricPrefix = ScraperKey + MetricNameSep
19+
ScraperMetricPrefix = otelcolPrefix + MetricNameSep + ScraperKey + MetricNameSep
2120
ScraperMetricsOperationSuffix = SpanNameSep + "MetricsScraped"
2221
)

‎internal/obsreportconfig/obsmetrics/obsmetrics.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ const (
1010
SpanNameSep = "/"
1111
MetricNameSep = "_"
1212
Scope = "go.opentelemetry.io/collector/obsreport"
13+
otelcolPrefix = "otelcol"
1314
)

‎processor/batchprocessor/metrics_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func (tt *testTelemetry) assertMetrics(t *testing.T, expected expectedMetrics) {
9292
require.NoError(t, err)
9393

9494
if expected.sendSizeBytesSum > 0 {
95-
name := "processor_batch_batch_send_size_bytes"
95+
name := "otelcol_processor_batch_batch_send_size_bytes"
9696
metric := tt.getMetric(t, name, io_prometheus_client.MetricType_HISTOGRAM, metrics)
9797

9898
assertFloat(t, expected.sendSizeBytesSum, metric.GetHistogram().GetSampleSum(), name)
@@ -108,7 +108,7 @@ func (tt *testTelemetry) assertMetrics(t *testing.T, expected expectedMetrics) {
108108
}
109109

110110
if expected.sendSizeSum > 0 {
111-
name := "processor_batch_batch_send_size"
111+
name := "otelcol_processor_batch_batch_send_size"
112112
metric := tt.getMetric(t, name, io_prometheus_client.MetricType_HISTOGRAM, metrics)
113113

114114
assertFloat(t, expected.sendSizeSum, metric.GetHistogram().GetSampleSum(), name)
@@ -122,14 +122,14 @@ func (tt *testTelemetry) assertMetrics(t *testing.T, expected expectedMetrics) {
122122
}
123123

124124
if expected.sizeTrigger > 0 {
125-
name := "processor_batch_batch_size_trigger_send"
125+
name := "otelcol_processor_batch_batch_size_trigger_send"
126126
metric := tt.getMetric(t, name, io_prometheus_client.MetricType_COUNTER, metrics)
127127

128128
assertFloat(t, expected.sizeTrigger, metric.GetCounter().GetValue(), name)
129129
}
130130

131131
if expected.timeoutTrigger > 0 {
132-
name := "processor_batch_timeout_trigger_send"
132+
name := "otelcol_processor_batch_timeout_trigger_send"
133133
metric := tt.getMetric(t, name, io_prometheus_client.MetricType_COUNTER, metrics)
134134

135135
assertFloat(t, expected.timeoutTrigger, metric.GetCounter().GetValue(), name)

‎processor/processorhelper/obsreport_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ func TestBuildProcessorCustomMetricName(t *testing.T) {
6363
}{
6464
{
6565
name: "firstMeasure",
66-
want: "processor_test_type_firstMeasure",
66+
want: "otelcol_processor_test_type_firstMeasure",
6767
},
6868
{
6969
name: "secondMeasure",
70-
want: "processor_test_type_secondMeasure",
70+
want: "otelcol_processor_test_type_secondMeasure",
7171
},
7272
}
7373
for _, tt := range tests {

0 commit comments

Comments
 (0)