Skip to content
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.

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

fix default case and add test for log shipper level setting #2083

Merged
merged 2 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

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 pkg/log/logshipper/logshipper.go
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ func (ls *LogShipper) updateLogShippingLevel() {
ls.slogLevel.Set(slog.LevelWarn)
case "error":
ls.slogLevel.Set(slog.LevelError)
case "default":
default:
ls.knapsack.Slogger().Log(context.TODO(), slog.LevelError,
"unrecognized flag value for log shipping level",
"flag_value", ls.knapsack.LogShippingLevel(),
Expand Down
45 changes: 45 additions & 0 deletions pkg/log/logshipper/logshipper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,3 +221,48 @@ func testKVStore(t *testing.T, name string) types.KVStore {
require.NoError(t, err)
return s
}

func TestUpdateLogShippingLevel(t *testing.T) {
t.Parallel()

knapsack := mocks.NewKnapsack(t)
tokenStore := testKVStore(t, storage.TokenStore.String())
authToken := ulid.New()

knapsack.On("TokenStore").Return(tokenStore)
tokenStore.Set(storage.ObservabilityIngestAuthTokenKey, []byte(authToken))

serverDataStore := testKVStore(t, storage.ServerProvidedDataStore.String())
knapsack.On("ServerProvidedDataStore").Return(serverDataStore)

endpoint := "https://someurl"
knapsack.On("LogIngestServerURL").Return(endpoint).Times(1)
knapsack.On("ServerProvidedDataStore").Return(tokenStore)
knapsack.On("Slogger").Return(multislogger.NewNopLogger())
knapsack.On("RegisterChangeObserver", mock.Anything, keys.LogShippingLevel, keys.LogIngestServerURL)
knapsack.On("CurrentRunningOsqueryVersion").Return("5.12.3")
knapsack.On("LogShippingLevel").Return("warn").Once()

ls := New(knapsack, log.NewNopLogger())
// new immediately calls Ping -> updateLogShippingLevel, expect that we are initialized with correct log level
require.Equal(t, slog.LevelWarn, ls.slogLevel.Level())

knapsack.On("LogShippingLevel").Return("debug").Once()
ls.updateLogShippingLevel()
require.Equal(t, slog.LevelDebug, ls.slogLevel.Level())

knapsack.On("LogShippingLevel").Return("info").Once()
ls.updateLogShippingLevel()
require.Equal(t, slog.LevelInfo, ls.slogLevel.Level())

// we do expect the invalid attempt to be logged, so 2 LogShippingLevel calls are mocked
knapsack.On("LogShippingLevel").Return("wrongo").Twice()
ls.updateLogShippingLevel()
// we don't expect any changes from setting invalid level
require.Equal(t, slog.LevelInfo, ls.slogLevel.Level())

// now reattempt with a real value
knapsack.On("LogShippingLevel").Return("error").Once()
ls.updateLogShippingLevel()
require.Equal(t, slog.LevelError, ls.slogLevel.Level())
}
Loading