Skip to content

Commit 1297b0c

Browse files
AndersonQmergify[bot]
authored andcommitted
Fix status reporter initialization (#1341)
(cherry picked from commit 177b5fb)
1 parent cde10a7 commit 1297b0c

File tree

2 files changed

+25
-6
lines changed

2 files changed

+25
-6
lines changed

internal/pkg/core/status/reporter.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,11 @@ type controller struct {
8888
// NewController creates a new reporter.
8989
func NewController(log *logger.Logger) Controller {
9090
return &controller{
91-
status: Healthy,
92-
reporters: make(map[string]*reporter),
93-
appReporters: make(map[string]*reporter),
94-
log: log,
91+
status: Healthy,
92+
reporters: make(map[string]*reporter),
93+
localReporters: make(map[string]*reporter),
94+
appReporters: make(map[string]*reporter),
95+
log: log,
9596
}
9697
}
9798

@@ -154,12 +155,12 @@ func (r *controller) RegisterLocalComponent(componentIdentifier string) Reporter
154155
return rep
155156
}
156157

157-
// Register registers new component for status updates.
158+
// RegisterComponent registers new component for status updates.
158159
func (r *controller) RegisterComponent(componentIdentifier string) Reporter {
159160
return r.RegisterComponentWithPersistance(componentIdentifier, false)
160161
}
161162

162-
// Register registers new component for status updates.
163+
// RegisterComponentWithPersistance registers new component for status updates.
163164
func (r *controller) RegisterComponentWithPersistance(componentIdentifier string, persistent bool) Reporter {
164165
id := componentIdentifier + "-" + uuid.New().String()[:8]
165166
rep := &reporter{

internal/pkg/core/status/reporter_test.go

+18
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,24 @@ import (
1414
"github.com/elastic/elastic-agent/pkg/core/logger"
1515
)
1616

17+
func TestNewController_ensure_all_is_initialzed(t *testing.T) {
18+
l, _ := logger.New("", false)
19+
20+
newController := NewController(l)
21+
22+
c, ok := newController.(*controller)
23+
if !ok {
24+
t.Fatalf("expected c %T, not c %T", controller{}, newController)
25+
}
26+
27+
c.reporters["ignore"] = &reporter{}
28+
c.localReporters["ignore"] = &reporter{}
29+
c.appReporters["ignore"] = &reporter{}
30+
if c.log == nil {
31+
t.Error("logger shouldn't be nil, it was not correctly assigned")
32+
}
33+
}
34+
1735
func TestReporter(t *testing.T) {
1836
l, _ := logger.New("", false)
1937
t.Run("healthy by default", func(t *testing.T) {

0 commit comments

Comments
 (0)