Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mdatagen] add stability detail for metrics #11160

Merged
merged 7 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .chloggen/codeboten_stability-metrics.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: mdatagen

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Add stability field to telemetry metrics, allowing the generated description to include a stability string.

# One or more tracking issues or pull requests related to the change
issues: [11160]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
19 changes: 19 additions & 0 deletions cmd/mdatagen/internal/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"path/filepath"
"strings"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configtelemetry"
"go.opentelemetry.io/collector/confmap"
"go.opentelemetry.io/collector/confmap/confmaptest"
Expand Down Expand Up @@ -97,6 +98,21 @@
}
}

type stability struct {
Level string `mapstructure:"level"`
From string `mapstructure:"from"`
}

func (s stability) String() string {
if len(s.Level) == 0 || strings.EqualFold(s.Level, component.StabilityLevelStable.String()) {
return ""
}
if len(s.From) > 0 {
return fmt.Sprintf(" [%s since %s]", s.Level, s.From)

Check warning on line 111 in cmd/mdatagen/internal/loader.go

View check run for this annotation

Codecov / codecov/patch

cmd/mdatagen/internal/loader.go#L110-L111

Added lines #L110 - L111 were not covered by tests
}
return fmt.Sprintf(" [%s]", s.Level)

Check warning on line 113 in cmd/mdatagen/internal/loader.go

View check run for this annotation

Codecov / codecov/patch

cmd/mdatagen/internal/loader.go#L113

Added line #L113 was not covered by tests
}

type Metric struct {
// Enabled defines whether the metric is enabled by default.
Enabled bool `mapstructure:"enabled"`
Expand All @@ -107,6 +123,9 @@
// Description of the metric.
Description string `mapstructure:"description"`

// The stability level of the metric.
Stability stability `mapstructure:"stability"`

// ExtendedDocumentation of the metric. If specified, this will
// be appended to the description used in generated documentation.
ExtendedDocumentation string `mapstructure:"extended_documentation"`
Expand Down
3 changes: 3 additions & 0 deletions cmd/mdatagen/internal/loader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ func TestLoadMetadata(t *testing.T) {
Metrics: map[MetricName]Metric{
"batch_size_trigger_send": {
Enabled: true,
Stability: stability{Level: "deprecated", From: "v0.110.0"},
Description: "Number of times the batch was sent due to a size trigger",
Unit: strPtr("{times}"),
Sum: &sum{
Expand All @@ -252,6 +253,7 @@ func TestLoadMetadata(t *testing.T) {
},
"request_duration": {
Enabled: true,
Stability: stability{Level: "alpha"},
Description: "Duration of request",
Unit: strPtr("s"),
Histogram: &histogram{
Expand All @@ -261,6 +263,7 @@ func TestLoadMetadata(t *testing.T) {
},
"process_runtime_total_alloc_bytes": {
Enabled: true,
Stability: stability{Level: "stable"},
Description: "Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc')",
Unit: strPtr("By"),
Sum: &sum{
Expand Down
4 changes: 2 additions & 2 deletions cmd/mdatagen/internal/samplereceiver/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ The following telemetry is emitted by this component.

### otelcol_batch_size_trigger_send

Number of times the batch was sent due to a size trigger
Number of times the batch was sent due to a size trigger [deprecated since v0.110.0]

| Unit | Metric Type | Value Type | Monotonic |
| ---- | ----------- | ---------- | --------- |
Expand All @@ -146,7 +146,7 @@ For example this metric only exists if feature A is enabled.

### otelcol_request_duration

Duration of request
Duration of request [alpha]

| Unit | Metric Type | Value Type |
| ---- | ----------- | ---------- |
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions cmd/mdatagen/internal/samplereceiver/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,20 +161,27 @@ telemetry:
metrics:
batch_size_trigger_send:
enabled: true
stability:
level: deprecated
from: v0.110.0
description: Number of times the batch was sent due to a size trigger
unit: "{times}"
sum:
value_type: int
monotonic: true
request_duration:
enabled: true
stability:
level: alpha
description: Duration of request
unit: s
histogram:
value_type: double
bucket_boundaries: [1, 10, 100]
process_runtime_total_alloc_bytes:
enabled: true
stability:
level: stable
description: Cumulative bytes allocated for heap objects (see 'go doc runtime.MemStats.TotalAlloc')
unit: By
sum:
Expand Down
4 changes: 2 additions & 2 deletions cmd/mdatagen/internal/samplereceiver/metrics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func TestComponentTelemetry(t *testing.T) {
tt.assertMetrics(t, []metricdata.Metrics{
{
Name: "otelcol_batch_size_trigger_send",
Description: "Number of times the batch was sent due to a size trigger",
Description: "Number of times the batch was sent due to a size trigger [deprecated since v0.110.0]",
Unit: "{times}",
Data: metricdata.Sum[int64]{
Temporality: metricdata.CumulativeTemporality,
Expand Down Expand Up @@ -64,7 +64,7 @@ func TestComponentTelemetry(t *testing.T) {
tt.assertMetrics(t, []metricdata.Metrics{
{
Name: "otelcol_batch_size_trigger_send",
Description: "Number of times the batch was sent due to a size trigger",
Description: "Number of times the batch was sent due to a size trigger [deprecated since v0.110.0]",
Unit: "{times}",
Data: metricdata.Sum[int64]{
Temporality: metricdata.CumulativeTemporality,
Expand Down
2 changes: 1 addition & 1 deletion cmd/mdatagen/internal/templates/documentation.md.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

### otelcol_{{ $metricName }}

{{ $metric.Description }}
{{ $metric.Description }}{{ $metric.Stability }}

{{- if $metric.ExtendedDocumentation }}

Expand Down
2 changes: 1 addition & 1 deletion cmd/mdatagen/internal/templates/telemetry.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...Teleme
{{- if not $metric.Optional }}
builder.{{ $name.Render }}, err = builder.meters[configtelemetry.Level{{ casesTitle $metric.Level.String }}].{{ $metric.Data.Instrument }}(
"otelcol_{{ $name }}",
metric.WithDescription("{{ $metric.Description }}"),
metric.WithDescription("{{ $metric.Description }}{{ $metric.Stability }}"),
metric.WithUnit("{{ $metric.Unit }}"),
{{- if eq $metric.Data.Type "Histogram" -}}
{{ if $metric.Data.Boundaries -}}metric.WithExplicitBucketBoundaries([]float64{ {{- range $metric.Data.Boundaries }} {{.}}, {{- end }} }...),{{- end }}
Expand Down
2 changes: 2 additions & 0 deletions cmd/mdatagen/metadata-schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ telemetry:
enabled: bool
# Required: metric description.
description:
# Optional: the stability level of the metric. Set to alpha by default.
stability: [alpha|stable|deprecated]
codeboten marked this conversation as resolved.
Show resolved Hide resolved
# Optional: extended documentation of the metric.
extended_documentation:
# Optional: whether or not this metric is optional. Optional metrics may only be initialized
Expand Down
4 changes: 2 additions & 2 deletions processor/processorhelper/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ Number of spans that were dropped.

### otelcol_processor_incoming_items

Number of items passed to the processor.
Number of items passed to the processor. [alpha]

| Unit | Metric Type | Value Type | Monotonic |
| ---- | ----------- | ---------- | --------- |
| {items} | Sum | Int | true |

### otelcol_processor_outgoing_items

Number of items emitted from the processor.
Number of items emitted from the processor. [alpha]

| Unit | Metric Type | Value Type | Monotonic |
| ---- | ----------- | ---------- | --------- |
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions processor/processorhelper/logs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func TestLogsProcessor_RecordInOut(t *testing.T) {
testTelemetry.assertMetrics(t, []metricdata.Metrics{
{
Name: "otelcol_processor_incoming_items",
Description: "Number of items passed to the processor.",
Description: "Number of items passed to the processor. [alpha]",
Unit: "{items}",
Data: metricdata.Sum[int64]{
Temporality: metricdata.CumulativeTemporality,
Expand All @@ -112,7 +112,7 @@ func TestLogsProcessor_RecordInOut(t *testing.T) {
},
{
Name: "otelcol_processor_outgoing_items",
Description: "Number of items emitted from the processor.",
Description: "Number of items emitted from the processor. [alpha]",
Unit: "{items}",
Data: metricdata.Sum[int64]{
Temporality: metricdata.CumulativeTemporality,
Expand Down
4 changes: 4 additions & 0 deletions processor/processorhelper/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ telemetry:

processor_incoming_items:
enabled: true
stability:
level: alpha
description: Number of items passed to the processor.
unit: "{items}"
sum:
Expand All @@ -20,6 +22,8 @@ telemetry:

processor_outgoing_items:
enabled: true
stability:
level: alpha
description: Number of items emitted from the processor.
unit: "{items}"
sum:
Expand Down
4 changes: 2 additions & 2 deletions processor/processorhelper/metrics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func TestMetricsProcessor_RecordInOut(t *testing.T) {
testTelemetry.assertMetrics(t, []metricdata.Metrics{
{
Name: "otelcol_processor_incoming_items",
Description: "Number of items passed to the processor.",
Description: "Number of items passed to the processor. [alpha]",
Unit: "{items}",
Data: metricdata.Sum[int64]{
Temporality: metricdata.CumulativeTemporality,
Expand All @@ -113,7 +113,7 @@ func TestMetricsProcessor_RecordInOut(t *testing.T) {
},
{
Name: "otelcol_processor_outgoing_items",
Description: "Number of items emitted from the processor.",
Description: "Number of items emitted from the processor. [alpha]",
Unit: "{items}",
Data: metricdata.Sum[int64]{
Temporality: metricdata.CumulativeTemporality,
Expand Down
4 changes: 2 additions & 2 deletions processor/processorhelper/traces_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func TestTracesProcessor_RecordInOut(t *testing.T) {
testTelemetry.assertMetrics(t, []metricdata.Metrics{
{
Name: "otelcol_processor_incoming_items",
Description: "Number of items passed to the processor.",
Description: "Number of items passed to the processor. [alpha]",
Unit: "{items}",
Data: metricdata.Sum[int64]{
Temporality: metricdata.CumulativeTemporality,
Expand All @@ -113,7 +113,7 @@ func TestTracesProcessor_RecordInOut(t *testing.T) {
},
{
Name: "otelcol_processor_outgoing_items",
Description: "Number of items emitted from the processor.",
Description: "Number of items emitted from the processor. [alpha]",
Unit: "{items}",
Data: metricdata.Sum[int64]{
Temporality: metricdata.CumulativeTemporality,
Expand Down
Loading