Merge pull request #10 from Gustavobelfort/feat/logstash-sentry

Gustavobelfort · May 11, 2020 · 4a7a7fe · 4a7a7fe
2 parents 165d451 + df90c47
commit 4a7a7fe
Show file tree

Hide file tree

Showing 17 changed files with 732 additions and 34 deletions.
diff --git a/cmd/api/api.go b/cmd/api/api.go
@@ -5,7 +5,9 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
+	"time"
 
+	"github.com/getsentry/sentry-go"
 	"github.com/gustavobelfort/42-jitsi/internal/config"
 	"github.com/gustavobelfort/42-jitsi/internal/consumers"
 	"github.com/gustavobelfort/42-jitsi/internal/consumers/router"
@@ -19,14 +21,18 @@ import (
 func init() {
 	config.AddRequired("intra.app_id", "intra.app_secret", "intra.webhooks")
 	if err := config.Initiate(); err != nil {
-		logrus.Fatalf("could not load configuration: %v", err)
+		logrus.WithError(err).Fatalf("could not load configuration: %v", err)
 	}
+	logging.Initiate()
 	if err := db.Init(); err != nil {
-		logrus.Fatalf("could not connect to the db: %v", err)
+		logrus.WithError(err).Fatalf("could not connect to the db: %v", err)
 	}
 }
 
 func main() {
+	if hub := sentry.CurrentHub(); hub.Client() != nil {
+		defer hub.Flush(time.Second * 5)
+	}
 	server := &http.Server{
 		Addr:         config.Conf.HTTPAddr,
 		ReadTimeout:  config.Conf.Timeout * 2,
@@ -36,7 +42,7 @@ func main() {
 
 	client, err := intra.NewClient(config.Conf.Intra.AppID, config.Conf.Intra.AppSecret, http.DefaultClient)
 	if err != nil {
-		logrus.Fatalf("could not initiate intra api client: %v", err)
+		logrus.WithError(err).Fatalf("could not initiate intra api client: %v", err)
 	}
 
 	hdl := handler.NewScaleTeamHandler(client, db.GlobalDB)
@@ -58,7 +64,7 @@ func waitForShutdown(consumer consumers.Consumer) {
 				logrus.Info(err)
 				return
 			}
-			logrus.Error(err)
+			logrus.WithError(err).Error(err)
 		}
 	}()
 	<-interruptChan

diff --git a/cmd/rabbit/rabbit.go b/cmd/rabbit/rabbit.go
@@ -5,7 +5,9 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
+	"time"
 
+	"github.com/getsentry/sentry-go"
 	"github.com/gustavobelfort/42-jitsi/internal/config"
 	"github.com/gustavobelfort/42-jitsi/internal/consumers"
 	amqp2 "github.com/gustavobelfort/42-jitsi/internal/consumers/amqp"
@@ -21,12 +23,16 @@ func init() {
 	if err := config.Initiate(); err != nil {
 		logrus.Fatalf("could not load configuration: %v", err)
 	}
+	logging.Initiate()
 	if err := db.Init(); err != nil {
 		logrus.Fatalf("could not connect to the db: %v", err)
 	}
 }
 
 func main() {
+	if hub := sentry.CurrentHub(); hub.Client() != nil {
+		defer hub.Flush(time.Second * 5)
+	}
 	client, err := intra.NewClient(config.Conf.Intra.AppID, config.Conf.Intra.AppSecret, http.DefaultClient)
 	if err != nil {
 		logrus.Fatalf("could not initiate intra api client: %v", err)

diff --git a/configs/configs.sample.yml b/configs/configs.sample.yml
@@ -1,3 +1,33 @@
+##
+# General configuration (mostly used by logs)
+##
+environment: development
+service: 42-jitsi
+
+##
+# Log configuration
+##
+log_level: debug
+# -- sentry configuration
+sentry:
+  dsn: https://identifier@sentry.com/projectid
+  levels:
+    - error
+    - fatal
+    - panic
+  enabled: no
+# -- logstash configuration
+logstash:
+  host: localhost
+  port: 5000
+  protocol: tcp
+  levels:
+    - info
+    - warning
+    - error
+    - fatal
+    - panic
+
 ##
 # SlackThat configuration
 ##

diff --git a/configs/example.env b/configs/example.env
@@ -1,4 +1,22 @@
 ##
+# General configuration (mostly used by logs)
+##
+ENVIRONMENT=development
+SERVICE=42-jitsi
+
+##
+# Log configuration
+##
+LOG_LEVEL=debug
+# -- sentry configuration
+SENTRY_DSN=https://identifier@sentry.com/projectid
+SENTRY_LEVELS=error,fatal,panic
+SENTRY_ENABLED=false
+# -- logstash configuration
+LOGSTASH_HOST=localhost
+LOGSTASH_PORT=5000
+LOGSTASH_PROTOCOL=tcp
+LOGSTASH_LEVELS=info,warning,error,fatal,panic
 # Docker Configuration
 ##
 JITSI42_CONSUMER_TYPE=api

diff --git a/go.mod b/go.mod
@@ -4,20 +4,20 @@ go 1.13
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.4.1
+	github.com/bshuster-repo/logrus-logstash-hook v0.0.0-20190911164539-b3d898b5138a
+	github.com/getsentry/sentry-go v0.6.0
 	github.com/gin-gonic/gin v1.6.2
 	github.com/golang/protobuf v1.4.0 // indirect
 	github.com/jinzhu/gorm v1.9.12
-	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/lib/pq v1.3.0 // indirect
 	github.com/magiconair/properties v1.8.1
 	github.com/mitchellh/mapstructure v1.1.2
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
-	github.com/sirupsen/logrus v1.5.0
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/sirupsen/logrus v1.6.0
 	github.com/spf13/viper v1.6.2
 	github.com/streadway/amqp v0.0.0-20200108173154-1c71cc93ed71
 	github.com/stretchr/testify v1.4.0
-	golang.org/x/net v0.0.0-20190620200207-3b0461eec859
+	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297
 	golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be
-	golang.org/x/sys v0.0.0-20200428200454-593003d681fa // indirect
+	golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 // indirect
 )