From 903ff4ef5e11d0875442e994a75a178998da5f2b Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 30 Nov 2022 15:42:21 +0200 Subject: [PATCH] [v9.2.x] Datasources: Use context logger in cache service (#59557) Datasources: Use context logger in cache service (#59547) (cherry picked from commit 0fca3cf9ddc1c0e4dd1407d36099ac630fa5a74f) Co-authored-by: Will Browne --- pkg/services/datasources/service/cache.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/services/datasources/service/cache.go b/pkg/services/datasources/service/cache.go index 42d6b3df181..7f751f902b4 100644 --- a/pkg/services/datasources/service/cache.go +++ b/pkg/services/datasources/service/cache.go @@ -49,7 +49,7 @@ func (dc *CacheServiceImpl) GetDatasource( } } - dc.logger.Debug("Querying for data source via SQL store", "id", datasourceID, "orgId", user.OrgID) + dc.logger.FromContext(ctx).Debug("Querying for data source via SQL store", "id", datasourceID, "orgId", user.OrgID) query := &datasources.GetDataSourceQuery{Id: datasourceID, OrgId: user.OrgID} ss := SqlStore{db: dc.SQLStore, logger: dc.logger} @@ -90,7 +90,7 @@ func (dc *CacheServiceImpl) GetDatasourceByUID( } } - dc.logger.Debug("Querying for data source via SQL store", "uid", datasourceUID, "orgId", user.OrgID) + dc.logger.FromContext(ctx).Debug("Querying for data source via SQL store", "uid", datasourceUID, "orgId", user.OrgID) query := &datasources.GetDataSourceQuery{Uid: datasourceUID, OrgId: user.OrgID} ss := SqlStore{db: dc.SQLStore, logger: dc.logger} err := ss.GetDataSource(ctx, query)