Remove NeedsServices from components

CHANGELOG.md

@@ -101,6 +101,10 @@ Main (unreleased)
 
 - Improved resilience of graph evaluation in presence of slow components. (@thampiotr)
 
+- The `http` config block may now reference exports from any component.
+  Previously, only `remote.*` and `local.*` components could be referenced
+  without a circular dependency. (@rfratto)
+
 ### Bugfixes
 
 - Set exit code 1 on grafana-agentctl non-runnable command. (@fgouteroux)
@@ -156,7 +160,7 @@ v0.37.4 (2023-11-06)
 - Fix a bug where reloading the configuration of a `loki.write` component lead
   to a panic. (@tpaschalis)
 
-- Added Kubernetes service resolver to static node's loadbalancing exporter 
+- Added Kubernetes service resolver to static node's loadbalancing exporter
   and to Flow's `otelcol.exporter.loadbalancing`. (@ptodev)
 
 v0.37.3 (2023-10-26)

component/loki/source/kubernetes/kubernetes.go

@@ -24,9 +24,8 @@ import (
 
 func init() {
 	component.Register(component.Registration{
-		Name:          "loki.source.kubernetes",
-		Args:          Arguments{},
-		NeedsServices: []string{cluster.ServiceName},
+		Name: "loki.source.kubernetes",
+		Args: Arguments{},
 
 		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
 			return New(opts, args.(Arguments))

component/loki/source/podlogs/podlogs.go

@@ -26,9 +26,8 @@ import (
 
 func init() {
 	component.Register(component.Registration{
-		Name:          "loki.source.podlogs",
-		Args:          Arguments{},
-		NeedsServices: []string{cluster.ServiceName},
+		Name: "loki.source.podlogs",
+		Args: Arguments{},
 
 		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
 			return New(opts, args.(Arguments))

component/module/file/file.go

@@ -9,19 +9,14 @@ import (
 	"github.com/grafana/agent/component"
 	"github.com/grafana/agent/component/local/file"
 	"github.com/grafana/agent/component/module"
-	"github.com/grafana/agent/service/cluster"
-	"github.com/grafana/agent/service/http"
-	"github.com/grafana/agent/service/labelstore"
-	otel_service "github.com/grafana/agent/service/otel"
 	"github.com/grafana/river/rivertypes"
 )
 
 func init() {
 	component.Register(component.Registration{
-		Name:          "module.file",
-		Args:          Arguments{},
-		Exports:       module.Exports{},
-		NeedsServices: []string{http.ServiceName, cluster.ServiceName, otel_service.ServiceName, labelstore.ServiceName},
+		Name:    "module.file",
+		Args:    Arguments{},
+		Exports: module.Exports{},
 
 		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
 			return New(opts, args.(Arguments))

component/module/git/git.go

@@ -13,18 +13,13 @@ import (
 	"github.com/grafana/agent/component/module"
 	"github.com/grafana/agent/component/module/git/internal/vcs"
 	"github.com/grafana/agent/pkg/flow/logging/level"
-	"github.com/grafana/agent/service/cluster"
-	"github.com/grafana/agent/service/http"
-	"github.com/grafana/agent/service/labelstore"
-	otel_service "github.com/grafana/agent/service/otel"
 )
 
 func init() {
 	component.Register(component.Registration{
-		Name:          "module.git",
-		Args:          Arguments{},
-		Exports:       module.Exports{},
-		NeedsServices: []string{http.ServiceName, cluster.ServiceName, otel_service.ServiceName, labelstore.ServiceName},
+		Name:    "module.git",
+		Args:    Arguments{},
+		Exports: module.Exports{},
 
 		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
 			return New(opts, args.(Arguments))

component/module/http/http.go

@@ -9,19 +9,14 @@ import (
 	"github.com/grafana/agent/component"
 	"github.com/grafana/agent/component/module"
 	remote_http "github.com/grafana/agent/component/remote/http"
-	"github.com/grafana/agent/service/cluster"
-	http_service "github.com/grafana/agent/service/http"
-	"github.com/grafana/agent/service/labelstore"
-	otel_service "github.com/grafana/agent/service/otel"
 	"github.com/grafana/river/rivertypes"
 )
 
 func init() {
 	component.Register(component.Registration{
-		Name:          "module.http",
-		Args:          Arguments{},
-		Exports:       module.Exports{},
-		NeedsServices: []string{http_service.ServiceName, cluster.ServiceName, otel_service.ServiceName, labelstore.ServiceName},
+		Name:    "module.http",
+		Args:    Arguments{},
+		Exports: module.Exports{},
 
 		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
 			return New(opts, args.(Arguments))

component/module/string/string.go

@@ -5,19 +5,14 @@ import (
 
 	"github.com/grafana/agent/component"
 	"github.com/grafana/agent/component/module"
-	"github.com/grafana/agent/service/cluster"
-	"github.com/grafana/agent/service/http"
-	"github.com/grafana/agent/service/labelstore"
-	otel_service "github.com/grafana/agent/service/otel"
 	"github.com/grafana/river/rivertypes"
 )
 
 func init() {
 	component.Register(component.Registration{
-		Name:          "module.string",
-		Args:          Arguments{},
-		Exports:       module.Exports{},
-		NeedsServices: []string{http.ServiceName, cluster.ServiceName, otel_service.ServiceName, labelstore.ServiceName},
+		Name:    "module.string",
+		Args:    Arguments{},
+		Exports: module.Exports{},
 
 		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
 			return New(opts, args.(Arguments))

component/otelcol/auth/basic/basic.go

@@ -4,7 +4,6 @@ package basic
 import (
 	"github.com/grafana/agent/component"
 	"github.com/grafana/agent/component/otelcol/auth"
-	otel_service "github.com/grafana/agent/service/otel"
 	"github.com/grafana/river/rivertypes"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension"
 	otelcomponent "go.opentelemetry.io/collector/component"
@@ -14,10 +13,9 @@ import (
 
 func init() {
 	component.Register(component.Registration{
-		Name:          "otelcol.auth.basic",
-		Args:          Arguments{},
-		Exports:       auth.Exports{},
-		NeedsServices: []string{otel_service.ServiceName},
+		Name:    "otelcol.auth.basic",
+		Args:    Arguments{},
+		Exports: auth.Exports{},
 
 		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
 			fact := basicauthextension.NewFactory()

component/otelcol/auth/bearer/bearer.go

@@ -4,7 +4,6 @@ package bearer
 import (
 	"github.com/grafana/agent/component"
 	"github.com/grafana/agent/component/otelcol/auth"
-	otel_service "github.com/grafana/agent/service/otel"
 	"github.com/grafana/river/rivertypes"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension"
 	otelcomponent "go.opentelemetry.io/collector/component"
@@ -14,10 +13,9 @@ import (
 
 func init() {
 	component.Register(component.Registration{
-		Name:          "otelcol.auth.bearer",
-		Args:          Arguments{},
-		Exports:       auth.Exports{},
-		NeedsServices: []string{otel_service.ServiceName},
+		Name:    "otelcol.auth.bearer",
+		Args:    Arguments{},
+		Exports: auth.Exports{},
 
 		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
 			fact := bearertokenauthextension.NewFactory()

component/otelcol/auth/headers/headers.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/grafana/agent/component"
 	"github.com/grafana/agent/component/otelcol/auth"
-	otel_service "github.com/grafana/agent/service/otel"
 	"github.com/grafana/river"
 	"github.com/grafana/river/rivertypes"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension"
@@ -18,10 +17,9 @@ import (
 
 func init() {
 	component.Register(component.Registration{
-		Name:          "otelcol.auth.headers",
-		Args:          Arguments{},
-		Exports:       auth.Exports{},
-		NeedsServices: []string{otel_service.ServiceName},
+		Name:    "otelcol.auth.headers",
+		Args:    Arguments{},
+		Exports: auth.Exports{},
 
 		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
 			fact := headerssetterextension.NewFactory()

component/otelcol/auth/oauth2/oauth2.go

@@ -7,7 +7,6 @@ import (
 	"github.com/grafana/agent/component"
 	"github.com/grafana/agent/component/otelcol"
 	"github.com/grafana/agent/component/otelcol/auth"
-	otel_service "github.com/grafana/agent/service/otel"
 	"github.com/grafana/river/rivertypes"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension"
 	otelcomponent "go.opentelemetry.io/collector/component"
@@ -17,10 +16,9 @@ import (
 
 func init() {
 	component.Register(component.Registration{
-		Name:          "otelcol.auth.oauth2",
-		Args:          Arguments{},
-		Exports:       auth.Exports{},
-		NeedsServices: []string{otel_service.ServiceName},
+		Name:    "otelcol.auth.oauth2",
+		Args:    Arguments{},
+		Exports: auth.Exports{},
 
 		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
 			fact := oauth2clientauthextension.NewFactory()

component/otelcol/auth/sigv4/sigv4.go

@@ -3,18 +3,16 @@ package sigv4
 import (
 	"github.com/grafana/agent/component"
 	"github.com/grafana/agent/component/otelcol/auth"
-	otel_service "github.com/grafana/agent/service/otel"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension"
 	otelcomponent "go.opentelemetry.io/collector/component"
 	otelextension "go.opentelemetry.io/collector/extension"
 )
 
 func init() {
 	component.Register(component.Registration{
-		Name:          "otelcol.auth.sigv4",
-		Args:          Arguments{},
-		Exports:       auth.Exports{},
-		NeedsServices: []string{otel_service.ServiceName},
+		Name:    "otelcol.auth.sigv4",
+		Args:    Arguments{},
+		Exports: auth.Exports{},
 
 		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
 			fact := sigv4authextension.NewFactory()

component/otelcol/connector/servicegraph/servicegraph.go

@@ -7,7 +7,6 @@ import (
 	"github.com/grafana/agent/component"
 	"github.com/grafana/agent/component/otelcol"
 	"github.com/grafana/agent/component/otelcol/connector"
-	otel_service "github.com/grafana/agent/service/otel"
 	"github.com/grafana/river"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor"
@@ -17,10 +16,9 @@ import (
 
 func init() {
 	component.Register(component.Registration{
-		Name:          "otelcol.connector.servicegraph",
-		Args:          Arguments{},
-		Exports:       otelcol.ConsumerExports{},
-		NeedsServices: []string{otel_service.ServiceName},
+		Name:    "otelcol.connector.servicegraph",
+		Args:    Arguments{},
+		Exports: otelcol.ConsumerExports{},
 
 		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
 			fact := servicegraphconnector.NewFactory()

component/otelcol/connector/spanmetrics/spanmetrics.go

@@ -8,7 +8,6 @@ import (
 	"github.com/grafana/agent/component"
 	"github.com/grafana/agent/component/otelcol"
 	"github.com/grafana/agent/component/otelcol/connector"
-	otel_service "github.com/grafana/agent/service/otel"
 	"github.com/grafana/river"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector"
 	otelcomponent "go.opentelemetry.io/collector/component"
@@ -17,10 +16,9 @@ import (
 
 func init() {
 	component.Register(component.Registration{
-		Name:          "otelcol.connector.spanmetrics",
-		Args:          Arguments{},
-		Exports:       otelcol.ConsumerExports{},
-		NeedsServices: []string{otel_service.ServiceName},
+		Name:    "otelcol.connector.spanmetrics",
+		Args:    Arguments{},
+		Exports: otelcol.ConsumerExports{},
 
 		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
 			fact := spanmetricsconnector.NewFactory()

component/otelcol/exporter/loadbalancing/loadbalancing.go

@@ -10,7 +10,6 @@ import (
 	"github.com/grafana/agent/component/otelcol"
 	"github.com/grafana/agent/component/otelcol/auth"
 	"github.com/grafana/agent/component/otelcol/exporter"
-	otel_service "github.com/grafana/agent/service/otel"
 	"github.com/grafana/river"
 	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter"
 	otelcomponent "go.opentelemetry.io/collector/component"
@@ -24,10 +23,9 @@ import (
 
 func init() {
 	component.Register(component.Registration{
-		Name:          "otelcol.exporter.loadbalancing",
-		Args:          Arguments{},
-		Exports:       otelcol.ConsumerExports{},
-		NeedsServices: []string{otel_service.ServiceName},
+		Name:    "otelcol.exporter.loadbalancing",
+		Args:    Arguments{},
+		Exports: otelcol.ConsumerExports{},
 
 		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
 			fact := loadbalancingexporter.NewFactory()

component/otelcol/exporter/logging/logging.go

@@ -5,7 +5,6 @@ import (
 	"github.com/grafana/agent/component"
 	"github.com/grafana/agent/component/otelcol"
 	"github.com/grafana/agent/component/otelcol/exporter"
-	otel_service "github.com/grafana/agent/service/otel"
 	otelcomponent "go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/configtelemetry"
 	loggingexporter "go.opentelemetry.io/collector/exporter/loggingexporter"
@@ -14,10 +13,9 @@ import (
 
 func init() {
 	component.Register(component.Registration{
-		Name:          "otelcol.exporter.logging",
-		Args:          Arguments{},
-		Exports:       otelcol.ConsumerExports{},
-		NeedsServices: []string{otel_service.ServiceName},
+		Name:    "otelcol.exporter.logging",
+		Args:    Arguments{},
+		Exports: otelcol.ConsumerExports{},
 
 		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
 			fact := loggingexporter.NewFactory()

component/otelcol/exporter/otlp/otlp.go

@@ -7,7 +7,6 @@ import (
 	"github.com/grafana/agent/component"
 	"github.com/grafana/agent/component/otelcol"
 	"github.com/grafana/agent/component/otelcol/exporter"
-	otel_service "github.com/grafana/agent/service/otel"
 	otelcomponent "go.opentelemetry.io/collector/component"
 	otelpexporterhelper "go.opentelemetry.io/collector/exporter/exporterhelper"
 	"go.opentelemetry.io/collector/exporter/otlpexporter"
@@ -16,10 +15,9 @@ import (
 
 func init() {
 	component.Register(component.Registration{
-		Name:          "otelcol.exporter.otlp",
-		Args:          Arguments{},
-		Exports:       otelcol.ConsumerExports{},
-		NeedsServices: []string{otel_service.ServiceName},
+		Name:    "otelcol.exporter.otlp",
+		Args:    Arguments{},
+		Exports: otelcol.ConsumerExports{},
 
 		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
 			fact := otlpexporter.NewFactory()

component/otelcol/exporter/otlphttp/otlphttp.go

@@ -8,18 +8,16 @@ import (
 	"github.com/grafana/agent/component"
 	"github.com/grafana/agent/component/otelcol"
 	"github.com/grafana/agent/component/otelcol/exporter"
-	otel_service "github.com/grafana/agent/service/otel"
 	otelcomponent "go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/exporter/otlphttpexporter"
 	otelextension "go.opentelemetry.io/collector/extension"
 )
 
 func init() {
 	component.Register(component.Registration{
-		Name:          "otelcol.exporter.otlphttp",
-		Args:          Arguments{},
-		Exports:       otelcol.ConsumerExports{},
-		NeedsServices: []string{otel_service.ServiceName},
+		Name:    "otelcol.exporter.otlphttp",
+		Args:    Arguments{},
+		Exports: otelcol.ConsumerExports{},
 
 		Build: func(opts component.Options, args component.Arguments) (component.Component, error) {
 			fact := otlphttpexporter.NewFactory()

component/otelcol/exporter/prometheus/prometheus.go

@@ -19,10 +19,10 @@ import (
 
 func init() {
 	component.Register(component.Registration{
-		Name:          "otelcol.exporter.prometheus",
-		Args:          Arguments{},
-		Exports:       otelcol.ConsumerExports{},
-		NeedsServices: []string{labelstore.ServiceName},
+		Name:    "otelcol.exporter.prometheus",
+		Args:    Arguments{},
+		Exports: otelcol.ConsumerExports{},
+
 		Build: func(o component.Options, a component.Arguments) (component.Component, error) {
 			return New(o, a.(Arguments))
 		},