Skip to content

Fix syslog server being removed after config apply #1225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 26, 2025
Merged

Fix syslog server being removed after config apply #1225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/grpc/mpi/v1/command.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/grpc/mpi/v1/common.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/grpc/mpi/v1/files.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions internal/collector/otel_collector_plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,6 +709,8 @@ func (oc *Collector) findAvailableSyslogServers(ctx context.Context, napSyslogSe

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

oc.previousNAPSysLogServer = napSyslogServer

return napSyslogServer
}

Expand Down
14 changes: 12 additions & 2 deletions internal/collector/otel_collector_plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,8 +790,6 @@ func TestCollector_findAvailableSyslogServers(t *testing.T) {
conf.Collector.Processors.Attribute = nil
conf.Collector.Processors.Resource = nil
conf.Collector.Processors.LogsGzip = nil
collector, err := NewCollector(conf)
require.NoError(t, err)

tests := []struct {
name string
Expand Down Expand Up @@ -835,10 +833,22 @@ func TestCollector_findAvailableSyslogServers(t *testing.T) {
syslogServers: []string{"localhost:15632", "localhost:1122"},
portInUse: true,
},
{
name: "Test 6: port hasn't changed",
expectedSyslogServer: "localhost:1122",
previousNAPSysLogServer: "localhost:1122",
syslogServers: []string{"localhost:1122"},
portInUse: true,
},
}

for _, test := range tests {
t.Run(test.name, func(tt *testing.T) {
collector, err := NewCollector(conf)
require.NoError(t, err)

collector.previousNAPSysLogServer = test.previousNAPSysLogServer

if test.portInUse {
listenConfig := &net.ListenConfig{}
ln, listenError := listenConfig.Listen(ctx, "tcp", "localhost:15632")
Expand Down