From 84de7ce8cdbe53b6e42a3152cd8ebde74e86f1c3 Mon Sep 17 00:00:00 2001 From: Sarah Zinger Date: Wed, 13 Aug 2025 14:29:43 -0400 Subject: [PATCH] Logs --- pkg/expr/query_convert.go | 1 + pkg/registry/apis/query/query.go | 2 +- pkg/services/query/query.go | 4 ++++ pkg/tsdb/cloud-monitoring/cloudmonitoring.go | 1 + pkg/tsdb/prometheus/prometheus.go | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/expr/query_convert.go b/pkg/expr/query_convert.go index d30b7c5bf91..cef150901b7 100644 --- a/pkg/expr/query_convert.go +++ b/pkg/expr/query_convert.go @@ -43,6 +43,7 @@ func ConvertBackendRequestToDataRequest(req *backend.QueryDataRequest) (*data.Qu To: req.Queries[0].TimeRange.To.String(), }, } + backend.Logger.Info("!!!!!!!!!!!!!!!!! k8sReq", "k8sReq.TimeRange", k8sReq.TimeRange) for _, q := range req.Queries { dataQuery, err := convertBackendQueryToDataQuery(q) diff --git a/pkg/registry/apis/query/query.go b/pkg/registry/apis/query/query.go index ae202728a0d..f0a4586b9ba 100644 --- a/pkg/registry/apis/query/query.go +++ b/pkg/registry/apis/query/query.go @@ -235,7 +235,7 @@ func handleQuery(ctx context.Context, raw query.QueryDataRequest, b QueryAPIBuil } mReq := dtos.MetricRequest{ - From: raw.From, + From: raw.From, // in alerting, this is empty because time ranges are per query, but in the ui it may not be blank To: raw.To, Queries: jsonQueries, } diff --git a/pkg/services/query/query.go b/pkg/services/query/query.go index 55fdb542c4f..43fc8b02a8c 100644 --- a/pkg/services/query/query.go +++ b/pkg/services/query/query.go @@ -314,6 +314,7 @@ func (s *ServiceImpl) handleQuerySingleDatasource(ctx context.Context, user iden func getTimeRange(query *simplejson.Json, globalFrom string, globalTo string) (string, string, error) { tr, ok := query.CheckGet("timeRange") if !ok { // timeRange json node does not exist, use global from/to + backend.Logger.Info("!!!!!!timeRange not found, using global from/to", "globalFrom", globalFrom, "globalTo", globalTo) return globalFrom, globalTo, nil } from, err := tr.Get("from").String() @@ -324,6 +325,7 @@ func getTimeRange(query *simplejson.Json, globalFrom string, globalTo string) (s if err != nil { return "", "", errors.New("time range: field 'to' is missing or invalid") } + backend.Logger.Info("!!!!!!getTimeRange", "from", from, "to", to) return from, to, nil } @@ -369,8 +371,10 @@ func (s *ServiceImpl) parseMetricRequest(ctx context.Context, user identity.Requ return nil, err } timeRange = gtime.NewTimeRange(from, to) + s.log.Info("!!!!!!from and to, supportLocalTimeRange is enabled", "timeRange", timeRange) } else { timeRange = gtime.NewTimeRange(reqDTO.From, reqDTO.To) + s.log.Info("!!!!!!from and to, supportLocalTimeRange is disabled", "timeRange", timeRange) } modelJSON, err := query.MarshalJSON() diff --git a/pkg/tsdb/cloud-monitoring/cloudmonitoring.go b/pkg/tsdb/cloud-monitoring/cloudmonitoring.go index c88feb30a1a..9290aa8d8fc 100644 --- a/pkg/tsdb/cloud-monitoring/cloudmonitoring.go +++ b/pkg/tsdb/cloud-monitoring/cloudmonitoring.go @@ -329,6 +329,7 @@ func migrateRequest(req *backend.QueryDataRequest) error { // QueryData takes in the frontend queries, parses them into the CloudMonitoring query format // executes the queries against the CloudMonitoring API and parses the response into data frames func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) { + s.logger.Info("!!!!!!request getting sent to datasource", "req.Queries[0].TimeRange", req.Queries[0].TimeRange) logger := s.logger.FromContext(ctx) if len(req.Queries) == 0 { return nil, fmt.Errorf("query contains no queries") diff --git a/pkg/tsdb/prometheus/prometheus.go b/pkg/tsdb/prometheus/prometheus.go index 71289b89d26..83d961996f9 100644 --- a/pkg/tsdb/prometheus/prometheus.go +++ b/pkg/tsdb/prometheus/prometheus.go @@ -26,6 +26,7 @@ func ProvideService(httpClientProvider *sdkhttpclient.Provider) *Service { } func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) { + backend.Logger.Info("!!!!!!request getting sent to datasource", "req.Queries[0].TimeRange", req.Queries[0].TimeRange) return s.lib.QueryData(ctx, req) }