perf(linux): 🔥 remove unnecessary custom logger from mem worker

joshuar · Sep 6, 2024 · 2588436 · 2588436
1 parent ca3ba6e
commit 2588436
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 26 deletions.
diff --git a/internal/linux/mem/memUsage.go b/internal/linux/mem/memUsage.go
@@ -9,7 +9,6 @@ package mem
 import (
 	"context"
 	"fmt"
-	"log/slog"
 	"math"
 	"time"
 
@@ -18,7 +17,6 @@ import (
 	"github.com/joshuar/go-hass-agent/internal/hass/sensor"
 	"github.com/joshuar/go-hass-agent/internal/hass/sensor/types"
 	"github.com/joshuar/go-hass-agent/internal/linux"
-	"github.com/joshuar/go-hass-agent/internal/logging"
 )
 
 const (
@@ -114,9 +112,7 @@ func newSwapUsedPc(stats memoryStats) *linux.Sensor {
 	return newMemSensorPc("Swap Usage", swapUsed, swapTotal)
 }
 
-type usageWorker struct {
-	logger *slog.Logger
-}
+type usageWorker struct{}
 
 func (w *usageWorker) Interval() time.Duration { return updateInterval }
 
@@ -147,11 +143,9 @@ func (w *usageWorker) Sensors(_ context.Context, _ time.Duration) ([]sensor.Deta
 	return sensors, nil
 }
 
-func NewUsageWorker(ctx context.Context) (*linux.SensorWorker, error) {
+func NewUsageWorker(_ context.Context) (*linux.SensorWorker, error) {
 	return &linux.SensorWorker{
-			Value: &usageWorker{
-				logger: logging.FromContext(ctx).With(slog.String("worker", workerID)),
-			},
+			Value:    &usageWorker{},
 			WorkerID: workerID,
 		},
 		nil

diff --git a/internal/linux/mem/memUsage_test.go b/internal/linux/mem/memUsage_test.go
@@ -7,7 +7,6 @@ package mem
 
 import (
 	"context"
-	"log/slog"
 	"math"
 	"testing"
 	"time"
@@ -154,45 +153,36 @@ func Test_usageWorker_Sensors(t *testing.T) {
 	}
 	withoutSwapSensors = append(withoutSwapSensors, newMemUsedPc(withoutSwap))
 
-	type fields struct {
-		logger *slog.Logger
-	}
 	type args struct {
 		in0  context.Context
 		file string
 		in1  time.Duration
 	}
 	tests := []struct {
 		name    string
-		fields  fields
 		args    args
 		want    []sensor.Details
 		wantErr bool
 	}{
 		{
-			name:   "with swap",
-			fields: fields{logger: slog.Default()},
-			args:   args{in0: linux.NewContext(context.TODO()), file: "testing/data/meminfowithswap"},
-			want:   withSwapSensors,
+			name: "with swap",
+			args: args{in0: linux.NewContext(context.TODO()), file: "testing/data/meminfowithswap"},
+			want: withSwapSensors,
 		},
 		{
-			name:   "without swap",
-			fields: fields{logger: slog.Default()},
-			args:   args{in0: linux.NewContext(context.TODO()), file: "testing/data/meminfowithoutswap"},
-			want:   withoutSwapSensors,
+			name: "without swap",
+			args: args{in0: linux.NewContext(context.TODO()), file: "testing/data/meminfowithoutswap"},
+			want: withoutSwapSensors,
 		},
 		{
 			name:    "no stats file",
-			fields:  fields{logger: slog.Default()},
 			args:    args{in0: linux.NewContext(context.TODO()), file: "/nonexistent"},
 			wantErr: true,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			w := &usageWorker{
-				logger: tt.fields.logger,
-			}
+			w := &usageWorker{}
 			memStatFile = tt.args.file
 			got, err := w.Sensors(tt.args.in0, tt.args.in1)
 			if (err != nil) != tt.wantErr {