From 18f418c19ccb70c7d596936605b858cbc9e5ff14 Mon Sep 17 00:00:00 2001 From: Dmitry Filimonov Date: Wed, 15 May 2024 09:55:51 -0700 Subject: [PATCH] rollback mdatagen changes --- cmd/mdatagen/generated_package_test.go | 3 ++- .../internal/samplereceiver/generated_component_test.go | 1 + .../internal/samplereceiver/generated_package_test.go | 3 ++- .../internal/metadata/generated_config_test.go | 1 + .../internal/metadata/generated_metrics_test.go | 5 +++-- .../samplereceiver/internal/metadata/generated_telemetry.go | 3 ++- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cmd/mdatagen/generated_package_test.go b/cmd/mdatagen/generated_package_test.go index e5a1c2dcb57..2a21d3c7c86 100644 --- a/cmd/mdatagen/generated_package_test.go +++ b/cmd/mdatagen/generated_package_test.go @@ -3,8 +3,9 @@ package main import ( - "go.uber.org/goleak" "testing" + + "go.uber.org/goleak" ) func TestMain(m *testing.M) { diff --git a/cmd/mdatagen/internal/samplereceiver/generated_component_test.go b/cmd/mdatagen/internal/samplereceiver/generated_component_test.go index 2796716c24a..af315d20a85 100644 --- a/cmd/mdatagen/internal/samplereceiver/generated_component_test.go +++ b/cmd/mdatagen/internal/samplereceiver/generated_component_test.go @@ -8,6 +8,7 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/confmap/confmaptest" diff --git a/cmd/mdatagen/internal/samplereceiver/generated_package_test.go b/cmd/mdatagen/internal/samplereceiver/generated_package_test.go index dd6c357391f..ba2afcd94ca 100644 --- a/cmd/mdatagen/internal/samplereceiver/generated_package_test.go +++ b/cmd/mdatagen/internal/samplereceiver/generated_package_test.go @@ -3,8 +3,9 @@ package samplereceiver import ( - "go.uber.org/goleak" "testing" + + "go.uber.org/goleak" ) func TestMain(m *testing.M) { diff --git a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_config_test.go b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_config_test.go index 511e82b7ecf..0f581b137f7 100644 --- a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_config_test.go +++ b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_config_test.go @@ -9,6 +9,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/confmap/confmaptest" ) diff --git a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics_test.go b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics_test.go index bc4e2f2194b..b6214e5d894 100644 --- a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics_test.go +++ b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics_test.go @@ -6,11 +6,12 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.uber.org/zap" + "go.uber.org/zap/zaptest/observer" + "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/receiver/receivertest" - "go.uber.org/zap" - "go.uber.org/zap/zaptest/observer" ) type testDataSet int diff --git a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go index 804fb32d253..d916f8b40bb 100644 --- a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go +++ b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_telemetry.go @@ -5,9 +5,10 @@ package metadata import ( "errors" - "go.opentelemetry.io/collector/component" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/trace" + + "go.opentelemetry.io/collector/component" ) func Meter(settings component.TelemetrySettings) metric.Meter {