Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
This commit is contained in:
Jan-Otto Kröpke
2026-05-13 22:44:54 +02:00
parent 4ce836b42f
commit d2ea68cbf0
8 changed files with 13 additions and 21 deletions

View File

@@ -753,7 +753,7 @@ func getAllMountedVolumes() (map[string]string, error) {
func (c *Collector) workerBitlocker(ctx context.Context, initErrCh chan<- error) {
defer func() {
if r := recover(); r != nil {
c.logger.Error("workerBitlocker panic",
c.logger.ErrorContext(ctx, "workerBitlocker panic",
slog.Any("panic", r),
slog.String("stack", string(debug.Stack())),
)
@@ -764,7 +764,7 @@ func (c *Collector) workerBitlocker(ctx context.Context, initErrCh chan<- error)
go c.workerBitlocker(ctx, initErrCh)
if err := <-initErrCh; err != nil {
c.logger.Error("workerBitlocker restart failed",
c.logger.ErrorContext(ctx, "workerBitlocker restart failed",
slog.Any("err", err),
)
}

View File

@@ -19,7 +19,6 @@ package performancecounter_test
import (
"fmt"
"io"
"log/slog"
"net/http"
"net/http/httptest"
@@ -189,7 +188,7 @@ windows_performancecounter_processor_information_processor_time\{core="0,0",stat
},
})
logger := slog.New(slog.NewTextHandler(io.Discard, nil))
logger := slog.New(slog.DiscardHandler)
err := perfDataCollector.Build(logger, nil)
if tc.buildErr != "" {

View File

@@ -129,7 +129,7 @@ func (c *Collector) collectWorker() {
cmdLine, processOwner, processGroupID, err := c.getProcessInformation(uint32(pid))
if err != nil {
slog.LogAttrs(context.Background(), slog.LevelDebug, "Failed to get process information",
c.logger.LogAttrs(context.Background(), slog.LevelDebug, "Failed to get process information",
slog.Uint64("pid", pid),
slog.Any("err", err),
)

View File

@@ -19,7 +19,6 @@ package textfile_test
import (
"fmt"
"io"
"log/slog"
"strings"
"testing"
@@ -36,7 +35,7 @@ var baseDir = "../../../tools/textfile-test"
//nolint:paralleltest
func TestMultipleDirectories(t *testing.T) {
logger := slog.New(slog.NewTextHandler(io.Discard, nil))
logger := slog.New(slog.DiscardHandler)
testDir := baseDir + "/multiple-dirs"
testDirs := fmt.Sprintf("%[1]s/dir1,%[1]s/dir2,%[1]s/dir3", testDir)
@@ -76,7 +75,7 @@ func TestMultipleDirectories(t *testing.T) {
//nolint:paralleltest
func TestDuplicateFileName(t *testing.T) {
logger := slog.New(slog.NewTextHandler(io.Discard, nil))
logger := slog.New(slog.DiscardHandler)
testDir := baseDir + "/duplicate-filename"
textFileCollector := textfile.New(&textfile.Config{
TextFileDirectories: []string{testDir},

View File

@@ -189,7 +189,9 @@ func WTSEnumerateSessionsEx(server windows.Handle, logger *slog.Logger) ([]WTSSe
if sessionInfoPointer != 0 {
defer func(class WTSTypeClass, pMemory uintptr, NumberOfEntries uint32) {
if err := WTSFreeMemoryEx(class, pMemory, NumberOfEntries); err != nil {
logger.Warn("failed to free memory", "err", fmt.Errorf("WTSEnumerateSessionsEx: %w", err))
logger.Warn("failed to free memory",
slog.Any("err", fmt.Errorf("WTSEnumerateSessionsEx: %w", err)),
)
}
}(WTSTypeSessionInfoLevel1, sessionInfoPointer, count)
}

View File

@@ -86,7 +86,7 @@ func (c *MetricsHTTPHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
handler, err := c.handlerFactory(logger, scrapeTimeout, r.URL.Query()["collect[]"])
if err != nil {
logger.Warn("Couldn't create filtered metrics handler",
logger.WarnContext(r.Context(), "Couldn't create filtered metrics handler",
slog.Any("err", err),
)
@@ -107,7 +107,7 @@ func (c *MetricsHTTPHandler) getScrapeTimeout(logger *slog.Logger, r *http.Reque
timeoutSeconds, err = strconv.ParseFloat(v, 64)
if err != nil {
logger.Warn(fmt.Sprintf("Couldn't parse X-Prometheus-Scrape-Timeout-Seconds: %q. Defaulting timeout to %f", v, defaultScrapeTimeout))
logger.WarnContext(r.Context(), fmt.Sprintf("Couldn't parse X-Prometheus-Scrape-Timeout-Seconds: %q. Defaulting timeout to %f", v, defaultScrapeTimeout))
}
}

View File

@@ -19,7 +19,6 @@ package testutils
import (
"errors"
"io"
"log/slog"
"os"
"sync"
@@ -39,7 +38,7 @@ import (
func FuncBenchmarkCollector[C collector.Collector](b *testing.B, name string, collectFunc collector.BuilderWithFlags[C], fn ...func(app *kingpin.Application)) {
b.Helper()
logger := slog.New(slog.NewTextHandler(io.Discard, nil))
logger := slog.New(slog.DiscardHandler)
app := kingpin.New("windows_exporter", "Windows metrics exporter.")
c := collectFunc(app)
@@ -74,7 +73,7 @@ func TestCollector[C collector.Collector, V any](t *testing.T, fn func(*V) C, co
err error
)
logger := slog.New(slog.NewTextHandler(io.Discard, nil))
logger := slog.New(slog.DiscardHandler)
c := fn(conf)
ch := make(chan prometheus.Metric, 10000)

View File

@@ -42,13 +42,6 @@
"golangci/golangci-lint-action"
]
},
{
"enabled": true,
"matchManagers": ["gomod"],
"matchDepNames": ["go"],
"matchDepTypes": ["golang"],
"rangeStrategy": "bump"
},
{
"groupName": "golangci-lint",
"matchPackageNames": [