From 79ef4df4c6180b9e952b9415925fcb661cc9a404 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Thu, 27 Feb 2025 18:50:33 -0800 Subject: [PATCH] [cmd/mdatagen] fix #12298 unit tests failures (#12523) Fixes #12298 Inspired by https://github.com/open-telemetry/opentelemetry-collector/pull/12477, but looks like that PR is hard to pass queue merge. Signed-off-by: Bogdan Drutu --- .chloggen/fix-12298.yaml | 25 +++++++++++++++++++ .../internal/templates/component_test.go.tmpl | 1 - .../internal/templates/telemetrytest.go.tmpl | 1 - .../templates/telemetrytest_test.go.tmpl | 5 ++-- 4 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 .chloggen/fix-12298.yaml diff --git a/.chloggen/fix-12298.yaml b/.chloggen/fix-12298.yaml new file mode 100644 index 00000000000..27e84bb1b53 --- /dev/null +++ b/.chloggen/fix-12298.yaml @@ -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 broken imports in the generated files. + +# One or more tracking issues or pull requests related to the change +issues: [12298] + +# (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] diff --git a/cmd/mdatagen/internal/templates/component_test.go.tmpl b/cmd/mdatagen/internal/templates/component_test.go.tmpl index 39002f5fd13..309b7bd67bb 100644 --- a/cmd/mdatagen/internal/templates/component_test.go.tmpl +++ b/cmd/mdatagen/internal/templates/component_test.go.tmpl @@ -35,7 +35,6 @@ import ( "go.opentelemetry.io/collector/receiver/receivertest" {{- end }} {{- if isScraper }} - "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/scraper" "go.opentelemetry.io/collector/scraper/scrapertest" {{- end }} diff --git a/cmd/mdatagen/internal/templates/telemetrytest.go.tmpl b/cmd/mdatagen/internal/templates/telemetrytest.go.tmpl index 00c0bbafd12..8d30a07d637 100644 --- a/cmd/mdatagen/internal/templates/telemetrytest.go.tmpl +++ b/cmd/mdatagen/internal/templates/telemetrytest.go.tmpl @@ -3,7 +3,6 @@ package {{ .Package }}test import ( - "context" "testing" "github.com/stretchr/testify/require" diff --git a/cmd/mdatagen/internal/templates/telemetrytest_test.go.tmpl b/cmd/mdatagen/internal/templates/telemetrytest_test.go.tmpl index be5826025b8..78a5560963e 100644 --- a/cmd/mdatagen/internal/templates/telemetrytest_test.go.tmpl +++ b/cmd/mdatagen/internal/templates/telemetrytest_test.go.tmpl @@ -3,14 +3,15 @@ package {{ .Package }}test import ( - "context" + "context" "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/sdk/metric/metricdata" "go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest" - "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/component/componenttest" ) func TestSetupTelemetry(t *testing.T) {