Move probe initialization to auto

instrumentation.go

@@ -25,6 +25,16 @@ import (
 	semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
 
 	"go.opentelemetry.io/auto/internal/pkg/instrumentation"
+	dbSql "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/database/sql"
+	kafkaConsumer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer"
+	kafkaProducer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer"
+	autosdk "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/go.opentelemetry.io/auto/sdk"
+	otelTraceGlobal "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal"
+	grpcClient "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/google.golang.org/grpc/client"
+	grpcServer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/google.golang.org/grpc/server"
+	httpClient "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/net/http/client"
+	httpServer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/net/http/server"
+	"go.opentelemetry.io/auto/internal/pkg/instrumentation/probe"
 	"go.opentelemetry.io/auto/internal/pkg/opentelemetry"
 	"go.opentelemetry.io/auto/internal/pkg/process"
 )
@@ -79,8 +89,23 @@ func NewInstrumentation(ctx context.Context, opts ...InstrumentationOption) (*In
 		return nil, err
 	}
 
+	p := []probe.Probe{
+		grpcClient.New(c.logger, Version()),
+		grpcServer.New(c.logger, Version()),
+		httpServer.New(c.logger, Version()),
+		httpClient.New(c.logger, Version()),
+		dbSql.New(c.logger, Version()),
+		kafkaProducer.New(c.logger, Version()),
+		kafkaConsumer.New(c.logger, Version()),
+		autosdk.New(c.logger),
+	}
+
+	if c.globalImpl {
+		p = append(p, otelTraceGlobal.New(c.logger))
+	}
+
 	cp := convertConfigProvider(c.cp)
-	mngr, err := instrumentation.NewManager(c.logger, ctrl, c.globalImpl, cp, Version())
+	mngr, err := instrumentation.NewManager(c.logger, ctrl, cp, p...)
 	if err != nil {
 		return nil, err
 	}

internal/pkg/instrumentation/manager.go

@@ -15,15 +15,6 @@ import (
 
 	"go.opentelemetry.io/otel/trace"
 
-	dbSql "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/database/sql"
-	kafkaConsumer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer"
-	kafkaProducer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer"
-	autosdk "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/go.opentelemetry.io/auto/sdk"
-	otelTraceGlobal "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal"
-	grpcClient "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/google.golang.org/grpc/client"
-	grpcServer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/google.golang.org/grpc/server"
-	httpClient "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/net/http/client"
-	httpServer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/net/http/server"
 	"go.opentelemetry.io/auto/internal/pkg/instrumentation/bpffs"
 	"go.opentelemetry.io/auto/internal/pkg/instrumentation/probe"
 	"go.opentelemetry.io/auto/internal/pkg/opentelemetry"
@@ -50,10 +41,8 @@ const (
 // Manager handles the management of [probe.Probe] instances.
 type Manager struct {
 	logger          *slog.Logger
-	version         string
 	probes          map[probe.ID]probe.Probe
 	otelController  *opentelemetry.Controller
-	globalImpl      bool
 	cp              ConfigProvider
 	exe             *link.Executable
 	proc            *process.Info
@@ -66,17 +55,15 @@ type Manager struct {
 }
 
 // NewManager returns a new [Manager].
-func NewManager(logger *slog.Logger, otelController *opentelemetry.Controller, globalImpl bool, cp ConfigProvider, version string) (*Manager, error) {
+func NewManager(logger *slog.Logger, otelController *opentelemetry.Controller, cp ConfigProvider, probes ...probe.Probe) (*Manager, error) {
 	m := &Manager{
 		logger:         logger,
-		version:        version,
 		probes:         make(map[probe.ID]probe.Probe),
 		otelController: otelController,
-		globalImpl:     globalImpl,
 		cp:             cp,
 	}
 
-	err := m.registerProbes()
+	err := m.registerProbes(probes)
 	if err != nil {
 		return nil, err
 	}
@@ -410,27 +397,8 @@ func (m *Manager) cleanup(target *process.Info) error {
 	return errors.Join(err, bpffsCleanup(target))
 }
 
-func (m *Manager) availableProbes() []probe.Probe {
-	p := []probe.Probe{
-		grpcClient.New(m.logger, m.version),
-		grpcServer.New(m.logger, m.version),
-		httpServer.New(m.logger, m.version),
-		httpClient.New(m.logger, m.version),
-		dbSql.New(m.logger, m.version),
-		kafkaProducer.New(m.logger, m.version),
-		kafkaConsumer.New(m.logger, m.version),
-		autosdk.New(m.logger),
-	}
-
-	if m.globalImpl {
-		p = append(p, otelTraceGlobal.New(m.logger))
-	}
-
-	return p
-}
-
-func (m *Manager) registerProbes() error {
-	for _, p := range m.availableProbes() {
+func (m *Manager) registerProbes(probes []probe.Probe) error {
+	for _, p := range probes {
 		if err := m.registerProbe(p); err != nil {
 			return err
 		}

internal/pkg/instrumentation/manager_load_test.go

@@ -13,6 +13,15 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/auto/internal/pkg/inject"
+	dbSql "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/database/sql"
+	kafkaConsumer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer"
+	kafkaProducer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer"
+	autosdk "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/go.opentelemetry.io/auto/sdk"
+	otelTraceGlobal "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal"
+	grpcClient "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/google.golang.org/grpc/client"
+	grpcServer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/google.golang.org/grpc/server"
+	httpClient "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/net/http/client"
+	httpServer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/net/http/server"
 	"go.opentelemetry.io/auto/internal/pkg/instrumentation/testutils"
 	"go.opentelemetry.io/auto/internal/pkg/instrumentation/utils"
 )
@@ -23,10 +32,7 @@ func TestLoadProbes(t *testing.T) {
 	t.Logf("Running on kernel %s", ver.String())
 	m := fakeManager(t)
 
-	probes := m.availableProbes()
-	assert.NotEmpty(t, probes)
-
-	for _, p := range probes {
+	for _, p := range m.probes {
 		manifest := p.Manifest()
 		fields := manifest.StructFields
 		offsets := map[string]*semver.Version{}
@@ -46,7 +52,19 @@ func TestLoadProbes(t *testing.T) {
 }
 
 func fakeManager(t *testing.T) *Manager {
-	m, err := NewManager(slog.Default(), nil, true, NewNoopConfigProvider(nil), "")
+	logger := slog.Default()
+	m, err := NewManager(
+		logger, nil, NewNoopConfigProvider(nil),
+		grpcClient.New(logger, ""),
+		grpcServer.New(logger, ""),
+		httpServer.New(logger, ""),
+		httpClient.New(logger, ""),
+		dbSql.New(logger, ""),
+		kafkaProducer.New(logger, ""),
+		kafkaConsumer.New(logger, ""),
+		autosdk.New(logger),
+		otelTraceGlobal.New(logger),
+	)
 	assert.NoError(t, err)
 	assert.NotNil(t, m)
 

internal/pkg/instrumentation/manager_test.go

@@ -22,6 +22,15 @@ import (
 	"go.opentelemetry.io/otel/trace"
 	"go.opentelemetry.io/otel/trace/noop"
 
+	dbSql "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/database/sql"
+	kafkaConsumer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer"
+	kafkaProducer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer"
+	autosdk "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/go.opentelemetry.io/auto/sdk"
+	otelTraceGlobal "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal"
+	grpcClient "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/google.golang.org/grpc/client"
+	grpcServer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/google.golang.org/grpc/server"
+	httpClient "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/net/http/client"
+	httpServer "go.opentelemetry.io/auto/internal/pkg/instrumentation/bpf/net/http/server"
 	"go.opentelemetry.io/auto/internal/pkg/instrumentation/probe"
 	"go.opentelemetry.io/auto/internal/pkg/instrumentation/probe/sampling"
 	"go.opentelemetry.io/auto/internal/pkg/opentelemetry"
@@ -184,7 +193,19 @@ func TestDependencyChecks(t *testing.T) {
 }
 
 func fakeManager(t *testing.T) *Manager {
-	m, err := NewManager(slog.Default(), nil, true, NewNoopConfigProvider(nil), "")
+	logger := slog.Default()
+	m, err := NewManager(
+		logger, nil, NewNoopConfigProvider(nil),
+		grpcClient.New(logger, ""),
+		grpcServer.New(logger, ""),
+		httpServer.New(logger, ""),
+		httpClient.New(logger, ""),
+		dbSql.New(logger, ""),
+		kafkaProducer.New(logger, ""),
+		kafkaConsumer.New(logger, ""),
+		autosdk.New(logger),
+		otelTraceGlobal.New(logger),
+	)
 	assert.NoError(t, err)
 	assert.NotNil(t, m)