# HG changeset patch
# User Christophe de Vienne <christophe@cdevienne.info>
# Date 1599484605 -7200
# Mon Sep 07 15:16:45 2020 +0200
# Node ID 36b138158c4344ab392ea8faf149aa561c54fa32
# Parent 74d0ea3afa2f3b980cb95edb11ebd98a5112d692
Import logging utilities from rednerd
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,22 @@
+image: golang:1.14
+
+stages:
+ - test
+
+lint_code:
+ stage: test
+ cache:
+ paths:
+ - tools/bin
+ script:
+ - make lint
+
+tests:
+ stage: test
+ variables:
+ GOPATH: $CI_PROJECT_DIR/.gopath
+ cache:
+ paths:
+ - .gopath/pkg/mod
+ script:
+ - go test .
diff --git a/.golangci.yml b/.golangci.yml
new file mode 100644
--- /dev/null
+++ b/.golangci.yml
@@ -0,0 +1,16 @@
+run:
+ timeout: 2m
+linters:
+ enable:
+ - misspell
+ - golint
+ - whitespace
+ - unconvert
+ - gosec
+linters-settings:
+ golint:
+ # minimal confidence for issues, default is 0.8
+ min-confidence: 0.5
+issues:
+ exclude:
+ - SA5008 # duplicate struct tag (staticcheck)
diff --git a/.hgignore b/.hgignore
new file mode 100644
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,3 @@
+syntax: glob
+
+tools/bin
diff --git a/Makefile b/Makefile
new file mode 100644
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,20 @@
+
+GOLANGCI_LINT_VERSION = v1.30.0
+GOLANGCI_LINT_BIN = tools/bin/golangci-lint-$(GOLANGCI_LINT_VERSION)
+
+help: ## Display this help
+ @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
+ | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+$(GOLANGCI_LINT_BIN):
+ mkdir -p tools/bin
+ if (which curl) then \
+ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh; \
+ else \
+ wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh; \
+ fi \
+ | sh -s -- -b $$(go env GOPATH)/bin $(GOLANGCI_LINT_VERSION) \
+ && cp $$(go env GOPATH)/bin/golangci-lint $(GOLANGCI_LINT_BIN)
+
+lint: $(GOLANGCI_LINT_BIN) ## Lint the files
+ $(GOLANGCI_LINT_BIN) run
diff --git a/go.mod b/go.mod
--- a/go.mod
+++ b/go.mod
@@ -1,3 +1,11 @@
module orus.io/orus-io/go-orus-api
go 1.14
+
+require (
+ github.com/getsentry/sentry-go v0.7.0
+ github.com/rs/zerolog v1.19.0
+ github.com/stretchr/testify v1.6.1
+ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
+ gotest.tools v2.2.0+incompatible
+)
diff --git a/go.sum b/go.sum
new file mode 100644
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,183 @@
+github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw=
+github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w=
+github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
+github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM=
+github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
+github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
+github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
+github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
+github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
+github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
+github.com/getsentry/sentry-go v0.7.0 h1:MR2yfR4vFfv/2+iBuSnkdQwVg7N9cJzihZ6KJu7srwQ=
+github.com/getsentry/sentry-go v0.7.0/go.mod h1:pLFpD2Y5RHIKF9Bw3KH6/68DeN2K/XBJd8awjdPnUwg=
+github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
+github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
+github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
+github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
+github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
+github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
+github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
+github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
+github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI=
+github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0=
+github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI=
+github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q=
+github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U=
+github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA=
+github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
+github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk=
+github.com/kataras/iris/v12 v12.0.1/go.mod h1:udK4vLQKkdDqMGJJVd/msuMtN6hpYJhg/lSzuxjhO+U=
+github.com/kataras/neffos v0.0.10/go.mod h1:ZYmJC07hQPW67eKuzlfY7SO3bC0mw83A3j6im82hfqw=
+github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod h1:NV88laa9UiiDuX9AhMbDPkGYSPugBOV6yTZB1l2K9Z0=
+github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
+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/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g=
+github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
+github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
+github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg=
+github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ=
+github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
+github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM=
+github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4=
+github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+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/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
+github.com/rs/zerolog v1.19.0 h1:hYz4ZVdUgjXTBUmrkrw55j1nHx68LfOKIQk5IYtyScg=
+github.com/rs/zerolog v1.19.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo=
+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
+github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
+github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
+github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
+github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI=
+github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
+github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM=
+golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190828213141-aed303cbaa74/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
+gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
+gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gotest.tools v1.4.0 h1:BjtEgfuw8Qyd+jPvQz8CfoxiO/UjFEidWinwEXZiWv0=
+gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
+gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
diff --git a/log-console-writer.go b/log-console-writer.go
new file mode 100644
--- /dev/null
+++ b/log-console-writer.go
@@ -0,0 +1,474 @@
+package orusapi
+
+/*
+This is a modified zerolog.ConsoleWriter that handles specification the
+"exception" field. The exception field will always be output last, and
+if a sentry-json encoded stack trace is dectected, it will be formatted
+on multiple lines, so a human can read it easily.
+*/
+
+import (
+ "bytes"
+ "encoding/json"
+ "fmt"
+ "io"
+ "os"
+ "sort"
+ "strconv"
+ "strings"
+ "sync"
+ "time"
+
+ "github.com/getsentry/sentry-go"
+ "github.com/rs/zerolog"
+)
+
+// ExceptionFieldName is the field name used for exception fields.
+// In our case, it should be a sentry-formatted exception built from a panic
+const ExceptionFieldName = "exception"
+
+const (
+ colorBlack = iota + 30 //nolint:deadcode,varcheck
+ colorRed
+ colorGreen
+ colorYellow
+ colorBlue //nolint:deadcode,varcheck
+ colorMagenta
+ colorCyan
+ colorWhite //nolint:deadcode,varcheck
+
+ colorBold = 1
+ colorDarkGray = 90
+)
+
+var (
+ consoleBufPool = sync.Pool{
+ New: func() interface{} {
+ return bytes.NewBuffer(make([]byte, 0, 100))
+ },
+ }
+)
+
+const (
+ consoleDefaultTimeFormat = time.Kitchen
+)
+
+// Formatter transforms the input into a formatted string.
+type Formatter func(interface{}) string
+
+// ConsoleWriter parses the JSON input and writes it in an
+// (optionally) colorized, human-friendly format to Out.
+type ConsoleWriter struct {
+ // Out is the output destination.
+ Out io.Writer
+
+ // NoColor disables the colorized output.
+ NoColor bool
+
+ // TimeFormat specifies the format for timestamp in output.
+ TimeFormat string
+
+ // PartsOrder defines the order of parts in output.
+ PartsOrder []string
+
+ FormatTimestamp Formatter
+ FormatLevel Formatter
+ FormatCaller Formatter
+ FormatMessage Formatter
+ FormatFieldName Formatter
+ FormatFieldValue Formatter
+ FormatErrFieldName Formatter
+ FormatErrFieldValue Formatter
+ FormatExcFieldName Formatter
+ FormatExcFieldValue Formatter
+}
+
+// NewConsoleWriter creates and initializes a new ConsoleWriter.
+func NewConsoleWriter(options ...func(w *ConsoleWriter)) ConsoleWriter {
+ w := ConsoleWriter{
+ Out: os.Stdout,
+ TimeFormat: consoleDefaultTimeFormat,
+ PartsOrder: consoleDefaultPartsOrder(),
+ }
+
+ for _, opt := range options {
+ opt(&w)
+ }
+
+ return w
+}
+
+// Write transforms the JSON input with formatters and appends to w.Out.
+func (w ConsoleWriter) Write(p []byte) (n int, err error) {
+ if w.PartsOrder == nil {
+ w.PartsOrder = consoleDefaultPartsOrder()
+ }
+
+ var buf = consoleBufPool.Get().(*bytes.Buffer)
+ defer func() {
+ buf.Reset()
+ consoleBufPool.Put(buf)
+ }()
+
+ var evt map[string]interface{}
+ p = decodeIfBinaryToBytes(p)
+ d := json.NewDecoder(bytes.NewReader(p))
+ d.UseNumber()
+ err = d.Decode(&evt)
+ if err != nil {
+ return n, fmt.Errorf("cannot decode event: %s", err)
+ }
+
+ for _, p := range w.PartsOrder {
+ w.writePart(buf, evt, p)
+ }
+
+ w.writeFields(evt, buf)
+
+ err = buf.WriteByte('\n')
+ if err != nil {
+ return n, err
+ }
+ _, err = buf.WriteTo(w.Out)
+ return len(p), err
+}
+
+// writeFields appends formatted key-value pairs to buf.
+func (w ConsoleWriter) writeFields(evt map[string]interface{}, buf *bytes.Buffer) {
+ var fields = make([]string, 0, len(evt))
+ for field := range evt {
+ switch field {
+ case zerolog.LevelFieldName, zerolog.TimestampFieldName, zerolog.MessageFieldName, zerolog.CallerFieldName:
+ continue
+ }
+ fields = append(fields, field)
+ }
+ sort.Strings(fields)
+
+ if len(fields) > 0 {
+ buf.WriteByte(' ')
+ }
+
+ // Move the "error" field to the front, and the "exception" field to the back
+ erri := sort.Search(len(fields), func(i int) bool { return fields[i] >= zerolog.ErrorFieldName })
+ exci := sort.Search(len(fields), func(i int) bool { return fields[i] >= zerolog.ErrorFieldName })
+ hasErr := erri < len(fields) && fields[erri] == zerolog.ErrorFieldName
+ hasExc := exci < len(fields) && fields[exci] == ExceptionFieldName
+
+ var xfields = make([]string, 0, len(fields))
+ if hasErr {
+ xfields = append(xfields, zerolog.ErrorFieldName)
+ }
+ for i, field := range fields {
+ if hasErr && erri == i {
+ continue
+ }
+ if hasExc && exci == i {
+ continue
+ }
+ xfields = append(xfields, field)
+ }
+ if hasExc {
+ xfields = append(xfields, ExceptionFieldName)
+ }
+ fields = xfields
+
+ for i, field := range fields {
+ var fn Formatter
+ var fv Formatter
+
+ if field == zerolog.ErrorFieldName {
+ if w.FormatErrFieldName == nil {
+ fn = consoleDefaultFormatErrFieldName(w.NoColor)
+ } else {
+ fn = w.FormatErrFieldName
+ }
+
+ if w.FormatErrFieldValue == nil {
+ fv = consoleDefaultFormatErrFieldValue(w.NoColor)
+ } else {
+ fv = w.FormatErrFieldValue
+ }
+ } else if field == ExceptionFieldName {
+ if w.FormatExcFieldName == nil {
+ fn = consoleDefaultFormatExcFieldName(w.NoColor)
+ } else {
+ fn = w.FormatExcFieldName
+ }
+
+ if w.FormatExcFieldValue == nil {
+ fv = consoleDefaultFormatExcFieldValue(w.NoColor)
+ } else {
+ fv = w.FormatExcFieldValue
+ }
+ } else {
+ if w.FormatFieldName == nil {
+ fn = consoleDefaultFormatFieldName(w.NoColor)
+ } else {
+ fn = w.FormatFieldName
+ }
+
+ if w.FormatFieldValue == nil {
+ fv = consoleDefaultFormatFieldValue
+ } else {
+ fv = w.FormatFieldValue
+ }
+ }
+
+ buf.WriteString(fn(field))
+
+ switch fValue := evt[field].(type) {
+ case string:
+ if needsQuote(fValue) {
+ buf.WriteString(fv(strconv.Quote(fValue)))
+ } else {
+ buf.WriteString(fv(fValue))
+ }
+ case json.Number:
+ buf.WriteString(fv(fValue))
+ default:
+ b, err := json.Marshal(fValue)
+ if err != nil {
+ fmt.Fprintf(buf, colorize("[error: %v]", colorRed, w.NoColor), err)
+ } else {
+ fmt.Fprint(buf, fv(b))
+ }
+ }
+
+ if i < len(fields)-1 { // Skip space for last field
+ buf.WriteByte(' ')
+ }
+ }
+}
+
+// writePart appends a formatted part to buf.
+func (w ConsoleWriter) writePart(buf *bytes.Buffer, evt map[string]interface{}, p string) {
+ var f Formatter
+
+ switch p {
+ case zerolog.LevelFieldName:
+ if w.FormatLevel == nil {
+ f = consoleDefaultFormatLevel(w.NoColor)
+ } else {
+ f = w.FormatLevel
+ }
+ case zerolog.TimestampFieldName:
+ if w.FormatTimestamp == nil {
+ f = consoleDefaultFormatTimestamp(w.TimeFormat, w.NoColor)
+ } else {
+ f = w.FormatTimestamp
+ }
+ case zerolog.MessageFieldName:
+ if w.FormatMessage == nil {
+ f = consoleDefaultFormatMessage
+ } else {
+ f = w.FormatMessage
+ }
+ case zerolog.CallerFieldName:
+ if w.FormatCaller == nil {
+ f = consoleDefaultFormatCaller(w.NoColor)
+ } else {
+ f = w.FormatCaller
+ }
+ default:
+ if w.FormatFieldValue == nil {
+ f = consoleDefaultFormatFieldValue
+ } else {
+ f = w.FormatFieldValue
+ }
+ }
+
+ var s = f(evt[p])
+
+ if len(s) > 0 {
+ buf.WriteString(s)
+ if p != w.PartsOrder[len(w.PartsOrder)-1] { // Skip space for last part
+ buf.WriteByte(' ')
+ }
+ }
+}
+
+// needsQuote returns true when the string s should be quoted in output.
+func needsQuote(s string) bool {
+ for i := range s {
+ if s[i] < 0x20 || s[i] > 0x7e || s[i] == ' ' || s[i] == '\\' || s[i] == '"' {
+ return true
+ }
+ }
+ return false
+}
+
+// colorize returns the string s wrapped in ANSI code c, unless disabled is true.
+func colorize(s interface{}, c int, disabled bool) string {
+ if disabled {
+ return fmt.Sprintf("%s", s)
+ }
+ return fmt.Sprintf("\x1b[%dm%v\x1b[0m", c, s)
+}
+
+// ----- DEFAULT FORMATTERS ---------------------------------------------------
+
+func consoleDefaultPartsOrder() []string {
+ return []string{
+ zerolog.TimestampFieldName,
+ zerolog.LevelFieldName,
+ zerolog.CallerFieldName,
+ zerolog.MessageFieldName,
+ }
+}
+
+func consoleDefaultFormatTimestamp(timeFormat string, noColor bool) Formatter {
+ if timeFormat == "" {
+ timeFormat = consoleDefaultTimeFormat
+ }
+ return func(i interface{}) string {
+ t := "<nil>"
+ switch tt := i.(type) {
+ case string:
+ ts, err := time.Parse(zerolog.TimeFieldFormat, tt)
+ if err != nil {
+ t = tt
+ } else {
+ t = ts.Format(timeFormat)
+ }
+ case json.Number:
+ i, err := tt.Int64()
+ if err != nil {
+ t = tt.String()
+ } else {
+ var sec, nsec int64 = i, 0
+ switch zerolog.TimeFieldFormat {
+ case zerolog.TimeFormatUnixMs:
+ nsec = int64(time.Duration(i) * time.Millisecond)
+ sec = 0
+ case zerolog.TimeFormatUnixMicro:
+ nsec = int64(time.Duration(i) * time.Microsecond)
+ sec = 0
+ }
+ ts := time.Unix(sec, nsec).UTC()
+ t = ts.Format(timeFormat)
+ }
+ }
+ return colorize(t, colorDarkGray, noColor)
+ }
+}
+
+func consoleDefaultFormatLevel(noColor bool) Formatter {
+ return func(i interface{}) string {
+ var l string
+ if ll, ok := i.(string); ok {
+ switch ll {
+ case "trace":
+ l = colorize("TRC", colorMagenta, noColor)
+ case "debug":
+ l = colorize("DBG", colorYellow, noColor)
+ case "info":
+ l = colorize("INF", colorGreen, noColor)
+ case "warn":
+ l = colorize("WRN", colorRed, noColor)
+ case "error":
+ l = colorize(colorize("ERR", colorRed, noColor), colorBold, noColor)
+ case "fatal":
+ l = colorize(colorize("FTL", colorRed, noColor), colorBold, noColor)
+ case "panic":
+ l = colorize(colorize("PNC", colorRed, noColor), colorBold, noColor)
+ default:
+ l = colorize("???", colorBold, noColor)
+ }
+ } else {
+ if i == nil {
+ l = colorize("???", colorBold, noColor)
+ } else {
+ l = strings.ToUpper(fmt.Sprintf("%s", i))[0:3]
+ }
+ }
+ return l
+ }
+}
+
+func consoleDefaultFormatCaller(noColor bool) Formatter {
+ return func(i interface{}) string {
+ var c string
+ if cc, ok := i.(string); ok {
+ c = cc
+ }
+ if len(c) > 0 {
+ cwd, err := os.Getwd()
+ if err == nil {
+ c = strings.TrimPrefix(c, cwd)
+ c = strings.TrimPrefix(c, "/")
+ }
+ c = colorize(c, colorBold, noColor) + colorize(" >", colorCyan, noColor)
+ }
+ return c
+ }
+}
+
+func consoleDefaultFormatMessage(i interface{}) string {
+ if i == nil {
+ return ""
+ }
+ return fmt.Sprintf("%s", i)
+}
+
+func consoleDefaultFormatFieldName(noColor bool) Formatter {
+ return func(i interface{}) string {
+ return colorize(fmt.Sprintf("%s=", i), colorCyan, noColor)
+ }
+}
+
+func consoleDefaultFormatFieldValue(i interface{}) string {
+ return fmt.Sprintf("%s", i)
+}
+
+func consoleDefaultFormatErrFieldName(noColor bool) Formatter {
+ return func(i interface{}) string {
+ return colorize(fmt.Sprintf("%s=", i), colorRed, noColor)
+ }
+}
+
+func consoleDefaultFormatErrFieldValue(noColor bool) Formatter {
+ return func(i interface{}) string {
+ return colorize(fmt.Sprintf("%s", i), colorRed, noColor)
+ }
+}
+
+func consoleDefaultFormatExcFieldName(noColor bool) Formatter {
+ return func(i interface{}) string {
+ return colorize(fmt.Sprintf("%s=", i), colorRed, noColor)
+ }
+}
+
+func consoleDefaultFormatExcFieldValue(noColor bool) Formatter {
+ return func(i interface{}) string {
+ if b, ok := i.([]byte); ok {
+ var e sentry.Exception
+ if err := json.Unmarshal(b, &e); err == nil {
+ s := ""
+ if e.Value != "" {
+ s += e.Value
+ }
+ if e.Type != "" {
+ s += "(" + e.Type + ")"
+ }
+ s += "\n"
+ if e.Stacktrace != nil {
+ for _, frame := range e.Stacktrace.Frames {
+ s += PrintFrame(frame)
+ }
+ return s
+ }
+ }
+ }
+ return colorize(fmt.Sprintf("%s", i), colorRed, noColor)
+ }
+}
+
+func decodeIfBinaryToBytes(in []byte) []byte {
+ return in
+}
+
+// PrintFrame prints a sentry frame in a go stack-like manner
+func PrintFrame(frame sentry.Frame) string {
+ return fmt.Sprintf("%s.%s\n %s:%d\n", frame.Module, frame.Function, frame.AbsPath, frame.Lineno)
+}
diff --git a/log-console-writer_test.go b/log-console-writer_test.go
new file mode 100644
--- /dev/null
+++ b/log-console-writer_test.go
@@ -0,0 +1,391 @@
+package orusapi
+
+import (
+ "bytes"
+ "encoding/json"
+ "fmt"
+ "io/ioutil"
+ "os"
+ "runtime/debug"
+ "strings"
+ "testing"
+ "time"
+
+ "github.com/getsentry/sentry-go"
+ "github.com/rs/zerolog"
+ "github.com/stretchr/testify/assert"
+)
+
+func ExampleConsoleWriter() {
+ log := zerolog.New(ConsoleWriter{Out: os.Stdout, NoColor: true})
+
+ log.Info().Str("foo", "bar").Msg("Hello World")
+ // Output: <nil> INF Hello World foo=bar
+}
+
+func ExampleConsoleWriter_customFormatters() {
+ out := ConsoleWriter{Out: os.Stdout, NoColor: true}
+ out.FormatLevel = func(i interface{}) string { return strings.ToUpper(fmt.Sprintf("%-6s|", i)) }
+ out.FormatFieldName = func(i interface{}) string { return fmt.Sprintf("%s:", i) }
+ out.FormatFieldValue = func(i interface{}) string { return strings.ToUpper(fmt.Sprintf("%s", i)) }
+ log := zerolog.New(out)
+
+ log.Info().Str("foo", "bar").Msg("Hello World")
+ // Output: <nil> INFO | Hello World foo:BAR
+}
+
+func ExampleNewConsoleWriter() {
+ out := zerolog.NewConsoleWriter()
+ out.NoColor = true // For testing purposes only
+ log := zerolog.New(out)
+
+ log.Debug().Str("foo", "bar").Msg("Hello World")
+ // Output: <nil> DBG Hello World foo=bar
+}
+
+func ExampleNewConsoleWriter_customFormatters() {
+ out := NewConsoleWriter(
+ func(w *ConsoleWriter) {
+ // Customize time format
+ w.TimeFormat = time.RFC822
+ // Customize level formatting
+ w.FormatLevel = func(i interface{}) string { return strings.ToUpper(fmt.Sprintf("[%-5s]", i)) }
+ },
+ )
+ out.NoColor = true // For testing purposes only
+
+ log := zerolog.New(out)
+
+ log.Info().Str("foo", "bar").Msg("Hello World")
+ // Output: <nil> [INFO ] Hello World foo=bar
+}
+
+func TestConsoleLogger(t *testing.T) {
+ t.Run("Numbers", func(t *testing.T) {
+ buf := &bytes.Buffer{}
+ log := zerolog.New(ConsoleWriter{Out: buf, NoColor: true})
+ log.Info().
+ Float64("float", 1.23).
+ Uint64("small", 123).
+ Uint64("big", 1152921504606846976).
+ Msg("msg")
+ if got, want := strings.TrimSpace(buf.String()), "<nil> INF msg big=1152921504606846976 float=1.23 small=123"; got != want {
+ t.Errorf("\ngot:\n%s\nwant:\n%s", got, want)
+ }
+ })
+}
+
+func TestConsoleWriter(t *testing.T) {
+ t.Run("Default field formatter", func(t *testing.T) {
+ buf := &bytes.Buffer{}
+ w := ConsoleWriter{Out: buf, NoColor: true, PartsOrder: []string{"foo"}}
+
+ _, err := w.Write([]byte(`{"foo": "DEFAULT"}`))
+ if err != nil {
+ t.Errorf("Unexpected error when writing output: %s", err)
+ }
+
+ expectedOutput := "DEFAULT foo=DEFAULT\n"
+ actualOutput := buf.String()
+ if actualOutput != expectedOutput {
+ t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
+ }
+ })
+
+ t.Run("Write colorized", func(t *testing.T) {
+ buf := &bytes.Buffer{}
+ w := ConsoleWriter{Out: buf, NoColor: false}
+
+ _, err := w.Write([]byte(`{"level": "warn", "message": "Foobar"}`))
+ if err != nil {
+ t.Errorf("Unexpected error when writing output: %s", err)
+ }
+
+ expectedOutput := "\x1b[90m<nil>\x1b[0m \x1b[31mWRN\x1b[0m Foobar\n"
+ actualOutput := buf.String()
+ if actualOutput != expectedOutput {
+ t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
+ }
+ })
+
+ t.Run("Write fields", func(t *testing.T) {
+ buf := &bytes.Buffer{}
+ w := ConsoleWriter{Out: buf, NoColor: true}
+
+ d := time.Unix(0, 0).UTC().Format(time.RFC3339)
+ _, err := w.Write([]byte(`{"time": "` + d + `", "level": "debug", "message": "Foobar", "foo": "bar"}`))
+ if err != nil {
+ t.Errorf("Unexpected error when writing output: %s", err)
+ }
+
+ expectedOutput := "12:00AM DBG Foobar foo=bar\n"
+ actualOutput := buf.String()
+ if actualOutput != expectedOutput {
+ t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
+ }
+ })
+
+ t.Run("Unix timestamp input format", func(t *testing.T) {
+ of := zerolog.TimeFieldFormat
+ defer func() {
+ zerolog.TimeFieldFormat = of
+ }()
+ zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
+
+ buf := &bytes.Buffer{}
+ w := ConsoleWriter{Out: buf, TimeFormat: time.StampMilli, NoColor: true}
+
+ _, err := w.Write([]byte(`{"time": 1234, "level": "debug", "message": "Foobar", "foo": "bar"}`))
+ if err != nil {
+ t.Errorf("Unexpected error when writing output: %s", err)
+ }
+
+ expectedOutput := "Jan 1 00:20:34.000 DBG Foobar foo=bar\n"
+ actualOutput := buf.String()
+ if actualOutput != expectedOutput {
+ t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
+ }
+ })
+
+ t.Run("Unix timestamp ms input format", func(t *testing.T) {
+ of := zerolog.TimeFieldFormat
+ defer func() {
+ zerolog.TimeFieldFormat = of
+ }()
+ zerolog.TimeFieldFormat = zerolog.TimeFormatUnixMs
+
+ buf := &bytes.Buffer{}
+ w := ConsoleWriter{Out: buf, TimeFormat: time.StampMilli, NoColor: true}
+
+ _, err := w.Write([]byte(`{"time": 1234567, "level": "debug", "message": "Foobar", "foo": "bar"}`))
+ if err != nil {
+ t.Errorf("Unexpected error when writing output: %s", err)
+ }
+
+ expectedOutput := "Jan 1 00:20:34.567 DBG Foobar foo=bar\n"
+ actualOutput := buf.String()
+ if actualOutput != expectedOutput {
+ t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
+ }
+ })
+
+ t.Run("Unix timestamp us input format", func(t *testing.T) {
+ of := zerolog.TimeFieldFormat
+ defer func() {
+ zerolog.TimeFieldFormat = of
+ }()
+ zerolog.TimeFieldFormat = zerolog.TimeFormatUnixMicro
+
+ buf := &bytes.Buffer{}
+ w := ConsoleWriter{Out: buf, TimeFormat: time.StampMicro, NoColor: true}
+
+ _, err := w.Write([]byte(`{"time": 1234567891, "level": "debug", "message": "Foobar", "foo": "bar"}`))
+ if err != nil {
+ t.Errorf("Unexpected error when writing output: %s", err)
+ }
+
+ expectedOutput := "Jan 1 00:20:34.567891 DBG Foobar foo=bar\n"
+ actualOutput := buf.String()
+ if actualOutput != expectedOutput {
+ t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
+ }
+ })
+
+ t.Run("No message field", func(t *testing.T) {
+ buf := &bytes.Buffer{}
+ w := ConsoleWriter{Out: buf, NoColor: true}
+
+ _, err := w.Write([]byte(`{"level": "debug", "foo": "bar"}`))
+ if err != nil {
+ t.Errorf("Unexpected error when writing output: %s", err)
+ }
+
+ expectedOutput := "<nil> DBG foo=bar\n"
+ actualOutput := buf.String()
+ if actualOutput != expectedOutput {
+ t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
+ }
+ })
+
+ t.Run("No level field", func(t *testing.T) {
+ buf := &bytes.Buffer{}
+ w := ConsoleWriter{Out: buf, NoColor: true}
+
+ _, err := w.Write([]byte(`{"message": "Foobar", "foo": "bar"}`))
+ if err != nil {
+ t.Errorf("Unexpected error when writing output: %s", err)
+ }
+
+ expectedOutput := "<nil> ??? Foobar foo=bar\n"
+ actualOutput := buf.String()
+ if actualOutput != expectedOutput {
+ t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
+ }
+ })
+
+ t.Run("Write colorized fields", func(t *testing.T) {
+ buf := &bytes.Buffer{}
+ w := ConsoleWriter{Out: buf, NoColor: false}
+
+ _, err := w.Write([]byte(`{"level": "warn", "message": "Foobar", "foo": "bar"}`))
+ if err != nil {
+ t.Errorf("Unexpected error when writing output: %s", err)
+ }
+
+ expectedOutput := "\x1b[90m<nil>\x1b[0m \x1b[31mWRN\x1b[0m Foobar \x1b[36mfoo=\x1b[0mbar\n"
+ actualOutput := buf.String()
+ if actualOutput != expectedOutput {
+ t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
+ }
+ })
+
+ t.Run("Write error field", func(t *testing.T) {
+ buf := &bytes.Buffer{}
+ w := ConsoleWriter{Out: buf, NoColor: true}
+
+ d := time.Unix(0, 0).UTC().Format(time.RFC3339)
+ evt := `{"time": "` + d + `", "level": "error", "message": "Foobar", "aaa": "bbb", "error": "Error"}`
+ // t.Log(evt)
+
+ _, err := w.Write([]byte(evt))
+ if err != nil {
+ t.Errorf("Unexpected error when writing output: %s", err)
+ }
+
+ expectedOutput := "12:00AM ERR Foobar error=Error aaa=bbb\n"
+ actualOutput := buf.String()
+ if actualOutput != expectedOutput {
+ t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
+ }
+ })
+
+ t.Run("Write caller field", func(t *testing.T) {
+ buf := &bytes.Buffer{}
+ w := ConsoleWriter{Out: buf, NoColor: true}
+
+ cwd, err := os.Getwd()
+ if err != nil {
+ t.Fatalf("Cannot get working directory: %s", err)
+ }
+
+ d := time.Unix(0, 0).UTC().Format(time.RFC3339)
+ evt := `{"time": "` + d + `", "level": "debug", "message": "Foobar", "foo": "bar", "caller": "` + cwd + `/foo/bar.go"}`
+ // t.Log(evt)
+
+ _, err = w.Write([]byte(evt))
+ if err != nil {
+ t.Errorf("Unexpected error when writing output: %s", err)
+ }
+
+ expectedOutput := "12:00AM DBG foo/bar.go > Foobar foo=bar\n"
+ actualOutput := buf.String()
+ if actualOutput != expectedOutput {
+ t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
+ }
+ })
+
+ t.Run("Write JSON field", func(t *testing.T) {
+ buf := &bytes.Buffer{}
+ w := ConsoleWriter{Out: buf, NoColor: true}
+
+ evt := `{"level": "debug", "message": "Foobar", "foo": [1, 2, 3], "bar": true}`
+ // t.Log(evt)
+
+ _, err := w.Write([]byte(evt))
+ if err != nil {
+ t.Errorf("Unexpected error when writing output: %s", err)
+ }
+
+ expectedOutput := "<nil> DBG Foobar bar=true foo=[1,2,3]\n"
+ actualOutput := buf.String()
+ if actualOutput != expectedOutput {
+ t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
+ }
+ })
+
+ t.Run("Write exception", func(t *testing.T) {
+ buf := &bytes.Buffer{}
+ w := ConsoleWriter{Out: buf, NoColor: true}
+
+ b := debug.Stack()
+ t.Log(string(b))
+
+ st := sentry.NewStacktrace()
+ b, err := json.Marshal(st)
+ if err != nil {
+ t.Errorf("Unexpected error marshaling exception: %s", err)
+ t.FailNow()
+ }
+
+ evt := `{"level": "error", "message": "Foobar", "exception": {"type": "any", "value": "error!", "stacktrace": ` + string(b) + `}}`
+
+ _, err = w.Write([]byte(evt))
+ if err != nil {
+ t.Errorf("Unexpected error when writing output: %s", err)
+ }
+
+ wd, err := os.Getwd()
+ assert.NoError(t, err)
+ expectedOutput := fmt.Sprintf(`<nil> ERR Foobar exception=error!(any)
+orus.io/orus-io/go-orus-api.TestConsoleWriter.func13
+ %s/log-console-writer_test.go:313
+
+`, wd)
+ actualOutput := buf.String()
+ t.Log(actualOutput)
+ if actualOutput != expectedOutput {
+ t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
+ }
+ })
+}
+
+func TestConsoleWriterConfiguration(t *testing.T) {
+ t.Run("Sets TimeFormat", func(t *testing.T) {
+ buf := &bytes.Buffer{}
+ w := ConsoleWriter{Out: buf, NoColor: true, TimeFormat: time.RFC3339}
+
+ d := time.Unix(0, 0).UTC().Format(time.RFC3339)
+ evt := `{"time": "` + d + `", "level": "info", "message": "Foobar"}`
+
+ _, err := w.Write([]byte(evt))
+ if err != nil {
+ t.Errorf("Unexpected error when writing output: %s", err)
+ }
+
+ expectedOutput := "1970-01-01T00:00:00Z INF Foobar\n"
+ actualOutput := buf.String()
+ if actualOutput != expectedOutput {
+ t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
+ }
+ })
+
+ t.Run("Sets PartsOrder", func(t *testing.T) {
+ buf := &bytes.Buffer{}
+ w := ConsoleWriter{Out: buf, NoColor: true, PartsOrder: []string{"message", "level"}}
+
+ evt := `{"level": "info", "message": "Foobar"}`
+ _, err := w.Write([]byte(evt))
+ if err != nil {
+ t.Errorf("Unexpected error when writing output: %s", err)
+ }
+
+ expectedOutput := "Foobar INF\n"
+ actualOutput := buf.String()
+ if actualOutput != expectedOutput {
+ t.Errorf("Unexpected output %q, want: %q", actualOutput, expectedOutput)
+ }
+ })
+}
+
+func BenchmarkConsoleWriter(b *testing.B) {
+ b.ResetTimer()
+ b.ReportAllocs()
+
+ var msg = []byte(`{"level": "info", "foo": "bar", "message": "HELLO", "time": "1990-01-01"}`)
+
+ w := ConsoleWriter{Out: ioutil.Discard, NoColor: false}
+
+ for i := 0; i < b.N; i++ {
+ _, _ = w.Write(msg)
+ }
+}
diff --git a/logging.go b/logging.go
new file mode 100644
--- /dev/null
+++ b/logging.go
@@ -0,0 +1,109 @@
+package orusapi
+
+import (
+ "fmt"
+ "io"
+
+ "github.com/rs/zerolog"
+ "github.com/rs/zerolog/log"
+ "golang.org/x/crypto/ssh/terminal"
+)
+
+// DefaultLogger ...
+func DefaultLogger(output io.Writer) zerolog.Logger {
+ return zerolog.
+ New(output).
+ With().
+ Timestamp().
+ Logger().
+ Level(zerolog.WarnLevel)
+}
+
+// LoggingOptions holds the logging options
+type LoggingOptions struct {
+ Level func(string) error `long:"log-level" env:"LOG_LEVEL" ini-name:"log-level" choice:"trace" choice:"debug" choice:"info" choice:"warn" choice:"error" choice:"fatal" choice:"panic" choice:"auto" default:"auto" description:"log level. 'auto' selects 'info' when stdout is a tty, 'error' otherwise."`
+ Format func(string) error `long:"log-format" env:"LOG_FORMAT" ini-name:"log-format" choice:"json" choice:"pretty" choice:"auto" default:"auto" description:"Logs format. 'auto' selects 'pretty' if stdout is a tty."`
+ Verbose func() `short:"v" long:"verbose" no-ini:"t" description:"Increase log verbosity. Can be repeated"`
+
+ logFinalOutput io.Writer `no-flag:"t"`
+ logOutput io.Writer `no-flag:"t"`
+ logWrappers []func(io.Writer) io.Writer `no-flag:"t"`
+ log *zerolog.Logger `no-flag:"t"`
+}
+
+func (o *LoggingOptions) resetOutput() {
+ out := o.logOutput
+ for _, wrapper := range o.logWrappers {
+ out = wrapper(out)
+ }
+ *o.log = o.log.Output(out)
+}
+
+// SetMinLoggingLevel makes sure the logging level is not under a given value
+func (o *LoggingOptions) SetMinLoggingLevel(level zerolog.Level) {
+ if level < o.log.GetLevel() {
+ *o.log = log.Level(level)
+ }
+}
+
+// Setup ...
+func (o *LoggingOptions) Setup(log *zerolog.Logger, output io.Writer) error {
+ var logLevelAutoLocked = false
+
+ o.logFinalOutput = output
+
+ o.log = log
+ *o.log = DefaultLogger(output)
+
+ o.Format = func(format string) error {
+ if format == "auto" {
+ if outputFile, hasFd := o.logFinalOutput.(interface{ Fd() uintptr }); hasFd && terminal.IsTerminal(int(outputFile.Fd())) {
+ format = "pretty"
+ } else {
+ format = "json"
+ }
+ }
+ switch format {
+ case "pretty":
+ o.logOutput = ConsoleWriter{Out: o.logFinalOutput}
+ case "json":
+ o.logOutput = o.logFinalOutput
+ default:
+ return fmt.Errorf("invalid log-format: %s", format)
+ }
+ o.resetOutput()
+ return nil
+ }
+ o.Verbose = func() {
+ *o.log = o.log.Level(o.log.GetLevel() - zerolog.Level(1))
+ }
+ o.Level = func(value string) error {
+ if value == "auto" {
+ if logLevelAutoLocked {
+ // The current call is at best redondant, at worse called by
+ // default after some potential --verbose that would be ignored
+ return nil
+ }
+ if outputFile, hasFd := o.logFinalOutput.(interface{ Fd() uintptr }); hasFd && terminal.IsTerminal(int(outputFile.Fd())) {
+ value = "info"
+ } else {
+ value = "warn"
+ }
+ }
+
+ level, err := zerolog.ParseLevel(value)
+ if err != nil {
+ return err
+ }
+ *o.log = o.log.Level(level)
+ return nil
+ }
+ if err := o.Format("auto"); err != nil {
+ return err
+ }
+ if err := o.Level("auto"); err != nil {
+ return err
+ }
+ logLevelAutoLocked = true
+ return nil
+}
diff --git a/logging_test.go b/logging_test.go
new file mode 100644
--- /dev/null
+++ b/logging_test.go
@@ -0,0 +1,46 @@
+package orusapi
+
+import (
+ "bytes"
+ "testing"
+
+ "github.com/rs/zerolog"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+)
+
+func TestLogging(t *testing.T) {
+ var (
+ buf bytes.Buffer
+ log zerolog.Logger
+ )
+
+ var o LoggingOptions
+ require.NoError(t, o.Setup(&log, &buf))
+
+ assert.Equal(t, zerolog.WarnLevel, o.log.GetLevel())
+
+ o.Verbose()
+ assert.Equal(t, zerolog.InfoLevel, o.log.GetLevel())
+
+ o.Verbose()
+ assert.Equal(t, zerolog.DebugLevel, o.log.GetLevel())
+
+ o.Verbose()
+ assert.Equal(t, zerolog.TraceLevel, o.log.GetLevel())
+
+ require.NoError(t, o.Level("fatal"))
+ assert.Equal(t, zerolog.FatalLevel, o.log.GetLevel())
+
+ require.NoError(t, o.Level("info"))
+ assert.Equal(t, zerolog.InfoLevel, o.log.GetLevel())
+
+ require.NoError(t, o.Format("pretty"))
+ log.Warn().Msg("this is a warning")
+ assert.Contains(t, buf.String(), "WRN")
+
+ buf.Reset()
+ require.NoError(t, o.Format("json"))
+ log.Warn().Msg("this is a warning")
+ assert.Contains(t, buf.String(), "{")
+}