Skip to content

Commit 4f01892

Browse files
authored
Fix syslog server being removed after config apply (#1225)
1 parent cdc0c48 commit 4f01892

File tree

5 files changed

+17
-5
lines changed

5 files changed

+17
-5
lines changed

api/grpc/mpi/v1/command.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/grpc/mpi/v1/common.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/grpc/mpi/v1/files.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/collector/otel_collector_plugin.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,8 @@ func (oc *Collector) findAvailableSyslogServers(ctx context.Context, napSyslogSe
709709

710710
slog.DebugContext(ctx, "Found valid NAP syslog server", "address", napSyslogServer)
711711

712+
oc.previousNAPSysLogServer = napSyslogServer
713+
712714
return napSyslogServer
713715
}
714716

internal/collector/otel_collector_plugin_test.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -790,8 +790,6 @@ func TestCollector_findAvailableSyslogServers(t *testing.T) {
790790
conf.Collector.Processors.Attribute = nil
791791
conf.Collector.Processors.Resource = nil
792792
conf.Collector.Processors.LogsGzip = nil
793-
collector, err := NewCollector(conf)
794-
require.NoError(t, err)
795793

796794
tests := []struct {
797795
name string
@@ -835,10 +833,22 @@ func TestCollector_findAvailableSyslogServers(t *testing.T) {
835833
syslogServers: []string{"localhost:15632", "localhost:1122"},
836834
portInUse: true,
837835
},
836+
{
837+
name: "Test 6: port hasn't changed",
838+
expectedSyslogServer: "localhost:1122",
839+
previousNAPSysLogServer: "localhost:1122",
840+
syslogServers: []string{"localhost:1122"},
841+
portInUse: true,
842+
},
838843
}
839844

840845
for _, test := range tests {
841846
t.Run(test.name, func(tt *testing.T) {
847+
collector, err := NewCollector(conf)
848+
require.NoError(t, err)
849+
850+
collector.previousNAPSysLogServer = test.previousNAPSysLogServer
851+
842852
if test.portInUse {
843853
listenConfig := &net.ListenConfig{}
844854
ln, listenError := listenConfig.Listen(ctx, "tcp", "localhost:15632")

0 commit comments

Comments
 (0)