Upgrade cmetrics to v0.5.8 (#29)

* Update cmetrics to v0.5.8 * in_gdummy: Update dependencies Signed-off-by: Hiroshi Hatake <[email protected]> * Use the latest calyptia's fluent-bit image Signed-off-by: Hiroshi Hatake <[email protected]> * Follow the URL for cmetrics' releases Signed-off-by: Hiroshi Hatake <[email protected]> --------- Signed-off-by: Hiroshi Hatake <[email protected]>
chronosphereio · Feb 13, 2023 · efb7d90 · efb7d90
1 parent f98583e
commit efb7d90
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/examples/in_gdummy/go.mod b/examples/in_gdummy/go.mod
@@ -2,10 +2,10 @@ module github.com/fluent/fluent-bit-go/examples/gdummy
 
 go 1.17
 
-require github.com/calyptia/plugin v0.1.1
+require github.com/calyptia/plugin v0.1.6
 
 require (
-	github.com/calyptia/cmetrics-go v0.1.6 // indirect
+	github.com/calyptia/cmetrics-go v0.1.7 // indirect
 	github.com/ugorji/go/codec v1.2.7 // indirect
 )
 

diff --git a/examples/in_gdummy/go.sum b/examples/in_gdummy/go.sum
@@ -1,8 +1,8 @@
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
 github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA=
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw=
-github.com/calyptia/cmetrics-go v0.1.6 h1:sFcYX9TLQw33tBO502NzaOKMkP9RS2rhV1SoS2V8Q0M=
-github.com/calyptia/cmetrics-go v0.1.6/go.mod h1:K1IEPgICDtD4mJW7RVhfG4BkCywnjCdYZwbKs0jSw/U=
+github.com/calyptia/cmetrics-go v0.1.7 h1:A4kEFuFqVuWzytIbbey9KivHi0GQVjOkE2JJkdRbQ2U=
+github.com/calyptia/cmetrics-go v0.1.7/go.mod h1:K1IEPgICDtD4mJW7RVhfG4BkCywnjCdYZwbKs0jSw/U=
 github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4=
 github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/calyptia/plugin
 go 1.18
 
 require (
-	github.com/calyptia/cmetrics-go v0.1.6
+	github.com/calyptia/cmetrics-go v0.1.7
 	github.com/ory/dockertest/v3 v3.9.1
 	github.com/ugorji/go/codec v1.2.7
 )

diff --git a/go.sum b/go.sum
@@ -7,6 +7,8 @@ github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEV
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
 github.com/calyptia/cmetrics-go v0.1.6 h1:sFcYX9TLQw33tBO502NzaOKMkP9RS2rhV1SoS2V8Q0M=
 github.com/calyptia/cmetrics-go v0.1.6/go.mod h1:K1IEPgICDtD4mJW7RVhfG4BkCywnjCdYZwbKs0jSw/U=
+github.com/calyptia/cmetrics-go v0.1.7 h1:A4kEFuFqVuWzytIbbey9KivHi0GQVjOkE2JJkdRbQ2U=
+github.com/calyptia/cmetrics-go v0.1.7/go.mod h1:K1IEPgICDtD4mJW7RVhfG4BkCywnjCdYZwbKs0jSw/U=
 github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4=
 github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
 github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E=

diff --git a/testdata/Dockerfile b/testdata/Dockerfile
@@ -1,9 +1,9 @@
 FROM golang:latest AS builder
 
 # These should change very infrequently and are coupled tightly
-ARG CMETRICS_VERSION=0.3.3
+ARG CMETRICS_VERSION=0.5.8
 ENV CMETRICS_VERSION=${CMETRICS_VERSION}
-ARG CMETRICS_RELEASE=v0.3.3
+ARG CMETRICS_RELEASE=v0.5.8
 ENV CMETRICS_RELEASE=${CMETRICS_RELEASE}
 
 ARG PACKAGEARCH=amd64
@@ -19,20 +19,20 @@ RUN go mod verify
 
 COPY . .
 
-ADD https://github.com/calyptia/cmetrics/releases/download/${CMETRICS_RELEASE}/cmetrics_${CMETRICS_VERSION}_${PACKAGEARCH}-headers.deb external/
-ADD https://github.com/calyptia/cmetrics/releases/download/${CMETRICS_RELEASE}/cmetrics_${CMETRICS_VERSION}_${PACKAGEARCH}.deb external/
+ADD https://github.com/fluent/cmetrics/releases/download/${CMETRICS_RELEASE}/cmetrics_${CMETRICS_VERSION}_${PACKAGEARCH}-headers.deb external/
+ADD https://github.com/fluent/cmetrics/releases/download/${CMETRICS_RELEASE}/cmetrics_${CMETRICS_VERSION}_${PACKAGEARCH}.deb external/
 RUN dpkg -i external/*.deb
 
 RUN go build -trimpath -buildmode c-shared -o ./bin/go-test-input-plugin.so ./testdata/input/input.go
 RUN go build -trimpath -buildmode c-shared -o ./bin/go-test-output-plugin.so ./testdata/output/output.go
 
-FROM ghcr.io/calyptia/internal/core:main
+FROM ghcr.io/calyptia/internal/core-fluent-bit:main
 
 COPY --from=builder /fluent-bit-go/bin/go-test-input-plugin.so /fluent-bit/etc/
 COPY --from=builder /fluent-bit-go/bin/go-test-output-plugin.so /fluent-bit/etc/
 
 COPY ./testdata/fluent-bit.conf /fluent-bit/etc/
 COPY ./testdata/plugins.conf /fluent-bit/etc/
 
-ENTRYPOINT [ "/fluent-bit/bin/fluent-bit" ]
-CMD [ "/fluent-bit/bin/fluent-bit", "-c", "/fluent-bit/etc/fluent-bit.conf" ]
+ENTRYPOINT [ "/fluent-bit/bin/calyptia-fluent-bit" ]
+CMD [ "/fluent-bit/bin/calyptia-fluent-bit", "-c", "/fluent-bit/etc/fluent-bit.conf" ]