Fix import order in generated code

open-telemetry · Sep 23, 2022 · ae490e7 · ae490e7
1 parent d56dffe
commit ae490e7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/cmd/builder/internal/builder/templates/components.go.tmpl b/cmd/builder/internal/builder/templates/components.go.tmpl
@@ -4,6 +4,9 @@ package main
 
 import (
 	"go.opentelemetry.io/collector/component"
+	{{- range .Connectors}}
+	{{.Name}} "{{.Import}}"
+	{{- end}}
 	{{- range .Exporters}}
 	{{.Name}} "{{.Import}}"
 	{{- end}}
@@ -16,9 +19,6 @@ import (
 	{{- range .Receivers}}
 	{{.Name}} "{{.Import}}"
 	{{- end}}
-	{{- range .Connectors}}
-	{{.Name}} "{{.Import}}"
-	{{- end}}
 )
 
 func components() (component.Factories, error) {

diff --git a/cmd/builder/internal/config/default.yaml b/cmd/builder/internal/config/default.yaml
@@ -26,7 +26,7 @@ processors:
   - import: go.opentelemetry.io/collector/processor/memorylimiterprocessor
     gomod: go.opentelemetry.io/collector v0.60.0
 connectors:
-  - import: go.opentelemetry.io/collector/connector/nopconnector
-    gomod: go.opentelemetry.io/collector v0.60.0
   - import: go.opentelemetry.io/collector/connector/countconnector
     gomod: go.opentelemetry.io/collector v0.60.0
+  - import: go.opentelemetry.io/collector/connector/nopconnector
+    gomod: go.opentelemetry.io/collector v0.60.0
diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml
@@ -26,10 +26,10 @@ processors:
   - import: go.opentelemetry.io/collector/processor/memorylimiterprocessor
     gomod: go.opentelemetry.io/collector v0.60.0
 connectors:
-  - import: go.opentelemetry.io/collector/connector/nopconnector
-    gomod: go.opentelemetry.io/collector v0.60.0
   - import: go.opentelemetry.io/collector/connector/countconnector
     gomod: go.opentelemetry.io/collector v0.60.0
+  - import: go.opentelemetry.io/collector/connector/nopconnector
+    gomod: go.opentelemetry.io/collector v0.60.0
 
 replaces:
   - go.opentelemetry.io/collector => ../../

diff --git a/cmd/otelcorecol/components.go b/cmd/otelcorecol/components.go
diff --git a/connector/countconnector/count.go b/connector/countconnector/count.go
@@ -19,12 +19,11 @@ import (
 	"fmt"
 	"time"
 
-	"go.opentelemetry.io/collector/pdata/pcommon"
-
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/internal/sharedcomponent"
+	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/plog"
 	"go.opentelemetry.io/collector/pdata/pmetric"
 	"go.opentelemetry.io/collector/pdata/ptrace"
@@ -184,7 +183,7 @@ func newCountMetric(signalType string, count int) pmetric.Metrics {
 	sum.SetAggregationTemporality(pmetric.MetricAggregationTemporalityDelta)
 	dp := sum.DataPoints().AppendEmpty()
 	dp.Attributes().PutString("signal.type", signalType)
-	dp.SetIntVal(int64(count))
+	dp.SetIntValue(int64(count))
 	dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Now()))
 	return ms
 }