Skip to content

Commit 2185a45

Browse files
committed
Add test case to update metadata
1 parent 5bcbb9b commit 2185a45

File tree

2 files changed

+29
-5
lines changed

2 files changed

+29
-5
lines changed

pkg/entity/register/worker.go

+8-5
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,13 @@ func (w *worker) Run(ctx context.Context) {
106106
}
107107
}
108108
}
109+
func updateEntityMetadata(entity *entity.Fields, labels map[string]string) {
110+
if len(labels) > 0 {
111+
for key, value := range labels {
112+
entity.Metadata[key] = value
113+
}
114+
}
115+
}
109116

110117
func (w *worker) send(ctx context.Context, batch map[entity.Key]fwrequest.EntityFwRequest, batchSizeBytes *int) {
111118
defer w.resetBatch(batch, batchSizeBytes)
@@ -114,11 +121,7 @@ func (w *worker) send(ctx context.Context, batch map[entity.Key]fwrequest.Entity
114121
for _, r := range batch {
115122
entity := r.Data.Entity
116123
// Add labels to Metadata
117-
if r.Definition.Labels != nil && len(r.Definition.Labels) > 0 {
118-
for key, value := range r.Definition.Labels {
119-
entity.Metadata[key] = value
120-
}
121-
}
124+
updateEntityMetadata(&entity, r.Definition.Labels)
122125
entities = append(entities, entity)
123126
}
124127

pkg/entity/register/worker_test.go

+21
Original file line numberDiff line numberDiff line change
@@ -566,3 +566,24 @@ func TestWorker_send_Logging_VerboseDisabled(t *testing.T) {
566566

567567
assert.Empty(t, hook.AllEntries())
568568
}
569+
func TestUpdateEntityMetadata(t *testing.T) {
570+
expected := &entity.Fields{
571+
Name: "WIN_SERVICE:testWindows:newrelic-infra",
572+
Type: "WIN_SERVICE",
573+
Metadata: map[string]interface{}{
574+
"environment": "dev",
575+
"backup": "true",
576+
},
577+
}
578+
labels := map[string]string{
579+
"environment": "dev",
580+
"backup": "true",
581+
}
582+
entity := &entity.Fields{
583+
Name: "WIN_SERVICE:testWindows:newrelic-infra",
584+
Type: "WIN_SERVICE",
585+
Metadata: map[string]interface{}{},
586+
}
587+
updateEntityMetadata(entity, labels)
588+
assert.Equal(t, expected, entity)
589+
}

0 commit comments

Comments
 (0)