[FEAT] dockerize brubeck (#5)

Author: Oded Porat

.circleci/config.yml

@@ -0,0 +1,35 @@
+defaults: &defaults
+  working_directory: ~/app
+version: 2
+jobs:
+  release:
+    <<: *defaults
+    docker:
+      - image: circleci/buildpack-deps:xenial
+    steps:
+      - checkout
+      - run:
+          name: install env manager
+          command: git clone --depth 1 -b master [email protected]:fiverr/kubernetes.git /var/tmp/kubernetes
+      - setup_remote_docker:
+          reusable: true
+          exclusive: true
+      - run:
+          name: prepare docker version
+          command: /var/tmp/kubernetes/scripts/ci/create_version_name.sh
+      - run:
+          name: docker build
+          command: /var/tmp/kubernetes/scripts/ci/build_version.sh
+      - run:
+          name: docker push (create tag if master)
+          command: /var/tmp/kubernetes/scripts/ci/push_version.sh false
+workflows:
+  version: 2
+  ci-cd:
+    jobs:
+      - release:
+          filters:
+            branches:
+              only:
+                - master
+                - /.*_rc/

.gitignore

@@ -1,5 +1,8 @@
 brubeck
+brubeck_test
+*.deb
 *.o
+a.out
 *.swp
 *~
 .DS_Store

.version

@@ -0,0 +1 @@
+1.0.0

Dockerfile

@@ -0,0 +1,15 @@
+FROM alpine:latest AS build-env
+RUN apk add -qU alpine-sdk jansson-dev libmicrohttpd-dev libressl-dev
+
+# build
+ADD . /tmp/brubeck
+WORKDIR /tmp/brubeck
+RUN ./script/cibuild
+
+
+# final stage
+FROM alpine
+RUN apk add --no-cache jansson libmicrohttpd libressl
+WORKDIR /usr/sbin/
+COPY --from=build-env /tmp/brubeck/brubeck /usr/sbin/
+COPY --from=build-env /tmp/brubeck/debian/biz.json /tmp/brubeck/debian/tech.json /etc/brubeck/

script/cibuild

@@ -1,13 +1,16 @@
 #!/bin/sh
 
 set -e
-ROOT=$(dirname "$0")/..
+ROOT=$(git rev-parse --show-toplevel)
+cd $ROOT
 
 echo "=> Cleaning @ $(date)"
 git clean -fdx
 git submodule update --init
+(cd vendor/ck && git clean -dfx)
 
-echo "=> Building @ $(date)"
-cd $ROOT
+echo "=> Testing @ $(date)"
+make test
 
-make test && ./brubeck_test
+echo "=> Building @ $(date)"
+make brubeck

src/histogram.c

@@ -93,7 +93,7 @@ void brubeck_histo_sample(
 	value_t pct_rank = histo_percentile_rank(histo, 0.9f);
 
 	sample->count = histo->count;
-	sample->count_90 = histo->count * 0.9;
+	sample->count_90 = floor((histo->count * 0.9) + 0.5f);
 	sample->sum = histo_sum(histo, histo->size);
 	sample->sum_90 = histo_sum(histo, pct_rank);
 	sample->lower = histo->values[0];

tests/histogram.c

@@ -63,7 +63,7 @@ void test_histogram__single_element(void)
 	sput_fail_unless(sample.mean == 42.0, "sample.mean");
 	sput_fail_unless(sample.mean_90 == 42.0, "sample.mean_90");
 	sput_fail_unless(sample.count == 1, "sample.count");
-	sput_fail_unless(sample.count_90 == 0.9, "sample.count_90");
+	sput_fail_unless(sample.count_90 == 1.0, "sample.count_90");
 	sput_fail_unless(sample.sum == 42.0, "sample.sum");
 	sput_fail_unless(sample.sum_90 == 42.0, "sample.sum_90");
 	sput_fail_unless(sample.std == 0.0, "sample.std");
@@ -111,9 +111,9 @@ void test_histogram__multisamples(void)
 		sput_fail_unless(sample.mean == 64.5, "sample.mean");
 		sput_fail_unless(sample.mean_90 == 58.0, "sample.mean_90");
 		sput_fail_unless(sample.count == 128, "sample.count");
-		sput_fail_unless(sample.count_90 == 115.2, "sample.count_90");
+		sput_fail_unless(sample.count_90 == 115, "sample.count_90");
 		sput_fail_unless(sample.sum == 8256.0, "sample.sum");
-		sput_fail_unless(floor(sample.sum_90) == 6670, "sample.sum_90");
+		sput_fail_unless(sample.sum_90 == 6670, "sample.sum_90");
 		sput_fail_unless(floor(sample.std) == 36.0, "sample.std");
 		sput_fail_unless(sample.median == 64.0, "sample.median");
 	}
@@ -136,16 +136,16 @@ void test_histogram__with_sample_rate(void)
 	brubeck_histo_sample(&sample, &h);
 
 	sput_fail_unless(sample.lower == 1.0, "sample.lower");
-        sput_fail_unless(sample.upper == 128.0, "sample.upper");
-        sput_fail_unless(sample.upper_90 == 115.0, "sample.upper_90");
-        sput_fail_unless(sample.mean == 64.5, "sample.mean");
-        sput_fail_unless(sample.mean_90 == 58.0, "sample.mean_90");
-        sput_fail_unless(sample.count == 1280, "sample.count");
-        sput_fail_unless(sample.count_90 == 1152.0, "sample.count_90");
-        sput_fail_unless(sample.sum == 8256.0, "sample.sum");
-        sput_fail_unless(floor(sample.sum_90) == 6670, "sample.sum_90");
-        sput_fail_unless(floor(sample.std) == 36.0, "sample.std");
-        sput_fail_unless(sample.median == 64.0, "sample.median");
+	sput_fail_unless(sample.upper == 128.0, "sample.upper");
+	sput_fail_unless(sample.upper_90 == 115.0, "sample.upper_90");
+	sput_fail_unless(sample.mean == 64.5, "sample.mean");
+	sput_fail_unless(floor(sample.mean_90) == 57.0, "sample.mean_90");
+	sput_fail_unless(sample.count == 1280, "sample.count");
+	sput_fail_unless(sample.count_90 == 1152.0, "sample.count_90");
+	sput_fail_unless(sample.sum == 82560.0, "sample.sum");
+	sput_fail_unless(sample.sum_90 == 66700, "sample.sum_90");
+	sput_fail_unless(floor(sample.std) == 36.0, "sample.std");
+	sput_fail_unless(sample.median == 64.0, "sample.median");
 }
 
 void test_histogram__capacity(void)