diff --git a/cmd/builder/internal/builder/templates/components.go.tmpl b/cmd/builder/internal/builder/templates/components.go.tmpl index 39c9141a6e9..08d5e038f35 100644 --- 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 index b2582c5755b..4d816937194 100644 --- 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 index bcd27fab7b0..0c4ae35c908 100644 --- 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 index ca897250c35..54174bc092e 100644 --- a/cmd/otelcorecol/components.go +++ b/cmd/otelcorecol/components.go @@ -4,6 +4,8 @@ package main import ( "go.opentelemetry.io/collector/component" + countconnector "go.opentelemetry.io/collector/connector/countconnector" + nopconnector "go.opentelemetry.io/collector/connector/nopconnector" loggingexporter "go.opentelemetry.io/collector/exporter/loggingexporter" otlpexporter "go.opentelemetry.io/collector/exporter/otlpexporter" otlphttpexporter "go.opentelemetry.io/collector/exporter/otlphttpexporter" @@ -12,8 +14,6 @@ import ( batchprocessor "go.opentelemetry.io/collector/processor/batchprocessor" memorylimiterprocessor "go.opentelemetry.io/collector/processor/memorylimiterprocessor" otlpreceiver "go.opentelemetry.io/collector/receiver/otlpreceiver" - nopconnector "go.opentelemetry.io/collector/connector/nopconnector" - countconnector "go.opentelemetry.io/collector/connector/countconnector" ) func components() (component.Factories, error) { @@ -29,8 +29,8 @@ func components() (component.Factories, error) { } factories.Connectors, err = component.MakeConnectorFactoryMap( - nopconnector.NewFactory(), countconnector.NewFactory(), + nopconnector.NewFactory(), ) if err != nil { return component.Factories{}, err @@ -38,8 +38,8 @@ func components() (component.Factories, error) { factories.Receivers, err = component.MakeReceiverFactoryMap( otlpreceiver.NewFactory(), - nopconnector.NewFactory().NewReceiverFactory(), countconnector.NewFactory().NewReceiverFactory(), + nopconnector.NewFactory().NewReceiverFactory(), ) if err != nil { return component.Factories{}, err @@ -49,8 +49,8 @@ func components() (component.Factories, error) { loggingexporter.NewFactory(), otlpexporter.NewFactory(), otlphttpexporter.NewFactory(), - nopconnector.NewFactory().NewExporterFactory(), countconnector.NewFactory().NewExporterFactory(), + nopconnector.NewFactory().NewExporterFactory(), ) if err != nil { return component.Factories{}, err diff --git a/connector/countconnector/count.go b/connector/countconnector/count.go index 6fca12f40fb..ca351a12559 100644 --- 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 }