From a847f36df23113cd70219a88fb70bf06a5c07aff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Wed, 10 Dec 2025 18:23:59 +0100
Subject: [PATCH] datasources: querier: log caller (#115087)

---
 pkg/registry/apis/query/query.go      | 15 +++++++++++++--
 pkg/registry/apis/query/query_test.go | 11 ++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/pkg/registry/apis/query/query.go b/pkg/registry/apis/query/query.go
index 99323eb2721..ad9c9ac9888 100644
--- a/pkg/registry/apis/query/query.go
+++ b/pkg/registry/apis/query/query.go
@@ -10,6 +10,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/grafana/authlib/authn"
+	claims "github.com/grafana/authlib/types"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
 	"github.com/grafana/grafana/pkg/api/dtos"
@@ -154,11 +156,11 @@ func (r *queryREST) Connect(connectCtx context.Context, name string, _ runtime.O
 						}
 					}
 				}
-				connectLogger.Debug("responder sending status code", "statusCode", statusCode)
+				connectLogger.Debug("responder sending status code", "statusCode", statusCode, "caller", getCaller(ctx))
 			},
 
 			func(err error) {
-				connectLogger.Error("error caught in handler", "err", err)
+				connectLogger.Error("error caught in handler", "err", err, "caller", getCaller(ctx))
 				span.SetStatus(codes.Error, "query error")
 
 				if err == nil {
@@ -480,3 +482,12 @@ func getValidDataSourceRef(ctx context.Context, ds *v0alpha1.DataSourceRef, id i
 
 	return ds, nil
 }
+
+func getCaller(ctx context.Context) string {
+	authInfo, ok := claims.AuthInfoFrom(ctx)
+	if !ok {
+		return "<auth-missing>"
+	} else {
+		return strings.Join(authInfo.GetExtra()[authn.ServiceIdentityKey], ",")
+	}
+}
diff --git a/pkg/registry/apis/query/query_test.go b/pkg/registry/apis/query/query_test.go
index b23c78d55bc..56025d3893b 100644
--- a/pkg/registry/apis/query/query_test.go
+++ b/pkg/registry/apis/query/query_test.go
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
+	claims "github.com/grafana/authlib/types"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	dataapi "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
@@ -180,7 +181,7 @@ func TestQueryAPI(t *testing.T) {
 				legacyDatasourceLookup: &mockLegacyDataSourceLookup{},
 			}
 
-			reqCtx := identity.WithRequester(context.Background(), mockUser{})
+			reqCtx := claims.WithAuthInfo(identity.WithRequester(context.Background(), mockUser{}), &mockAuthInfo{})
 
 			req := httptest.NewRequestWithContext(reqCtx, http.MethodPost, "/some-path", bytes.NewReader([]byte(tc.queryJSON)))
 			req.Header.Set("Content-Type", "application/json")
@@ -439,3 +440,11 @@ func TestMergeHeaders(t *testing.T) {
 		})
 	}
 }
+
+type mockAuthInfo struct {
+	claims.AuthInfo
+}
+
+func (main mockAuthInfo) GetExtra() map[string][]string {
+	return nil
+}