From 8ce3556d31e46a7846042f1750d5644137f8e97d Mon Sep 17 00:00:00 2001
From: Adam Wonak <adam.wonak@gmail.com>
Date: Tue, 7 Jul 2015 11:41:45 -0500
Subject: [PATCH] Added a new SentryHook initialization func for setting tags.

---
 hooks/sentry/sentry.go      | 15 +++++++++++++--
 hooks/sentry/sentry_test.go | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/hooks/sentry/sentry.go b/hooks/sentry/sentry.go
index e7e45b2..4d184b2 100644
--- a/hooks/sentry/sentry.go
+++ b/hooks/sentry/sentry.go
@@ -2,8 +2,8 @@ package logrus_sentry
 
 import (
 	"fmt"
-	"time"
 	"net/http"
+	"time"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/getsentry/raven-go"
@@ -68,7 +68,18 @@ type SentryHook struct {
 // and initializes the raven client.
 // This method sets the timeout to 100 milliseconds.
 func NewSentryHook(DSN string, levels []logrus.Level) (*SentryHook, error) {
-	client, err := raven.NewClient(DSN, nil)
+	client, err := raven.New(DSN)
+	if err != nil {
+		return nil, err
+	}
+	return &SentryHook{100 * time.Millisecond, client, levels}, nil
+}
+
+// NewWithTagsSentryHook creates a hook with tags to be added to an instance
+// of logger and initializes the raven client. This method sets the timeout to
+// 100 milliseconds.
+func NewWithTagsSentryHook(DSN string, tags map[string]string, levels []logrus.Level) (*SentryHook, error) {
+	client, err := raven.NewWithTags(DSN, tags)
 	if err != nil {
 		return nil, err
 	}
diff --git a/hooks/sentry/sentry_test.go b/hooks/sentry/sentry_test.go
index 5f3696b..5f59f69 100644
--- a/hooks/sentry/sentry_test.go
+++ b/hooks/sentry/sentry_test.go
@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"reflect"
 	"strings"
 	"testing"
 
@@ -98,3 +99,34 @@ func TestSentryHandler(t *testing.T) {
 		}
 	})
 }
+
+func TestSentryTags(t *testing.T) {
+	WithTestDSN(t, func(dsn string, pch <-chan *raven.Packet) {
+		logger := getTestLogger()
+		tags := map[string]string{
+			"site": "test",
+		}
+		levels := []logrus.Level{
+			logrus.ErrorLevel,
+		}
+
+		hook, err := NewWithTagsSentryHook(dsn, tags, levels)
+		if err != nil {
+			t.Fatal(err.Error())
+		}
+
+		logger.Hooks.Add(hook)
+
+		logger.Error(message)
+		packet := <-pch
+		expected := raven.Tags{
+			raven.Tag{
+				Key:   "site",
+				Value: "test",
+			},
+		}
+		if !reflect.DeepEqual(packet.Tags, expected) {
+			t.Errorf("message should have been %s, was %s", message, packet.Message)
+		}
+	})
+}