Merge 5e1420b into 9b66602

examples/go.mod

@@ -0,0 +1,12 @@
+module github.com/davidajao/logrus-appinsights/examples
+
+go 1.14
+
+require (
+	code.cloudfoundry.org/clock v0.0.0-20171121005523-e9dc86bbf0e5
+	github.com/microsoft/ApplicationInsights-Go v0.4.3
+	github.com/jjcollinge/logrus-appinsights v0.0.0-20180126091435-66656fe507b3
+	github.com/sirupsen/logrus v1.0.4
+	golang.org/x/crypto v0.0.0-20180126023034-0efb9460aaf8
+	golang.org/x/sys v0.0.0-20180125145336-03467258950d
+)

go.mod

@@ -0,0 +1,12 @@
+module github.com/davidajao/logrus-appinsights
+
+go 1.14
+
+require (
+	github.com/davecgh/go-spew v1.1.0 // indirect
+	github.com/microsoft/ApplicationInsights-Go v0.4.3
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/sirupsen/logrus v1.0.4
+	github.com/stretchr/testify v1.2.0
+	golang.org/x/crypto v0.0.0-20180123095555-3d37316aaa6b // indirect
+)

go.sum

@@ -0,0 +1,38 @@
+code.cloudfoundry.org/clock v0.0.0-20171121005523-e9dc86bbf0e5/go.mod h1:QD9Lzhd/ux6eNQVUDVRJX/RKTigpewimNYBi7ivZKY8=
+code.cloudfoundry.org/clock v0.0.0-20180518195852-02e53af36e6c h1:5eeuG0BHx1+DHeT3AP+ISKZ2ht1UjGhm581ljqYpVeQ=
+code.cloudfoundry.org/clock v0.0.0-20180518195852-02e53af36e6c/go.mod h1:QD9Lzhd/ux6eNQVUDVRJX/RKTigpewimNYBi7ivZKY8=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/microsoft/ApplicationInsights-Go v0.4.3 h1:gBuy5rM3o6Zo69QTkq1Ens8wx6sVf+mpgMjjfayiRcw=
+github.com/microsoft/ApplicationInsights-Go v0.4.3/go.mod h1:ih0t3h84PdzV1qGeUs89o9wL8eCuwf24M7TZp/nyqXk=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
+github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/sirupsen/logrus v1.0.4 h1:gzbtLsZC3Ic5PptoRG+kQj4L60qjK7H7XszrU163JNQ=
+github.com/sirupsen/logrus v1.0.4/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
+github.com/stretchr/testify v1.2.0 h1:LThGCOvhuJic9Gyd1VBCkhyUXmO8vKaBFvBsJ2k03rg=
+github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0=
+golang.org/x/crypto v0.0.0-20180123095555-3d37316aaa6b h1:VqIuNRBMdkwj3QmFfZdCw5Mzlv4BFaMda+dzdi9gAIQ=
+golang.org/x/crypto v0.0.0-20180123095555-3d37316aaa6b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180125145336-03467258950d/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

hook.go

@@ -2,10 +2,12 @@ package logrus_appinsights
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
-
-	"github.com/Microsoft/ApplicationInsights-Go/appinsights"
+	"github.com/microsoft/ApplicationInsights-Go/appinsights"
+	"github.com/microsoft/ApplicationInsights-Go/appinsights/contracts"
 	"github.com/sirupsen/logrus"
+	"time"
 )
 
 var defaultLevels = []logrus.Level{
@@ -16,15 +18,15 @@ var defaultLevels = []logrus.Level{
 	logrus.InfoLevel,
 }
 
-var levelMap = map[logrus.Level]appinsights.SeverityLevel{
+var levelMap = map[logrus.Level]contracts.SeverityLevel{
 	logrus.PanicLevel: appinsights.Critical,
 	logrus.FatalLevel: appinsights.Critical,
 	logrus.ErrorLevel: appinsights.Error,
 	logrus.WarnLevel:  appinsights.Warning,
 	logrus.InfoLevel:  appinsights.Information,
 }
 
-// AppInsightsHook is a logrus hook for Application Insights
+// AppInsightsHook is a logger hook for Application Insights
 type AppInsightsHook struct {
 	client appinsights.TelemetryClient
 
@@ -34,8 +36,31 @@ type AppInsightsHook struct {
 	filters      map[string]func(interface{}) interface{}
 }
 
+
 // New returns an initialised logrus hook for Application Insights
-func New(name string, conf Config) (*AppInsightsHook, error) {
+func New(iKey string) (*AppInsightsHook, error) {
+	if iKey == "" {
+		return nil, errors.New("InstrumentationKey is required and missing from configuration")
+	}
+	telemetryConfig := appinsights.NewTelemetryConfiguration(iKey)
+
+	// Configure how many items can be sent in one call to the data collector:
+	telemetryConfig.MaxBatchSize = 8192
+	// Configure the maximum delay before sending queued telemetry:
+	telemetryConfig.MaxBatchInterval = 2 * time.Second
+
+	telemetryClient := appinsights.NewTelemetryClientFromConfig(telemetryConfig)
+
+	return &AppInsightsHook{
+		client:       telemetryClient,
+		levels:       defaultLevels,
+		ignoreFields: make(map[string]struct{}),
+		filters:      make(map[string]func(interface{}) interface{}),
+	}, nil
+}
+
+// NewWithAppInsightsConfig returns an initialised logrus hook for Application Insights using a predefined config
+func NewWithAppInsightsConfig(conf *appinsights.TelemetryConfiguration) (*AppInsightsHook, error) {
 	if conf.InstrumentationKey == "" {
 		return nil, fmt.Errorf("InstrumentationKey is required and missing from configuration")
 	}
@@ -50,29 +75,7 @@ func New(name string, conf Config) (*AppInsightsHook, error) {
 		telemetryConf.EndpointUrl = conf.EndpointUrl
 	}
 	telemetryClient := appinsights.NewTelemetryClientFromConfig(telemetryConf)
-	if name != "" {
-		telemetryClient.Context().Cloud().SetRoleName(name)
-	}
-	return &AppInsightsHook{
-		client:       telemetryClient,
-		levels:       defaultLevels,
-		ignoreFields: make(map[string]struct{}),
-		filters:      make(map[string]func(interface{}) interface{}),
-	}, nil
-}
 
-// NewWithAppInsightsConfig returns an initialised logrus hook for Application Insights
-func NewWithAppInsightsConfig(name string, conf *appinsights.TelemetryConfiguration) (*AppInsightsHook, error) {
-	if conf == nil {
-		return nil, fmt.Errorf("Nil configuration provided")
-	}
-	if conf.InstrumentationKey == "" {
-		return nil, fmt.Errorf("InstrumentationKey is required in configuration")
-	}
-	telemetryClient := appinsights.NewTelemetryClientFromConfig(conf)
-	if name != "" {
-		telemetryClient.Context().Cloud().SetRoleName(name)
-	}
 	return &AppInsightsHook{
 		client:       telemetryClient,
 		levels:       defaultLevels,
@@ -81,6 +84,7 @@ func NewWithAppInsightsConfig(name string, conf *appinsights.TelemetryConfigurat
 	}, nil
 }
 
+
 // Levels returns logging level to fire this hook.
 func (hook *AppInsightsHook) Levels() []logrus.Level {
 	return hook.levels
@@ -107,13 +111,25 @@ func (hook *AppInsightsHook) AddFilter(name string, fn func(interface{}) interfa
 	hook.filters[name] = fn
 }
 
-// Fire is invoked by logrus and sends log data to Application Insights.
-func (hook *AppInsightsHook) Fire(entry *logrus.Entry) error {
+// Fire is invoked by logrus wrapper and sends log data to Application Insights.
+func (hook *AppInsightsHook) Fire(entry *logrus.Entry) (err error) {
 	if !hook.async {
 		return hook.fire(entry)
 	}
+
 	// async - fire and forget
-	go hook.fire(entry)
+	go func() {
+		defer func() {
+			if r := recover(); r != nil {
+				err = errors.New(fmt.Sprintf("An error occurred: %s", r))
+			}
+		}()
+		hook.fire(entry)
+	}()
+
+	if err!=nil{
+		return err
+	}
 	return nil
 }
 
@@ -122,7 +138,7 @@ func (hook *AppInsightsHook) fire(entry *logrus.Entry) error {
 	if err != nil {
 		return err
 	}
-	hook.client.TrackTraceTelemetry(trace)
+	hook.client.Track(trace)
 	return nil
 }
 
@@ -135,7 +151,7 @@ func (hook *AppInsightsHook) buildTrace(entry *logrus.Entry) (*appinsights.Trace
 	level := levelMap[entry.Level]
 	trace := appinsights.NewTraceTelemetry(entry.Message, level)
 	if trace == nil {
-		return nil, fmt.Errorf("Could not create telemetry trace with entry %+v", entry)
+		return nil, errors.New(fmt.Sprintf("Could not create telemetry trace with entry %+v", entry))
 	}
 	for k, v := range entry.Data {
 		if _, ok := hook.ignoreFields[k]; ok {
@@ -147,10 +163,10 @@ func (hook *AppInsightsHook) buildTrace(entry *logrus.Entry) (*appinsights.Trace
 			v = formatData(v) // use default formatter
 		}
 		vStr := fmt.Sprintf("%v", v)
-		trace.SetProperty(k, vStr)
+		trace.Properties[k] = vStr
 	}
-	trace.SetProperty("source_level", entry.Level.String())
-	trace.SetProperty("source_timestamp", entry.Time.String())
+	trace.Properties["source_level"] = entry.Level.String()
+	trace.Properties["source_timestamp"] = entry.Time.String()
 	return trace, nil
 }
 
@@ -170,4 +186,4 @@ func formatData(value interface{}) (formatted interface{}) {
 
 func stringPtr(str string) *string {
 	return &str
-}
+}