misc

Author: umswmayj

internal/scheduling/lib/filter_weigher_pipeline.go

@@ -73,7 +73,7 @@ func InitNewFilterWeigherPipeline[RequestType FilterWeigherPipelineRequest](
 		filter = validateFilter(filter)
 		filter = monitorFilter(filter, filterConfig.Name, pipelineMonitor)
 		if err := filter.Init(ctx, client, filterConfig); err != nil {
-			slog.Error("scheduler: failed to initialize filter", "name", filterConfig.Name, "error", err)
+			slog.Warn("scheduler: failed to initialize filter", "name", filterConfig.Name, "error", err)
 			filterErrors[filterConfig.Name] = errors.New("failed to initialize filter: " + err.Error())
 			continue
 		}
@@ -102,7 +102,7 @@ func InitNewFilterWeigherPipeline[RequestType FilterWeigherPipelineRequest](
 		weigher = validateWeigher(weigher)
 		weigher = monitorWeigher(weigher, weigherConfig.Name, pipelineMonitor)
 		if err := weigher.Init(ctx, client, weigherConfig); err != nil {
-			slog.Error("scheduler: failed to initialize weigher", "name", weigherConfig.Name, "error", err)
+			slog.Warn("scheduler: failed to initialize weigher", "name", weigherConfig.Name, "error", err)
 			weigherErrors[weigherConfig.Name] = errors.New("failed to initialize weigher: " + err.Error())
 			continue
 		}

pkg/monitoring/log_metrics.go

@@ -6,8 +6,8 @@ package monitoring
 import (
 	"context"
 	"log/slog"
+	"path"
 	"runtime"
-	"strings"
 	"sync"
 
 	"github.com/prometheus/client_golang/prometheus"
@@ -19,10 +19,6 @@ import (
 // this map grows to a fixed size and all subsequent lookups are lock-free reads.
 var pcFileCache sync.Map // uintptr -> string
 
-// modulePath is the Go module prefix stripped from caller file paths to produce
-// relative paths suitable for use as Prometheus label values.
-const modulePath = "github.com/cobaltcore-dev/cortex/"
-
 // LogMessagesTotal counts warn and error log messages emitted by both the slog
 // and zap loggers. Labels: "level" (warn|error), "file" (relative source path).
 var LogMessagesTotal = prometheus.NewCounterVec(prometheus.CounterOpts{
@@ -31,13 +27,16 @@ var LogMessagesTotal = prometheus.NewCounterVec(prometheus.CounterOpts{
 	Help:      "Total number of log messages emitted at warn or error level.",
 }, []string{"level", "file"})
 
-// trimModulePrefix strips the Go module path prefix so that the file label
-// contains only the project-relative path (e.g. "internal/scheduling/...").
-func trimModulePrefix(file string) string {
-	if i := strings.Index(file, modulePath); i >= 0 {
-		return file[i+len(modulePath):]
+// shortFilePath returns "parent_dir/filename.go" from any absolute or
+// module-relative path. This is independent of the build environment (no
+// -trimpath needed) and keeps Prometheus label cardinality manageable.
+func shortFilePath(file string) string {
+	dir, base := path.Split(file)
+	parent := path.Base(dir)
+	if parent == "." || parent == "/" {
+		return base
 	}
-	return file
+	return parent + "/" + base
 }
 
 // --- slog handler wrapper ---
@@ -75,7 +74,7 @@ func (h *MetricsSlogHandler) Handle(ctx context.Context, r slog.Record) error {
 				frames := runtime.CallersFrames([]uintptr{r.PC})
 				f, _ := frames.Next()
 				if f.File != "" {
-					file = trimModulePrefix(f.File)
+					file = shortFilePath(f.File)
 				}
 				pcFileCache.Store(r.PC, file)
 			}
@@ -116,7 +115,7 @@ func WrapCoreWithLogMetrics(core zapcore.Core) zapcore.Core {
 			}
 			file := "unknown"
 			if e.Caller.Defined {
-				file = trimModulePrefix(e.Caller.File)
+				file = shortFilePath(e.Caller.File)
 			}
 			LogMessagesTotal.WithLabelValues(level, file).Inc()
 		}

pkg/monitoring/log_metrics_test.go

@@ -14,26 +14,34 @@ import (
 	"go.uber.org/zap/zapcore"
 )
 
-func TestTrimModulePrefix(t *testing.T) {
+func TestShortFilePath(t *testing.T) {
 	tests := []struct {
 		input, want string
 	}{
 		{
 			input: "github.com/cobaltcore-dev/cortex/internal/scheduling/nova/external_scheduler_api.go",
-			want:  "internal/scheduling/nova/external_scheduler_api.go",
+			want:  "nova/external_scheduler_api.go",
+		},
+		{
+			input: "/workspace/internal/knowledge/extractor/plugins/compute/vrops_hostsystem_contention_long_term.go",
+			want:  "compute/vrops_hostsystem_contention_long_term.go",
 		},
 		{
 			input: "/some/absolute/path/file.go",
-			want:  "/some/absolute/path/file.go",
+			want:  "path/file.go",
+		},
+		{
+			input: "file.go",
+			want:  "file.go",
 		},
 		{
 			input: "",
 			want:  "",
 		},
 	}
 	for _, tt := range tests {
-		if got := trimModulePrefix(tt.input); got != tt.want {
-			t.Errorf("trimModulePrefix(%q) = %q, want %q", tt.input, got, tt.want)
+		if got := shortFilePath(tt.input); got != tt.want {
+			t.Errorf("shortFilePath(%q) = %q, want %q", tt.input, got, tt.want)
 		}
 	}
 }