Skip to content

Commit 1dd35f0

Browse files
committed
fix: fixing test failures
1 parent 468e6cc commit 1dd35f0

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

src/plugins/metrics_sender.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@ package plugins
99

1010
import (
1111
"context"
12+
"github.com/nginx/agent/sdk/v2"
13+
"strings"
14+
"sync"
15+
1216
agent_config "github.com/nginx/agent/sdk/v2/agent/config"
1317
"github.com/nginx/agent/sdk/v2/client"
1418
"github.com/nginx/agent/sdk/v2/proto"
1519
models "github.com/nginx/agent/sdk/v2/proto/events"
1620
"github.com/nginx/agent/v2/src/core"
1721
"github.com/nginx/agent/v2/src/core/config"
18-
"strings"
19-
"sync"
2022

2123
log "github.com/sirupsen/logrus"
2224
"go.uber.org/atomic"
@@ -81,14 +83,13 @@ func (r *MetricsSender) Process(msg *core.Message) {
8183
log.Warnf("Failed to coerce Message to []Payload: %v", msg.Data())
8284
return
8385
}
86+
defer r.readyToSendMu.RUnlock()
8487
for _, p := range payloads {
8588
r.readyToSendMu.RLock()
8689
if !r.readyToSend.Load() {
8790
log.Debugf("metrics_sender is not ready to send the metrics")
88-
r.readyToSendMu.RUnlock()
8991
continue
9092
}
91-
r.readyToSendMu.Unlock()
9293
switch report := p.(type) {
9394
case *proto.MetricsReport:
9495
message := client.MessageFromMetrics(report)

src/plugins/metrics_sender_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ package plugins
1010
import (
1111
"context"
1212
"errors"
13-
"github.com/nginx/agent/v2/src/core/config"
1413
"reflect"
1514
"testing"
1615
"time"
1716

17+
"github.com/nginx/agent/v2/src/core/config"
18+
1819
"github.com/nginx/agent/sdk/v2/backoff"
1920
"github.com/nginx/agent/sdk/v2/proto"
2021
"github.com/nginx/agent/v2/src/core"

test/component/nginx-app-protect/monitoring/monitoring_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func TestNAPMonitoring(t *testing.T) {
130130
return
131131
}
132132

133-
metricsSender := plugins.NewMetricsSender(reporter)
133+
metricsSender := plugins.NewMetricsSender(reporter, &config.Config{ClientID: "12345", Features: []string{"metrics-sender"}})
134134

135135
env := tutils.NewMockEnvironment()
136136
env.On("NewHostInfo", testifyMock.Anything, testifyMock.Anything, testifyMock.Anything).Return(&sdkPb.HostInfo{

test/performance/vendor/github.com/nginx/agent/v2/src/plugins/metrics_sender.go

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)