New: Import insights-logging

go.mod

@@ -8,6 +8,8 @@ require (
 	github.com/gogo/protobuf v1.2.1 // indirect
 	github.com/google/uuid v1.0.0 // indirect
 	github.com/gorilla/websocket v1.4.0
+	github.com/inconshreveable/log15 v0.0.0-20180818164646-67afb5ed74ec
+	github.com/mattn/go-colorable v0.1.2 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709
 	github.com/pkg/errors v0.8.1 // indirect
@@ -16,8 +18,7 @@ require (
 	github.com/prometheus/common v0.0.0-20181020173914-7e9e6cabbd39 // indirect
 	github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d // indirect
 	github.com/puppetlabs/errawr-gen v1.0.0
-	github.com/puppetlabs/errawr-go/v2 v2.0.1
-	github.com/puppetlabs/insights-logging v0.0.0-20180912211921-3b7d3d14cd5b
+	github.com/puppetlabs/errawr-go/v2 v2.1.0
 	github.com/reflect/xparse v0.0.0-20171128034418-ab29bdc5e11c
 	github.com/stretchr/testify v1.3.0
 	golang.org/x/text v0.3.0

go.sum

@@ -34,11 +34,13 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
+github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.6 h1:SrwhHcpV4nWrMGdNcC2kXpMfcBVYGDuTArqyhocJgvA=
 github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -62,9 +64,9 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d h1:GoAlyOgbOEIFd
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/puppetlabs/errawr-gen v1.0.0 h1:wYnwt4iZ3MrU7gKl4KC0FA5LlkSHxj6dvhkxNC43sss=
 github.com/puppetlabs/errawr-gen v1.0.0/go.mod h1:n6CCVuGN+YndjZ3ZoF+YIpN6csDjqoT3StMUbk6pfCE=
-github.com/puppetlabs/errawr-go/v2 v2.0.1 h1:xy9B3YtczkJZsuDR48lfecaiJ7RJkdlHoe+qPzv07fw=
 github.com/puppetlabs/errawr-go/v2 v2.0.1/go.mod h1:QoiQaxibNaOzYFkZMBhFj35Qjw1vizUAi59por1l1Vc=
-github.com/puppetlabs/insights-logging v0.0.0-20180912211921-3b7d3d14cd5b h1:csdggFOzdzhikHBgnuFDwcdtFV4o/iF/7v2yySMWMvE=
+github.com/puppetlabs/errawr-go/v2 v2.1.0 h1:SMZe3K6fSWOpo8Ol1u1G3slNroihmuka5uuUzpEL3n0=
+github.com/puppetlabs/errawr-go/v2 v2.1.0/go.mod h1:TFKBrNpfPDG8ta8/NfaqpC+hMMsJqd9xKvBJDRgHFCQ=
 github.com/puppetlabs/insights-logging v0.0.0-20180912211921-3b7d3d14cd5b/go.mod h1:wPccOvbQAZAyYVoYD96psW8poDy42dBZVyZoq49fT/I=
 github.com/reflect/raymond v0.0.0-20190227215356-5fa3955f4a50 h1:tQC2Xbytchkj88dqeRQeuvfG4mDSKU/r5ovo+16XJ2I=
 github.com/reflect/raymond v0.0.0-20190227215356-5fa3955f4a50/go.mod h1:Bmc/S4QVVTw9ZH5y5JLDKbgeykqJLnSiUqtQ9SaHjmQ=
@@ -103,15 +105,13 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190611164126-1d0142ba474a h1:7Wn09t99lLskLcCBJf45ZC52eUEGnCnsh4qUdDXoeUI=
 golang.org/x/tools v0.0.0-20190611164126-1d0142ba474a/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

httputil/api/logging.go

@@ -3,7 +3,7 @@ package api
 import (
 	"context"
 
-	logging "github.com/puppetlabs/insights-logging"
+	logging "github.com/puppetlabs/horsehead/logging"
 )
 
 var (

httputil/api/middleware.go

@@ -4,8 +4,8 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/puppetlabs/horsehead/logging"
 	"github.com/puppetlabs/horsehead/request"
-	logging "github.com/puppetlabs/insights-logging"
 )
 
 func RequestMiddleware(next http.Handler) http.Handler {

instrumentation/metrics/logging.go

@@ -3,7 +3,7 @@ package metrics
 import (
 	"context"
 
-	logging "github.com/puppetlabs/insights-logging"
+	"github.com/puppetlabs/horsehead/logging"
 )
 
 var (

instrumentation/metrics/metrics.go

@@ -10,7 +10,7 @@ import (
 	"github.com/puppetlabs/horsehead/instrumentation/metrics/collectors"
 	"github.com/puppetlabs/horsehead/instrumentation/metrics/delegates"
 	"github.com/puppetlabs/horsehead/instrumentation/metrics/internal/noop"
-	logging "github.com/puppetlabs/insights-logging"
+	"github.com/puppetlabs/horsehead/logging"
 )
 
 type errorBehavior int

logging/logging.go

@@ -3,9 +3,8 @@ package logging
 import (
 	"os"
 
-	"github.com/puppetlabs/insights-logging/handler"
-
 	"github.com/inconshreveable/log15"
+	"github.com/puppetlabs/horsehead/logging/handler"
 )
 
 var (