ci: release v1.8.6

Author: Laisky

.docker/Dockerfile

@@ -1,9 +1,13 @@
 FROM registry:5000/gobase:1.12.1-alpine3.9 AS gobuild
 
-ADD . /go-fluentd
+ENV GO111MODULE=on
 WORKDIR /go-fluentd
+COPY go.mod .
+COPY go.sum .
+RUN go mod download
 
 # static build
+ADD . .
 RUN go build -a --ldflags '-extldflags "-static"' entrypoints/main.go
 
 

.docker/forward.Dockerfile

@@ -4,14 +4,15 @@
 # cp /forward/settings.yml /data/Sit/go-fluentd/settings/.
 FROM registry:5000/golang:1.12.1-stretch AS gobin
 
-# http proxy
-ENV HTTP_PROXY=http://172.16.4.26:17777
-ENV HTTPS_PROXY=http://172.16.4.26:17777
+ENV GO111MODULE=on
 
-ADD . /go-fluentd
 WORKDIR /go-fluentd
+COPY go.mod .
+COPY go.sum .
+RUN go mod download
 
 # static build
+ADD . .
 RUN go build --ldflags '-extldflags "-static"' entrypoints/main.go
 
 # copy executable file and certs to a pure container

CHANGELOG.md

@@ -4,6 +4,22 @@
 
 
 
+*v1.8.6*
+---
+
+- 2019-05-23 (Laisky) perf: reduce alloc in es sender
+- 2019-05-22 (Laisky) ci: upgrade golang to 1.12.5
+- 2019-05-22 (Laisky) perf: only allow one rotate waiting
+- 2019-05-22 (Laisky) perf: only load all ids once
+- 2019-05-22 (Laisky) fix: upgrade go-utils to v1.3.1
+
+*1.8.5*
+---
+
+- 2019-05-15 (Laisky) docs: update readme
+- 2019-05-14 (Laisky) ci: improve docker cache
+- 2019-05-08 (Laisky) feat(paas-344): add prometheus metrics at `/metrics`
+
 *1.8.4*
 ---
 

dispacher.go

@@ -82,6 +82,7 @@ func (d *Dispatcher) Run() {
 							utils.Logger.Error("try to spawn new tagpipeline got error",
 								zap.Error(err),
 								zap.String("tag", msg.Tag))
+							continue
 						} else {
 							d.concatorMap.Store(msg.Tag, inChanForEachTag)
 							d.tagsCounter.Store(msg.Tag, utils.NewCounter())

docs/README_cn.md

@@ -555,25 +555,25 @@ golang 的性能调优真是器大活好！
 ```go
 // supported action:
 // cmdline, profile, symbol, goroutine, heap, threadcreate, debug/block
-Server.Any("/admin/pprof/{action:path}", pprof.New())
+Server.Any("/pprof/{action:path}", pprof.New())
 ```
 
 然后就可以调用：
 
-- `/admin/pprof/cmdline`：启动时的命令行参数
-- `/admin/pprof/profile`：下载 CPU dump
-- `/admin/pprof/symbol`
-- `/admin/pprof/goroutine`：goroutine 信息
-- `/admin/pprof/heap`：下载 heap dump
-- `/admin/pprof/heap?debug=1`：一些运行时信息
-- `/admin/pprof/threadcreate`
-- `/admin/pprof/debug/block`
-- `/admin/pprof/`
+- `/pprof/cmdline`：启动时的命令行参数
+- `/pprof/profile`：下载 CPU dump
+- `/pprof/symbol`
+- `/pprof/goroutine`：goroutine 信息
+- `/pprof/heap`：下载 heap dump
+- `/pprof/heap?debug=1`：一些运行时信息
+- `/pprof/threadcreate`
+- `/pprof/debug/block`
+- `/pprof/`
 
 
 ### CPU Profile
 
-针对 CPU 做优化时最常用的就是 profile，访问 `/admin/pprof/profile` 后，
+针对 CPU 做优化时最常用的就是 profile，访问 `/pprof/profile` 后，
 会自动启动采样，等待 30 秒后，会下载一个 `profile` 文件，然后就可以启动 go tool 的交互式工具：
 
 ```sh

docs/quickstart.md

@@ -160,13 +160,13 @@ You can load monitor metrics by <http://localhost:8080/monitor>
 
 This HTTP API also support pprof endpoints:
 
-- <http://localhost:8080/admin/pprof/profile>
-- <http://localhost:8080/admin/pprof/cmdline>
-- <http://localhost:8080/admin/pprof/symbol>
-- <http://localhost:8080/admin/pprof/goroutine>
-- <http://localhost:8080/admin/pprof/heap>
-- <http://localhost:8080/admin/pprof/heap?debug=1>
-- <http://localhost:8080/admin/pprof/threadcreate>
-- <http://localhost:8080/admin/pprof/debug/block>
-- <http://localhost:8080/admin/pprof/>
+- <http://localhost:8080/pprof/profile>
+- <http://localhost:8080/pprof/cmdline>
+- <http://localhost:8080/pprof/symbol>
+- <http://localhost:8080/pprof/goroutine>
+- <http://localhost:8080/pprof/heap>
+- <http://localhost:8080/pprof/heap?debug=1>
+- <http://localhost:8080/pprof/threadcreate>
+- <http://localhost:8080/pprof/debug/block>
+- <http://localhost:8080/pprof/>
 

go.mod

@@ -4,35 +4,16 @@ go 1.12
 
 require (
 	github.com/Laisky/go-syslog v2.3.3+incompatible
-	github.com/Laisky/go-utils v0.0.0-20190417014032-53d5982d5343
+	github.com/Laisky/go-utils v1.3.2
 	github.com/Laisky/zap v1.9.2
 	github.com/Shopify/sarama v1.22.0
-	github.com/ajg/form v1.5.1 // indirect
 	github.com/cespare/xxhash v1.1.0
-	github.com/gavv/monotime v0.0.0-20171021193802-6f8212e8d10d // indirect
-	github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 // indirect
-	github.com/google/go-querystring v1.0.0 // indirect
-	github.com/imkira/go-interpol v1.1.0 // indirect
-	github.com/iris-contrib/httpexpect v0.0.0-20180314041918-ebe99fcebbce // indirect
+	github.com/iris-contrib/middleware v0.0.0-20181021162728-8bd5d51b3c2e
 	github.com/json-iterator/go v1.1.6
-	github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
 	github.com/kataras/iris v11.1.1+incompatible
-	github.com/mattn/go-colorable v0.1.1 // indirect
-	github.com/moul/http2curl v1.0.0 // indirect
-	github.com/onsi/ginkgo v1.8.0 // indirect
-	github.com/onsi/gomega v1.5.0 // indirect
-	github.com/pierrec/xxHash v0.1.5 // indirect
 	github.com/pkg/errors v0.8.1
-	github.com/sergi/go-diff v1.0.0 // indirect
-	github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect
+	github.com/prometheus/client_golang v0.9.2
 	github.com/spf13/pflag v1.0.3
 	github.com/spf13/viper v1.3.2
 	github.com/tinylib/msgp v1.1.0
-	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
-	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
-	github.com/xeipuuv/gojsonschema v1.1.0 // indirect
-	github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 // indirect
-	github.com/yudai/gojsondiff v1.0.0 // indirect
-	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
-	github.com/yudai/pp v2.0.1+incompatible // indirect
 )