From bb83847cb280b37c96dd6874190f2de1d48091c6 Mon Sep 17 00:00:00 2001 From: BEN GHORBEL Oussama Date: Mon, 17 Feb 2025 11:22:31 +0100 Subject: [PATCH] [chore] Remove conditional statement on metrics.go.tmpl NewMetricsBuilder [#12402] --- .chloggen/fix_cmd_mdata-gen-metrics.yml | 25 +++++++++++++++++++ .../internal/templates/metrics.go.tmpl | 2 -- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 .chloggen/fix_cmd_mdata-gen-metrics.yml diff --git a/.chloggen/fix_cmd_mdata-gen-metrics.yml b/.chloggen/fix_cmd_mdata-gen-metrics.yml new file mode 100644 index 000000000000..984953aa6fa8 --- /dev/null +++ b/.chloggen/fix_cmd_mdata-gen-metrics.yml @@ -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: bug_fix + +# 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: Fix mdatagen generated_metrics for components other than Receiver and Scraper + +# One or more tracking issues or pull requests related to the change +issues: [12402] + +# (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: [api] \ No newline at end of file diff --git a/cmd/mdatagen/internal/templates/metrics.go.tmpl b/cmd/mdatagen/internal/templates/metrics.go.tmpl index 5f366068e122..c05703416430 100644 --- a/cmd/mdatagen/internal/templates/metrics.go.tmpl +++ b/cmd/mdatagen/internal/templates/metrics.go.tmpl @@ -161,9 +161,7 @@ func WithStartTime(startTime pcommon.Timestamp) MetricBuilderOption { }) } -{{- if or isReceiver isScraper }} func NewMetricsBuilder(mbc MetricsBuilderConfig, settings {{ .Status.Class }}.Settings, options ...MetricBuilderOption) *MetricsBuilder { -{{- end }} {{- range $name, $metric := .Metrics }} {{- if $metric.Warnings.IfEnabled }} if mbc.Metrics.{{ $name.Render }}.Enabled {