Skip to content

Commit 3dbab92

Browse files
committed
[cmd/mdatagen] Remove level field from metrics
1 parent dcc866c commit 3dbab92

File tree

14 files changed

+56
-150
lines changed

14 files changed

+56
-150
lines changed

cmd/mdatagen/internal/metric.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"golang.org/x/text/language"
1313

1414
"go.opentelemetry.io/collector/component"
15-
"go.opentelemetry.io/collector/config/configtelemetry"
1615
"go.opentelemetry.io/collector/confmap"
1716
"go.opentelemetry.io/collector/pdata/pmetric"
1817
)
@@ -60,11 +59,6 @@ type Metric struct {
6059

6160
// Attributes is the list of attributes that the metric emits.
6261
Attributes []AttributeName `mapstructure:"attributes"`
63-
64-
// Level specifies the minimum `configtelemetry.Level` for which
65-
// the metric will be emitted. This only applies to internal telemetry
66-
// configuration.
67-
Level configtelemetry.Level `mapstructure:"level"`
6862
}
6963

7064
type Stability struct {

cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go

Lines changed: 5 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/mdatagen/internal/telemetry.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,3 @@ type Telemetry struct {
1111
Level configtelemetry.Level `mapstructure:"level"`
1212
Metrics map[MetricName]Metric `mapstructure:"metrics"`
1313
}
14-
15-
func (t Telemetry) Levels() map[string]any {
16-
levels := map[string]any{}
17-
for _, m := range t.Metrics {
18-
levels[m.Level.String()] = nil
19-
}
20-
return levels
21-
}

cmd/mdatagen/internal/templates/telemetry.go.tmpl

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...Teleme
109109

110110
{{- range $name, $metric := .Telemetry.Metrics }}
111111
{{- if not $metric.Optional }}
112-
builder.{{ $name.Render }}, err = getLeveledMeter(builder.meter, configtelemetry.Level{{ $metric.Level }}, settings.MetricsLevel).{{ $metric.Data.Instrument }}(
112+
builder.{{ $name.Render }}, err = builder.meter.{{ $metric.Data.Instrument }}(
113113
"otelcol_{{ $name }}",
114114
metric.WithDescription("{{ $metric.Description }}{{ $metric.Stability }}"),
115115
metric.WithUnit("{{ $metric.Unit }}"),
@@ -119,19 +119,12 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...Teleme
119119
)
120120
errs = errors.Join(errs, err)
121121
{{- if $metric.Data.Async }}
122-
_, err = getLeveledMeter(builder.meter, configtelemetry.Level{{ $metric.Level }}, settings.MetricsLevel).RegisterCallback(builder.observe{{ $name.Render }}, builder.{{ $name.Render }})
122+
_, err = builder.meter.RegisterCallback(builder.observe{{ $name.Render }}, builder.{{ $name.Render }})
123123
errs = errors.Join(errs, err)
124124
{{- end }}
125125
{{- end }}
126126
{{- end }}
127127
return &builder, errs
128128
}
129129

130-
func getLeveledMeter(meter metric.Meter, cfgLevel, srvLevel configtelemetry.Level) metric.Meter {
131-
if cfgLevel <= srvLevel {
132-
return meter
133-
}
134-
return noopmetric.Meter{}
135-
}
136-
137130
{{- end }}

exporter/exporterhelper/internal/metadata/generated_telemetry.go

Lines changed: 9 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

processor/batchprocessor/documentation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Number of units in the batch
1616

1717
### otelcol_processor_batch_batch_send_size_bytes
1818

19-
Number of bytes in batch that was sent
19+
Number of bytes in batch that was sent. Only available on detailed level.
2020

2121
| Unit | Metric Type | Value Type |
2222
| ---- | ----------- | ---------- |

processor/batchprocessor/internal/metadata/generated_telemetry.go

Lines changed: 7 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

processor/batchprocessor/internal/metadatatest/generated_telemetrytest_test.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

processor/batchprocessor/metadata.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ telemetry:
3434
value_type: int
3535
bucket_boundaries: [ 10, 25, 50, 75, 100, 250, 500, 750, 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000, 9000, 10000, 20000, 30000, 50000, 100000 ]
3636
processor_batch_batch_send_size_bytes:
37-
level: detailed
3837
enabled: true
39-
description: Number of bytes in batch that was sent
38+
description: Number of bytes in batch that was sent. Only available on detailed level.
4039
unit: By
4140
histogram:
4241
value_type: int

processor/memorylimiterprocessor/internal/metadata/generated_telemetry.go

Lines changed: 6 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)