Skip to content

Commit

Permalink
Plugin sync logging improvements (#4963)
Browse files Browse the repository at this point in the history
# What this PR does
- Fix logging when no error
- Add more logging to request errors during sync"

## Which issue(s) this PR closes

Related to [issue link here]

<!--
*Note*: If you want the issue to be auto-closed once the PR is merged,
change "Related to" to "Closes" in the line above.
If you have more than one GitHub issue that this PR closes, be sure to
preface
each issue link with a [closing
keyword](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue).
This ensures that the issue(s) are auto-closed once the PR has been
merged.
-->

## Checklist

- [x] Unit, integration, and e2e (if applicable) tests updated
- [x] Documentation added (or `pr:no public docs` PR label added if not
required)
- [x] Added the relevant release notes label (see labels prefixed w/
`release:`). These labels dictate how your PR will
    show up in the autogenerated release notes.
  • Loading branch information
mderynck authored Aug 30, 2024
1 parent 90de23c commit 4376207
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion grafana-plugin/pkg/plugin/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"errors"
"fmt"
"github.com/grafana/grafana-plugin-sdk-go/backend/log"
"io"
"net/http"
"net/url"
"strconv"
Expand Down Expand Up @@ -83,7 +84,7 @@ func (a *App) doSync(ctx context.Context, forceSend bool) {
var cacheAlreadyLocked *SyncCacheAlreadyLocked
if errors.As(err, &cacheAlreadyLocked) {
log.DefaultLogger.Info("Skipping sync", "message", err)
} else {
} else if err != nil {
log.DefaultLogger.Error("Error making sync request", "error", err)
}
}()
Expand Down Expand Up @@ -175,6 +176,17 @@ func (a *App) makeSyncRequest(ctx context.Context, forceSend bool) error {
}
defer res.Body.Close()

if res.StatusCode != http.StatusOK {
bodyBytes, err := io.ReadAll(res.Body)
if err != nil {
log.DefaultLogger.Error("failed to read response body", "error", err, "status", res.StatusCode)
} else {
log.DefaultLogger.Error("sync not ok", "status", res.StatusCode, "message", string(bodyBytes))
}
} else {
log.DefaultLogger.Info("sync ok", "status", res.StatusCode)
}

a.lastOnCallSync = onCallSync
return nil
}

0 comments on commit 4376207

Please sign in to comment.