scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-08-28 10:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add proper version info to sentry logs

Browse source
This commit is contained in:
Samir Patel 2022-06-21 11:03:22 -05:00 • committed by GitHub
parent f3f1ea41b7
commit c04fd9734e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
etcd/embed.go
View file

@ -133,17 +133,20 @@ type Etcd struct {
nodeStates map[string]disco.NodeState
nodeStatesDirty bool // do we need to remake the nodeStates map to use it?
version string
// we want to inherit parent's logging functionality
logger logger.Logger
}
func NewEtcd(opt Options, logger logger.Logger, replicas int) *Etcd {
func NewEtcd(opt Options, logger logger.Logger, replicas int, version string) *Etcd {
e := &Etcd{
options: opt,
logger: logger,
replicas: replicas,
knownNodes: make(map[string]*nodeData),
nodeStates: make(map[string]disco.NodeState),
version: version,
}
if e.options.HeartbeatTTL == 0 {
@ -284,7 +287,8 @@ func (e *Etcd) parseOptions() *embed.Config {
// enterprise version. Sentry.io is enabled on single-node.
if AllowCluster() == false {
// %% end sonarcloud ignore %%
monitor.InitErrorMonitor()
monitor.InitErrorMonitor(e.version)
e.logger.Infof("Initializing Monitor: Capturing usage metrics")
//check for multiple nodes in the cluster and error if present
nodes := strings.Split(e.options.InitCluster, ",")

3
monitor/monitor.go
View file

@ -22,13 +22,14 @@ const (
var isOn bool
// Initialiazing Sentry with particular settings
func InitErrorMonitor() {
func InitErrorMonitor(version string) {
isOn = true
err := sentry.Init(sentry.ClientOptions{
Dsn: getDSN(),
AttachStacktrace: true,
Debug: false,
TracesSampleRate: 1,
Release: version,
})
sentry.ConfigureScope(func(scope *sentry.Scope) {
scope.SetUser(sentry.User{IPAddress: "{{auto}}"})

5
server/server.go
View file

@ -335,7 +335,8 @@ func (m *Command) SetupServer() error {
return errors.Wrap(err, "setting up logger")
}
m.logger.Infof("%s", pilosa.VersionInfo(m.Config.Future.Rename))
version := pilosa.VersionInfo(m.Config.Future.Rename)
m.logger.Infof("%s", version)
handleTrialDeadline(m.logger)
@ -457,7 +458,7 @@ func (m *Command) SetupServer() error {
m.Config.Etcd.Dir = filepath.Join(path, pilosa.DiscoDir)
}
e := petcd.NewEtcd(m.Config.Etcd, m.logger, m.Config.Cluster.ReplicaN)
e := petcd.NewEtcd(m.Config.Etcd, m.logger, m.Config.Cluster.ReplicaN, version)
discoOpt := pilosa.OptServerDisCo(e, e, e, e, e, e, e)
serverOptions := []pilosa.ServerOption{