From c2cea076ee7b59faf0faf239dd0025d62273af16 Mon Sep 17 00:00:00 2001 From: Domas Date: Tue, 13 Dec 2022 16:41:42 +0200 Subject: [PATCH] Chore: Add deprecation warnings for Sentry (#60165) --- .github/renovate.json5 | 6 ++++++ pkg/api/frontend_logging.go | 1 + pkg/setting/setting_sentry.go | 3 +++ 3 files changed, 10 insertions(+) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index bc2d0c43836..4fa4d71ab18 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -21,6 +21,12 @@ "ts-loader", // we should remove ts-loader and use babel-loader instead "ora", // we should bump this once we move to esm modules + // Sentry deprecated in favor of Grafana Faro for frontend logging. + // Major effort required to upgrade to latest Sentry, not worthwhile + "@sentry/browser", + "@sentry/types", + "@sentry/utils", + // dep updates blocked by React 18 "@testing-library/react", "@types/react", diff --git a/pkg/api/frontend_logging.go b/pkg/api/frontend_logging.go index eeef148aa63..4d69efc14be 100644 --- a/pkg/api/frontend_logging.go +++ b/pkg/api/frontend_logging.go @@ -19,6 +19,7 @@ type frontendLogMessageHandler func(hs *HTTPServer, c *web.Context) const sentryLogEndpointPath = "/log" const grafanaJavascriptAgentEndpointPath = "/log-grafana-javascript-agent" +/** @deprecated will be removed in the next major version */ func NewFrontendLogMessageHandler(store *frontendlogging.SourceMapStore) frontendLogMessageHandler { return func(hs *HTTPServer, c *web.Context) { event := frontendlogging.FrontendSentryEvent{} diff --git a/pkg/setting/setting_sentry.go b/pkg/setting/setting_sentry.go index b79b97baa95..b572a15071b 100644 --- a/pkg/setting/setting_sentry.go +++ b/pkg/setting/setting_sentry.go @@ -1,5 +1,7 @@ package setting +import "github.com/go-kit/kit/log/level" + type Sentry struct { Enabled bool `json:"enabled"` DSN string `json:"dsn"` @@ -13,6 +15,7 @@ func (cfg *Cfg) readSentryConfig() { raw := cfg.Raw.Section("log.frontend") provider := raw.Key("provider").MustString("sentry") if provider == "sentry" || provider != "grafana" { + _ = level.Warn(cfg.Logger).Log("msg", "\"sentry\" frontend logging provider is deprecated and will be removed in the next major version. Use \"grafana\" provider instead.") cfg.Sentry = Sentry{ Enabled: raw.Key("enabled").MustBool(true), DSN: raw.Key("sentry_dsn").String(),