public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: capitalise logs in other backend packages (#74344)

Browse Source 
* capitalise logs in observability logs

* capitalise oss-bit-tent packages

* capitalise logs in aws-datasources

* capitalise logs for traces and profiling

* capitalise logs for partner datasources

* capitalise logs in plugins platform

* capitalise logs for observability metrics
This commit is contained in:
Serge Zaitsev
2023-09-04 22:25:43 +02:00
committed by GitHub
parent baea7a7556
commit 93cdc94a94
22 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/loki/loki.go
+1 -1
View File
@@ -101,7 +101,7 @@ func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceReq
dsInfo, err := s.getDSInfo(ctx, req.PluginContext)
logger := logger.FromContext(ctx).New("api", "CallResource")
if err != nil {
logger.Error("failed to get data source info", "err", err)
logger.Error("Failed to get data source info", "err", err)
return err
}
return callResource(ctx, req, sender, dsInfo, logger, s.tracer)
pkg/tsdb/loki/streaming.go
+8 -8
View File
@@ -93,10 +93,10 @@ func (s *Service) RunStream(ctx context.Context, req *backend.RunStreamRequest,
}
wsurl.RawQuery = params.Encode()
logger.Info("connecting to websocket", "url", wsurl)
logger.Info("Connecting to websocket", "url", wsurl)
c, r, err := websocket.DefaultDialer.Dial(wsurl.String(), nil)
if err != nil {
logger.Error("error connecting to websocket", "err", err)
logger.Error("Error connecting to websocket", "err", err)
return fmt.Errorf("error connecting to websocket")
}
@@ -108,7 +108,7 @@ func (s *Service) RunStream(ctx context.Context, req *backend.RunStreamRequest,
_ = r.Body.Close()
}
err = c.Close()
logger.Error("closing loki websocket", "err", err)
logger.Error("Closing loki websocket", "err", err)
}()
prev := data.FrameJSONCache{}
@@ -120,7 +120,7 @@ func (s *Service) RunStream(ctx context.Context, req *backend.RunStreamRequest,
for {
_, message, err := c.ReadMessage()
if err != nil {
logger.Error("websocket read:", "err", err)
logger.Error("Websocket read:", "err", err)
return
}
@@ -143,7 +143,7 @@ func (s *Service) RunStream(ctx context.Context, req *backend.RunStreamRequest,
}
if err != nil {
logger.Error("websocket write:", "err", err, "raw", message)
logger.Error("Websocket write:", "err", err, "raw", message)
return
}
}
@@ -155,14 +155,14 @@ func (s *Service) RunStream(ctx context.Context, req *backend.RunStreamRequest,
for {
select {
case <-done:
logger.Info("socket done")
logger.Info("Socket done")
return nil
case <-ctx.Done():
logger.Info("stop streaming (context canceled)")
logger.Info("Stop streaming (context canceled)")
return nil
case t := <-ticker.C:
count++
logger.Error("loki websocket ping?", "time", t, "count", count)
logger.Error("Loki websocket ping?", "time", t, "count", count)
}
}
}