.github/workflows/golangci-lint.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - name: Install Go
         uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
         with:

config/http_config.go

@@ -679,8 +679,8 @@ func NewRoundTripperFromConfigWithContext(ctx context.Context, cfg HTTPClientCon
 	if err != nil {
 		return nil, err
 	}
-	if tlsSettings.CA == nil || tlsSettings.CA.Immutable() {
-		// No need for a RoundTripper that reloads the CA file automatically.
+	if tlsSettings.immutable() {
+		// No need for a RoundTripper that reloads the files automatically.
 		return newRT(tlsConfig)
 	}
 	return NewTLSRoundTripperWithContext(ctx, tlsConfig, tlsSettings, newRT)
@@ -914,7 +914,7 @@ func (rt *oauth2RoundTripper) newOauth2TokenSource(req *http.Request, secret str
 	if err != nil {
 		return nil, nil, err
 	}
-	if tlsSettings.CA == nil || tlsSettings.CA.Immutable() {
+	if tlsSettings.immutable() {
 		t, _ = tlsTransport(tlsConfig)
 	} else {
 		t, err = NewTLSRoundTripperWithContext(req.Context(), tlsConfig, tlsSettings, tlsTransport)
@@ -1259,6 +1259,10 @@ type TLSRoundTripperSettings struct {
 	Key  SecretReader
 }
 
+func (t *TLSRoundTripperSettings) immutable() bool {
+	return (t.CA == nil || t.CA.Immutable()) && (t.Cert == nil || t.Cert.Immutable()) && (t.Key == nil || t.Key.Immutable())
+}
+
 func NewTLSRoundTripper(
 	cfg *tls.Config,
 	settings TLSRoundTripperSettings,

promslog/slog.go

@@ -66,6 +66,17 @@ var (
 		default:
 		}
 
+		return a
+	}
+	truncateSourceAttrFunc = func(groups []string, a slog.Attr) slog.Attr {
+		if a.Key != slog.SourceKey {
+			return a
+		}
+
+		if src, ok := a.Value.Any().(*slog.Source); ok {
+			a.Value = slog.StringValue(filepath.Base(src.File) + ":" + strconv.Itoa(src.Line))
+		}
+
 		return a
 	}
 )
@@ -165,8 +176,9 @@ func New(config *Config) *slog.Logger {
 	}
 
 	logHandlerOpts := &slog.HandlerOptions{
-		Level:     config.Level.lvl,
-		AddSource: true,
+		Level:       config.Level.lvl,
+		AddSource:   true,
+		ReplaceAttr: truncateSourceAttrFunc,
 	}
 
 	if config.Style == GoKitStyle {

promslog/slog_test.go

@@ -146,3 +146,47 @@ func TestDynamicLevels(t *testing.T) {
 		})
 	}
 }
+
+func TestTruncateSourceFileName_DefaultStyle(t *testing.T) {
+	var buf bytes.Buffer
+
+	config := &Config{
+		Writer: &buf,
+	}
+
+	logger := New(config)
+	logger.Info("test message")
+
+	output := buf.String()
+
+	if !strings.Contains(output, "source=slog_test.go:") {
+		t.Errorf("Expected source file name to be truncated to basename, got: %s", output)
+	}
+
+	if strings.Contains(output, "/") {
+		t.Errorf("Expected no directory separators in source file name, got: %s", output)
+	}
+}
+
+func TestTruncateSourceFileName_GoKitStyle(t *testing.T) {
+	var buf bytes.Buffer
+
+	config := &Config{
+		Writer: &buf,
+		Style:  GoKitStyle,
+	}
+
+	logger := New(config)
+	logger.Info("test message")
+
+	output := buf.String()
+
+	// In GoKitStyle, the source key is "caller".
+	if !strings.Contains(output, "caller=slog_test.go:") {
+		t.Errorf("Expected caller to contain basename of source file, got: %s", output)
+	}
+
+	if strings.Contains(output, "/") {
+		t.Errorf("Expected no directory separators in caller, got: %s", output)
+	}
+}