Skip to content

Commit 23c46ed

Browse files
authored
[chore][mdatagen] fix imports conditions and indentation (#12797)
#### Description fix imports conditions and indentation Signed-off-by: Matthieu MOREL <[email protected]>
1 parent 10053e3 commit 23c46ed

File tree

5 files changed

+46
-35
lines changed

5 files changed

+46
-35
lines changed

cmd/mdatagen/internal/command_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,6 @@ package metadata
704704
705705
import (
706706
"go.opentelemetry.io/otel/metric"
707-
"go.opentelemetry.io/otel/metric/embedded"
708707
"go.opentelemetry.io/otel/trace"
709708
710709
"go.opentelemetry.io/collector/component"
@@ -737,7 +736,6 @@ package metadata
737736
738737
import (
739738
"go.opentelemetry.io/otel/metric"
740-
"go.opentelemetry.io/otel/metric/embedded"
741739
"go.opentelemetry.io/otel/trace"
742740
743741
"go.opentelemetry.io/collector/component"

cmd/mdatagen/internal/templates/metrics.go.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"go.opentelemetry.io/collector/component"
1313
"go.opentelemetry.io/collector/pdata/pcommon"
1414
"go.opentelemetry.io/collector/pdata/pmetric"
15-
{{- if or isReceiver isScraper }}
15+
{{- if or isReceiver isScraper isConnector }}
1616
"go.opentelemetry.io/collector/{{ .Status.Class }}"
1717
{{- end }}
1818
{{- if .SemConvVersion }}

cmd/mdatagen/internal/templates/telemetry.go.tmpl

+16-10
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,28 @@ package {{ .Package }}
44

55
import (
66
{{- if .Telemetry.Metrics }}
7-
{{- range $_, $metric := .Telemetry.Metrics }}
8-
{{- if $metric.Data.Async }}
7+
{{- range $_, $metric := .Telemetry.Metrics }}
8+
{{- if $metric.Data.Async }}
99
"context"
10-
"sync"
11-
12-
{{- break}}
13-
{{- end }}
14-
{{- end }}
10+
{{- break}}
11+
{{- end }}
12+
{{- end }}
1513
"errors"
14+
"sync"
1615
{{- end }}
1716

18-
"go.opentelemetry.io/otel/metric"
17+
"go.opentelemetry.io/otel/metric"
18+
{{- if .Telemetry.Metrics }}
19+
{{- range $_, $metric := .Telemetry.Metrics }}
20+
{{- if $metric.Data.Async }}
1921
"go.opentelemetry.io/otel/metric/embedded"
20-
"go.opentelemetry.io/otel/trace"
22+
{{- break}}
23+
{{- end }}
24+
{{- end }}
25+
{{- end }}
26+
"go.opentelemetry.io/otel/trace"
2127

22-
"go.opentelemetry.io/collector/component"
28+
"go.opentelemetry.io/collector/component"
2329
)
2430

2531
func Meter(settings component.TelemetrySettings) metric.Meter {

cmd/mdatagen/internal/templates/telemetrytest.go.tmpl

+14-14
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
package {{ .Package }}test
44

55
import (
6-
"testing"
7-
8-
"github.com/stretchr/testify/require"
9-
"go.opentelemetry.io/otel/sdk/metric/metricdata"
10-
"go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest"
11-
12-
{{- if or isConnector isExporter isExtension isProcessor isReceiver isScraper }}
13-
"go.opentelemetry.io/collector/component"
14-
{{- end }}
15-
"go.opentelemetry.io/collector/component/componenttest"
16-
{{- if or isConnector isExporter isExtension isProcessor isReceiver isScraper }}
17-
"go.opentelemetry.io/collector/{{ .Status.Class }}"
18-
"go.opentelemetry.io/collector/{{ .Status.Class }}/{{ .Status.Class }}test"
19-
{{- end }}
6+
"testing"
7+
8+
"github.com/stretchr/testify/require"
9+
"go.opentelemetry.io/otel/sdk/metric/metricdata"
10+
"go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest"
11+
12+
{{- if or isConnector isExporter isExtension isProcessor isReceiver isScraper }}
13+
"go.opentelemetry.io/collector/component"
14+
{{- end }}
15+
"go.opentelemetry.io/collector/component/componenttest"
16+
{{- if or isConnector isExporter isExtension isProcessor isReceiver isScraper }}
17+
"go.opentelemetry.io/collector/{{ .Status.Class }}"
18+
"go.opentelemetry.io/collector/{{ .Status.Class }}/{{ .Status.Class }}test"
19+
{{- end }}
2020
)
2121

2222
{{ if or isConnector isExporter isExtension isProcessor isReceiver isScraper }}

cmd/mdatagen/internal/templates/telemetrytest_test.go.tmpl

+15-8
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,22 @@
33
package {{ .Package }}test
44

55
import (
6-
"context"
7-
"testing"
6+
"context"
7+
"testing"
88

99
"github.com/stretchr/testify/require"
10-
"go.opentelemetry.io/otel/metric"
11-
"go.opentelemetry.io/otel/sdk/metric/metricdata"
12-
"go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest"
10+
{{- if .Telemetry.Metrics }}
11+
{{- range $_, $metric := .Telemetry.Metrics }}
12+
{{- if $metric.Data.Async }}
13+
"go.opentelemetry.io/otel/metric"
14+
{{- break}}
15+
{{- end }}
16+
{{- end }}
17+
{{- end }}
18+
"go.opentelemetry.io/otel/sdk/metric/metricdata"
19+
"go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest"
1320

14-
"go.opentelemetry.io/collector/component/componenttest"
21+
"go.opentelemetry.io/collector/component/componenttest"
1522
)
1623

1724
func TestSetupTelemetry(t *testing.T) {
@@ -21,12 +28,12 @@ func TestSetupTelemetry(t *testing.T) {
2128
defer tb.Shutdown()
2229

2330
{{- range $name, $metric := .Telemetry.Metrics }}
24-
{{- if $metric.Data.Async }}
31+
{{- if $metric.Data.Async }}
2532
require.NoError(t, tb.Register{{ $name.Render }}Callback(func(_ context.Context, observer metric.{{ casesTitle $metric.Data.BasicType }}Observer) error {
2633
observer.Observe(1)
2734
return nil
2835
}))
29-
{{- end }}
36+
{{- end }}
3037
{{- end }}
3138

3239
{{- range $name, $metric := .Telemetry.Metrics }}

0 commit comments

Comments
 (0)