From 33e6b3844c59ced6c6dc3b92c5769169c80c02a0 Mon Sep 17 00:00:00 2001 From: Hiroshi Hatake Date: Fri, 6 Mar 2020 09:59:18 +0900 Subject: [PATCH 1/4] Bump up version to v0.6.2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d1bd15b..40dedbd 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ else TEST_OPTS := -cover -race -coverprofile=coverage.txt -covermode=atomic endif -VERSION := 0.6.1 +VERSION := 0.6.2 # Version info for binaries GIT_REVISION := $(shell git rev-parse --short HEAD) From c8cc220df5cb2e52d18c8d4d45828f0c30cdbb2e Mon Sep 17 00:00:00 2001 From: Hiroshi Hatake Date: Fri, 6 Mar 2020 09:59:38 +0900 Subject: [PATCH 2/4] Use v0.6.2 image --- docker/configmap.yaml | 2 +- docker/deployment.yaml | 6 +++--- docker/service.yaml | 2 +- helm/fluent-bit/Chart.yaml | 2 +- helm/fluent-bit/values.yaml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/configmap.yaml b/docker/configmap.yaml index 8aed5d6..7adc092 100644 --- a/docker/configmap.yaml +++ b/docker/configmap.yaml @@ -6,7 +6,7 @@ metadata: namespace: log labels: app: fluent-bit-go-s3 - version: v0.6.1 + version: v0.6.2 data: fluent-bit-s3.conf: | [SERVICE] diff --git a/docker/deployment.yaml b/docker/deployment.yaml index fef556c..0b98fcc 100644 --- a/docker/deployment.yaml +++ b/docker/deployment.yaml @@ -9,15 +9,15 @@ spec: selector: matchLabels: app: fluent-bit-go-s3 - version: v0.6.1 + version: v0.6.2 template: metadata: labels: app: fluent-bit-go-s3 - version: v0.6.1 + version: v0.6.2 spec: containers: - - image: cosmo0920/fluent-bit-go-s3:v0.6.1 + - image: cosmo0920/fluent-bit-go-s3:v0.6.2 name: fluent-bit-go-s3 ports: - containerPort: 24224 diff --git a/docker/service.yaml b/docker/service.yaml index 482ea66..dbfefdc 100644 --- a/docker/service.yaml +++ b/docker/service.yaml @@ -12,4 +12,4 @@ spec: targetPort: 24224 selector: app: fluent-bit-go-s3 - version: v0.6.1 + version: v0.6.2 diff --git a/helm/fluent-bit/Chart.yaml b/helm/fluent-bit/Chart.yaml index 3d10714..5fa5f6f 100644 --- a/helm/fluent-bit/Chart.yaml +++ b/helm/fluent-bit/Chart.yaml @@ -14,7 +14,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.1.2 +version: 0.1.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. diff --git a/helm/fluent-bit/values.yaml b/helm/fluent-bit/values.yaml index 3a16e84..af5291d 100644 --- a/helm/fluent-bit/values.yaml +++ b/helm/fluent-bit/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: cosmo0920/fluent-bit-go-s3 - tag: v0.6.1 + tag: v0.6.2 pullPolicy: IfNotPresent imagePullSecrets: [] From 34ec896c72d4e0a4301df4b6c41cfda988015296 Mon Sep 17 00:00:00 2001 From: Hiroshi Hatake Date: Fri, 6 Mar 2020 10:33:42 +0900 Subject: [PATCH 3/4] Use myfork to prevent checkptr validation error in test --- Gopkg.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gopkg.toml b/Gopkg.toml index 6aa0072..7798ada 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -30,8 +30,9 @@ version = "1.19.30" [[constraint]] - branch = "master" + branch = "mark-nocheckptr" name = "github.com/fluent/fluent-bit-go" + source = "github.com/cosmo0920/fluent-bit-go" [[constraint]] name = "github.com/json-iterator/go" From d96cfef4805aa348ec79366c27a90927c1464110 Mon Sep 17 00:00:00 2001 From: Hiroshi Hatake Date: Fri, 6 Mar 2020 10:34:14 +0900 Subject: [PATCH 4/4] Execute `dep ensure` --- Gopkg.lock | 7 ++++--- vendor/github.com/fluent/fluent-bit-go/output/output.go | 8 +++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 2cf255d..6dd7fbf 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -68,12 +68,13 @@ version = "v1.1.1" [[projects]] - branch = "master" - digest = "1:46b85bcf6d73ec481fe2b310aa38928a95aeae833761ba6525ebd5576d4de956" + branch = "mark-nocheckptr" + digest = "1:011d448139d6c711864ac105d84d3baf4a38ea655c0ab627d54268a9058d16d2" name = "github.com/fluent/fluent-bit-go" packages = ["output"] pruneopts = "UT" - revision = "ea13c021720c495c6747ee07bc5376afdd1ff900" + revision = "a04c9729cf542b7fb6e324b828f25c8b0902fd68" + source = "github.com/cosmo0920/fluent-bit-go" [[projects]] digest = "1:573ca21d3669500ff845bdebee890eb7fc7f0f50c59f2132f2a0c6b03d85086a" diff --git a/vendor/github.com/fluent/fluent-bit-go/output/output.go b/vendor/github.com/fluent/fluent-bit-go/output/output.go index bbb10a6..83125d1 100644 --- a/vendor/github.com/fluent/fluent-bit-go/output/output.go +++ b/vendor/github.com/fluent/fluent-bit-go/output/output.go @@ -64,11 +64,17 @@ func FLBPluginUnregister(def unsafe.Pointer) { func FLBPluginConfigKey(plugin unsafe.Pointer, key string) string { _key := C.CString(key) - return C.GoString(C.output_get_property(_key, plugin)) + value := C.GoString(C.output_get_property(_key, plugin)) + C.free(unsafe.Pointer(_key)) + return value } var contexts []interface{} +// FLBPluginSetContext may set up potentially faulting address. +// It would construct and use an invalid pointer, +// so mark it as nocheckptr. +//go:nocheckptr func FLBPluginSetContext(plugin unsafe.Pointer, ctx interface{}) { i := len(contexts) contexts = append(contexts, ctx)