Merge pull request #1 from fluent/master

Sync master

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,23 @@
+<!-- Provide summary of changes -->
+
+<!-- Issue number, if available. E.g. "Fixes #31", "Addresses #42, #77" -->
+
+----
+Enter `[N/A]` in the box, if an item is not applicable to your change.
+
+**Testing**
+Before we can approve your change; please submit the following in a comment:
+- [ ] Example configuration file for the change
+- [ ] Debug log output from testing the change
+<!-- Invoke Fluent Bit and Valgrind as: $ valgrind ./bin/fluent-bit <args> -->
+- [ ] Attached [Valgrind](https://valgrind.org/docs/manual/quick-start.html) output that shows no leaks or memory corruption was found
+
+**Documentation**
+<!-- Docs can be edited at https://github.com/fluent/fluent-bit-docs -->
+- [ ] Documentation required for this feature
+
+<!--  Doc PR (not required but highly recommended) -->
+
+----
+
+Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.

.gitignore

@@ -1,3 +1,5 @@
+.idea
+.DS_Store
 *~
 _book/
 lib/jemalloc
@@ -10,5 +12,6 @@ include/fluent-bit/flb_plugins.h
 include/fluent-bit/flb_version.h
 include/fluent-bit/conf/*.h
 init/fluent-bit.service
+lib/chunkio/include/chunkio/cio_version.h
 lib/monkey/monkey.service
 lib/monkey/include/monkey/mk_core/mk_core_info.h

.gitlab-ci.yml

@@ -0,0 +1,88 @@
+include:
+  - local: '/.gitlab/ci-templates.yml'
+
+stages:
+  - build
+  - docker-build
+
+"gcc DFLB_JEMALLOC=On":
+  stage: build
+  image: gcc
+  variables:
+      FLB_OPT: "-DFLB_JEMALLOC=On"
+  extends: .gcc-template
+  script:
+    - sh ci/do-ut
+  cache:
+    key: "$CI_COMMIT_REF_SLUG"
+    paths:
+      - ./build
+
+"gcc DFLB_JEMALLOC=Off":
+  stage: build
+  image: gcc
+  variables:
+      FLB_OPT: "-DFLB_JEMALLOC=Off"
+  extends: .gcc-template
+  script:
+    - sh ci/do-ut
+  cache:
+    key: "$CI_COMMIT_REF_SLUG"
+    paths:
+      - ./build
+
+"gcc DSANITIZE_ADDRESS=On":
+  stage: build
+  image: gcc
+  variables:
+      FLB_OPT: "-DSANITIZE_ADDRESS=On"
+  extends: .gcc-template
+  script:
+    - sh ci/do-ut
+  cache:
+    key: "$CI_COMMIT_REF_SLUG"
+    paths:
+      - ./build
+
+"gcc DSANITIZE_UNDEFINED=On":
+  stage: build
+  image: gcc
+  variables:
+      FLB_OPT: "-DSANITIZE_UNDEFINED=On"
+  extends: .gcc-template
+  script:
+    - sh ci/do-ut
+  cache:
+    key: "$CI_COMMIT_REF_SLUG"
+    paths:
+      - ./build
+
+"gcc DFLB_COVERAGE=On":
+  stage: build
+  image: gcc
+  variables:
+      FLB_OPT: "-DFLB_COVERAGE=On"
+  extends: .gcc-template
+  script:
+    - sh ci/do-ut
+  cache:
+    key: "$CI_COMMIT_REF_SLUG"
+    paths:
+      - ./build
+
+docker-build:
+  stage: docker-build
+  image: docker:stable
+  variables: 
+    DOCKER_BUILD: 1
+  services:
+    - docker:dind
+  before_script:
+    - docker info
+  cache:
+    key: "$CI_COMMIT_REF_SLUG"
+    paths:
+      - ./build
+  script:
+    - echo "===== BUILD DOCKER IMAGE ======="
+    - docker build -t test-image -f ./Dockerfile .

.gitlab/ci-templates.yml

@@ -0,0 +1,5 @@
+.gcc-template:
+  before_script:
+    - export CC=gcc
+    - apt-get update -y
+    - apt-get install cmake flex bison -y

.travis.yml

@@ -1,19 +1,21 @@
-dist: xenial
+dist: bionic
 language: c
-# The leak sanitizer uses ptrace, which doesn't work under the
-# travis container infrastructure, so we enable 'sudo'
-sudo: true
 
 git:
   depth: 3
 
+arch:
+  - amd64
+  - arm64
+
 compiler:
   - gcc
   - clang
 
 env:
   - FLB_OPT="-DFLB_JEMALLOC=On"
   - FLB_OPT="-DFLB_JEMALLOC=Off"
+  - FLB_OPT="-DFLB_SMALL=On"
   - FLB_OPT="-DSANITIZE_ADDRESS=On"
   - FLB_OPT="-DSANITIZE_UNDEFINED=On"
 
@@ -38,11 +40,12 @@ matrix:
     - os: osx
       env: FLB_OPT="-DFLB_JEMALLOC=Off"
       script: |
+        brew update
+        brew install bison flex || true
         ci/do-ut || true
     - os: linux
       env: FLB_OPT="-DFLB_COVERAGE=On"
-      dist: xenial
-      sudo: true
+      dist: bionic
       language: c
       compiler: gcc
       script: |
@@ -51,16 +54,15 @@ matrix:
         sudo usermod -a -G systemd-journal $(id -un)
         sudo -E su -p travis -c "PATH=$PATH ci/do-ut"
     - os: linux
-      dist: xenial
-      sudo: true
-      language: node_js
-        - "9"
+      services:
+        - docker
+      dist: bionic
+      language: c
       compiler: gcc
       env: DOCKER_BUILD=1
       script: |
         echo "===== BUILD DOCKER IMAGE ======="
         docker build -t test-image -f Dockerfile .
-        npm install -g bats
       addons:
         apt:
           sources: {}
@@ -70,6 +72,7 @@ script: |
   echo "CC = $CC, CXX = $CXX"
   sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 90
   sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 90
+  sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-6.0 90
   sudo usermod -a -G systemd-journal $(id -un)
   sudo -E su -p travis -c "PATH=$PATH ci/do-ut"
 addons:
@@ -79,5 +82,6 @@ addons:
     packages:
       - gcc-7
       - g++-7
+      - clang-6.0
       - libsystemd-dev
       - gcovr