Skip to content

Commit b10029c

Browse files
authored
remove unnecessary level (#10951)
The MeterProvider used to generate the matric will make calls to recording the metric Noops. Removing the level check. Signed-off-by: Alex Boten <[email protected]>
1 parent dadc331 commit b10029c

File tree

3 files changed

+2
-18
lines changed

3 files changed

+2
-18
lines changed

exporter/exporterhelper/obsexporter.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@ import (
1212
"go.opentelemetry.io/otel/trace"
1313

1414
"go.opentelemetry.io/collector/component"
15-
"go.opentelemetry.io/collector/config/configtelemetry"
1615
"go.opentelemetry.io/collector/exporter"
1716
"go.opentelemetry.io/collector/exporter/exporterhelper/internal/metadata"
1817
"go.opentelemetry.io/collector/internal/obsreportconfig/obsmetrics"
1918
)
2019

2120
// obsReport is a helper to add observability to an exporter.
2221
type obsReport struct {
23-
level configtelemetry.Level
2422
spanNamePrefix string
2523
tracer trace.Tracer
2624
dataType component.DataType
@@ -48,7 +46,6 @@ func newExporter(cfg obsReportSettings) (*obsReport, error) {
4846
}
4947

5048
return &obsReport{
51-
level: cfg.exporterCreateSettings.TelemetrySettings.MetricsLevel,
5249
spanNamePrefix: obsmetrics.ExporterPrefix + cfg.exporterID.String(),
5350
tracer: cfg.exporterCreateSettings.TracerProvider.Tracer(cfg.exporterID.String()),
5451
dataType: cfg.dataType,
@@ -113,9 +110,6 @@ func (or *obsReport) startOp(ctx context.Context, operationSuffix string) contex
113110
}
114111

115112
func (or *obsReport) recordMetrics(ctx context.Context, dataType component.DataType, sent, failed int64) {
116-
if or.level == configtelemetry.LevelNone {
117-
return
118-
}
119113
var sentMeasure, failedMeasure metric.Int64Counter
120114
switch dataType {
121115
case component.DataTypeTraces:

receiver/receiverhelper/obsreport.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,13 @@ import (
1414
"go.opentelemetry.io/otel/trace"
1515

1616
"go.opentelemetry.io/collector/component"
17-
"go.opentelemetry.io/collector/config/configtelemetry"
1817
"go.opentelemetry.io/collector/internal/obsreportconfig/obsmetrics"
1918
"go.opentelemetry.io/collector/receiver"
2019
"go.opentelemetry.io/collector/receiver/receiverhelper/internal/metadata"
2120
)
2221

2322
// ObsReport is a helper to add observability to a receiver.
2423
type ObsReport struct {
25-
level configtelemetry.Level
2624
spanNamePrefix string
2725
transport string
2826
longLivedCtx bool
@@ -56,7 +54,6 @@ func newReceiver(cfg ObsReportSettings) (*ObsReport, error) {
5654
return nil, err
5755
}
5856
return &ObsReport{
59-
level: cfg.ReceiverCreateSettings.TelemetrySettings.MetricsLevel,
6057
spanNamePrefix: obsmetrics.ReceiverPrefix + cfg.ReceiverID.String(),
6158
transport: cfg.Transport,
6259
longLivedCtx: cfg.LongLivedCtx,
@@ -166,9 +163,7 @@ func (rec *ObsReport) endOp(
166163

167164
span := trace.SpanFromContext(receiverCtx)
168165

169-
if rec.level != configtelemetry.LevelNone {
170-
rec.recordMetrics(receiverCtx, dataType, numAccepted, numRefused)
171-
}
166+
rec.recordMetrics(receiverCtx, dataType, numAccepted, numRefused)
172167

173168
// end span according to errors
174169
if span.IsRecording() {

receiver/scraperhelper/obsreport.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"go.opentelemetry.io/otel/trace"
1414

1515
"go.opentelemetry.io/collector/component"
16-
"go.opentelemetry.io/collector/config/configtelemetry"
1716
"go.opentelemetry.io/collector/internal/obsreportconfig/obsmetrics"
1817
"go.opentelemetry.io/collector/receiver"
1918
"go.opentelemetry.io/collector/receiver/scrapererror"
@@ -22,7 +21,6 @@ import (
2221

2322
// ObsReport is a helper to add observability to a scraper.
2423
type ObsReport struct {
25-
level configtelemetry.Level
2624
receiverID component.ID
2725
scraper component.ID
2826
tracer trace.Tracer
@@ -49,7 +47,6 @@ func newScraper(cfg ObsReportSettings) (*ObsReport, error) {
4947
return nil, err
5048
}
5149
return &ObsReport{
52-
level: cfg.ReceiverCreateSettings.TelemetrySettings.MetricsLevel,
5350
receiverID: cfg.ReceiverID,
5451
scraper: cfg.Scraper,
5552
tracer: cfg.ReceiverCreateSettings.TracerProvider.Tracer(cfg.Scraper.String()),
@@ -91,9 +88,7 @@ func (s *ObsReport) EndMetricsOp(
9188

9289
span := trace.SpanFromContext(scraperCtx)
9390

94-
if s.level != configtelemetry.LevelNone {
95-
s.recordMetrics(scraperCtx, numScrapedMetrics, numErroredMetrics)
96-
}
91+
s.recordMetrics(scraperCtx, numScrapedMetrics, numErroredMetrics)
9792

9893
// end span according to errors
9994
if span.IsRecording() {

0 commit comments

Comments
 (0)