Skip to content

Commit

Permalink
Rename OpenTelemetryController to Controller
Browse files Browse the repository at this point in the history
  • Loading branch information
damemi committed Sep 4, 2024
1 parent a89be2d commit 8a29214
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions instrumentation.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ type instConfig struct {
loadIndicator chan struct{}
logLevel LogLevel
cp config.Provider
otelController otelauto.OpenTelemetryController
otelController otelauto.Controller
}

func newInstConfig(ctx context.Context, opts []InstrumentationOption) (instConfig, error) {
Expand Down Expand Up @@ -344,7 +344,7 @@ func (o fnOpt) apply(ctx context.Context, c instConfig) (instConfig, error) { re

// WithOpenTelemetryController returns an [InstrumentationOption] defining the
// OpenTelemetryController used by [Instrumentation].
func WithOpenTelemetryController(ctrl otelauto.OpenTelemetryController) InstrumentationOption {
func WithOpenTelemetryController(ctrl otelauto.Controller) InstrumentationOption {
return fnOpt(func(_ context.Context, c instConfig) (instConfig, error) {
c.otelController = ctrl
return c, nil
Expand Down
4 changes: 2 additions & 2 deletions internal/pkg/instrumentation/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const (
type Manager struct {
logger logr.Logger
probes map[probe.ID]probe.Probe
otelController otelauto.OpenTelemetryController
otelController otelauto.Controller
globalImpl bool
loadedIndicator chan struct{}
cp config.Provider
Expand All @@ -63,7 +63,7 @@ type Manager struct {
}

// NewManager returns a new [Manager].
func NewManager(logger logr.Logger, otelController otelauto.OpenTelemetryController, globalImpl bool, loadIndicator chan struct{}, cp config.Provider) (*Manager, error) {
func NewManager(logger logr.Logger, otelController otelauto.Controller, globalImpl bool, loadIndicator chan struct{}, cp config.Provider) (*Manager, error) {
logger = logger.WithName("Manager")
m := &Manager{
logger: logger,
Expand Down
6 changes: 3 additions & 3 deletions pkg/opentelemetry/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import (
"go.opentelemetry.io/auto/pkg/probe"
)

// OpenTelemetryController is a controller that converts probe Events to
// Controller is a controller that converts probe Events to
// OpenTelemetry spans and exports them.
type OpenTelemetryController interface {
type Controller interface {
// Trace receives a probe.Event and handles conversion to OpenTelemetry
// format and exporting.
Trace(event *probe.Event)

// Shutdown shuts down the OpenTelemetry TracerProvider.
Shutdown(ctx context.Context) error
}
}

0 comments on commit 8a29214

Please sign in to comment.