From c995fa17d1b7554541d5243eb1a3898c24cc9911 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Mon, 16 Sep 2024 13:33:16 -0700 Subject: [PATCH 1/4] [processor/groupbytrace] ensure metric has unit A missing unit will break validation when mdatagen is updated Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- processor/groupbytraceprocessor/metadata.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/processor/groupbytraceprocessor/metadata.yaml b/processor/groupbytraceprocessor/metadata.yaml index ef574c02edbf4..0e2fab550e125 100644 --- a/processor/groupbytraceprocessor/metadata.yaml +++ b/processor/groupbytraceprocessor/metadata.yaml @@ -57,6 +57,7 @@ telemetry: processor_groupbytrace_incomplete_releases: enabled: true description: Releases that are suspected to have been incomplete + unit: "{releases}" sum: value_type: int monotonic: true From acc3d6a66d01fb96aa5cc55e3f2df4267ff68f30 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Mon, 16 Sep 2024 13:39:29 -0700 Subject: [PATCH 2/4] changelog Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .chloggen/codeboten_add-unit.yaml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .chloggen/codeboten_add-unit.yaml diff --git a/.chloggen/codeboten_add-unit.yaml b/.chloggen/codeboten_add-unit.yaml new file mode 100644 index 0000000000000..53b088706a69e --- /dev/null +++ b/.chloggen/codeboten_add-unit.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: groupbytraceprocessor + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Ensure processor_groupbytrace_incomplete_releases metric has a unit. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [35221] + +# (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: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# 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: [] From 93faf239a7d844945efccf49e6a6f62224209a17 Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:21:41 -0700 Subject: [PATCH 3/4] update unit Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- processor/groupbytraceprocessor/documentation.md | 2 +- .../internal/metadata/generated_telemetry.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/processor/groupbytraceprocessor/documentation.md b/processor/groupbytraceprocessor/documentation.md index 3849392785086..be8bb8183fe87 100644 --- a/processor/groupbytraceprocessor/documentation.md +++ b/processor/groupbytraceprocessor/documentation.md @@ -28,7 +28,7 @@ Releases that are suspected to have been incomplete | Unit | Metric Type | Value Type | Monotonic | | ---- | ----------- | ---------- | --------- | -| | Sum | Int | true | +| {releases} | Sum | Int | true | ### otelcol_processor_groupbytrace_num_events_in_queue diff --git a/processor/groupbytraceprocessor/internal/metadata/generated_telemetry.go b/processor/groupbytraceprocessor/internal/metadata/generated_telemetry.go index b2f4db20c3196..36f83d18b339c 100644 --- a/processor/groupbytraceprocessor/internal/metadata/generated_telemetry.go +++ b/processor/groupbytraceprocessor/internal/metadata/generated_telemetry.go @@ -6,6 +6,7 @@ import ( "errors" "go.opentelemetry.io/otel/metric" + "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" "go.opentelemetry.io/collector/component" @@ -67,7 +68,7 @@ func NewTelemetryBuilder(settings component.TelemetrySettings, options ...teleme builder.ProcessorGroupbytraceIncompleteReleases, err = builder.meters[configtelemetry.LevelBasic].Int64Counter( "otelcol_processor_groupbytrace_incomplete_releases", metric.WithDescription("Releases that are suspected to have been incomplete"), - metric.WithUnit(""), + metric.WithUnit("{releases}"), ) errs = errors.Join(errs, err) builder.ProcessorGroupbytraceNumEventsInQueue, err = builder.meters[configtelemetry.LevelBasic].Int64Gauge( From 8c328e5a9bc1fe3dd28123acbd51e3fcddc3317b Mon Sep 17 00:00:00 2001 From: Alex Boten <223565+codeboten@users.noreply.github.com> Date: Tue, 17 Sep 2024 08:00:49 -0700 Subject: [PATCH 4/4] make generate Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com> --- .../internal/metadata/generated_telemetry.go | 1 - 1 file changed, 1 deletion(-) diff --git a/processor/groupbytraceprocessor/internal/metadata/generated_telemetry.go b/processor/groupbytraceprocessor/internal/metadata/generated_telemetry.go index 36f83d18b339c..58fe789590e64 100644 --- a/processor/groupbytraceprocessor/internal/metadata/generated_telemetry.go +++ b/processor/groupbytraceprocessor/internal/metadata/generated_telemetry.go @@ -6,7 +6,6 @@ import ( "errors" "go.opentelemetry.io/otel/metric" - "go.opentelemetry.io/otel/metric/noop" "go.opentelemetry.io/otel/trace" "go.opentelemetry.io/collector/component"