Skip to content

Commit

Permalink
Use ComponentID as identifier instead of config
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
  • Loading branch information
bogdandrutu committed Jul 22, 2021
1 parent cfbb0f6 commit 3bed593
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
8 changes: 4 additions & 4 deletions service/internal/builder/exporters_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (bexp *builtExporter) getLogExporter() component.LogsExporter {
}

// Exporters is a map of exporters created from exporter configs.
type Exporters map[config.Exporter]*builtExporter
type Exporters map[config.ComponentID]*builtExporter

// StartAll starts all exporters.
func (exps Exporters) StartAll(ctx context.Context, host component.Host) error {
Expand Down Expand Up @@ -121,9 +121,9 @@ func (exps Exporters) ToMapByDataType() map[config.DataType]map[config.Component
exportersMap[config.MetricsDataType] = make(map[config.ComponentID]component.Exporter, len(exps))
exportersMap[config.LogsDataType] = make(map[config.ComponentID]component.Exporter, len(exps))

for cfg, bexp := range exps {
for expID, bexp := range exps {
for t, exp := range bexp.expByDataType {
exportersMap[t][cfg.ID()] = exp
exportersMap[t][expID] = exp
}
}

Expand Down Expand Up @@ -175,7 +175,7 @@ func BuildExporters(
return nil, err
}

exporters[expCfg] = exp
exporters[expID] = exp
}

return exporters, nil
Expand Down
8 changes: 4 additions & 4 deletions service/internal/builder/extensions_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func (ext *builtExtension) Shutdown(ctx context.Context) error {
var _ component.Extension = (*builtExtension)(nil)

// Extensions is a map of extensions created from extension configs.
type Extensions map[config.Extension]*builtExtension
type Extensions map[config.ComponentID]*builtExtension

// StartAll starts all exporters.
func (exts Extensions) StartAll(ctx context.Context, host component.Host) error {
Expand Down Expand Up @@ -105,8 +105,8 @@ func (exts Extensions) NotifyPipelineNotReady() error {

func (exts Extensions) ToMap() map[config.ComponentID]component.Extension {
result := make(map[config.ComponentID]component.Extension, len(exts))
for k, v := range exts {
result[k.ID()] = v.extension
for extID, v := range exts {
result[extID] = v.extension
}
return result
}
Expand Down Expand Up @@ -143,7 +143,7 @@ func BuildExtensions(
return nil, err
}

extensions[extCfg] = ext
extensions[extID] = ext
}

return extensions, nil
Expand Down
5 changes: 3 additions & 2 deletions service/internal/builder/receivers_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ var errUnusedReceiver = errors.New("receiver defined but not used by any pipelin
// builtReceiver is a receiver that is built based on a config. It can have
// a trace and/or a metrics component.
type builtReceiver struct {
id config.ComponentID
logger *zap.Logger
receiver component.Receiver
}
Expand All @@ -50,7 +51,7 @@ func (rcv *builtReceiver) Shutdown(ctx context.Context) error {
}

// Receivers is a map of receivers created from receiver configs.
type Receivers map[config.Receiver]*builtReceiver
type Receivers map[config.ComponentID]*builtReceiver

// ShutdownAll stops all receivers.
func (rcvs Receivers) ShutdownAll(ctx context.Context) error {
Expand Down Expand Up @@ -112,7 +113,7 @@ func BuildReceivers(
}
return nil, err
}
receivers[recvCfg] = rcv
receivers[recvID] = rcv
}

return receivers, nil
Expand Down

0 comments on commit 3bed593

Please sign in to comment.