Merge branch '2.0' of github.com:alibaba/ilogtail into 2.0

alibaba · Jul 31, 2024 · 3f95d19 · 3f95d19
2 parents 4bf79f5 + 9303110
commit 3f95d19
Show file tree

Hide file tree

Showing 18 changed files with 97 additions and 23 deletions.
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 .DEFAULT_GOAL := all
-VERSION ?= 2.0.4
+VERSION ?= 2.0.7
 DOCKER_PUSH ?= false
 DOCKER_REPOSITORY ?= aliyun/ilogtail
 BUILD_REPOSITORY ?= aliyun/ilogtail_build

diff --git a/changes/v2.0.7.md b/changes/v2.0.7.md
@@ -0,0 +1,35 @@
+# 2.0.7
+
+## Changes
+
+All issues and pull requests are [here](https://github.com/alibaba/ilogtail/milestone/23).
+
+### Features
+
+
+### Fixed
+
+- [public] [both] [fixed] fix: JSON truncation caused by escaped zero byte (#1594) (#1596)
+- [public] [both] [fixed] fix core caused by concurrent use of non-thread-safe gethostbyname (#1611)
+- [public] [both] [fixed] Fix issue that guage metric miss labels (#1618)
+- [public] [both] [fixed] recover readers exactly from checkpoint (#1620) (#1635)
+- [public] [both] [fixed] fix checkpoint dump idx in reader array (#1638)
+- [public] [both] [fixed] fix: GTID Truncation Issue and Improve Consistency in Checkpoint Management (#1648)
+
+### Doc
+
+
+## Download
+
+| **Filename** | **OS** | **Arch** | **SHA256 Checksum** |
+|  ----  | ----  | ----  | ----  |
+|[ilogtail-2.0.7.linux-amd64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/2.0.7/ilogtail-2.0.7.linux-amd64.tar.gz)|Linux|x86-64|[ilogtail-2.0.7.linux-amd64.tar.gz.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/2.0.7/ilogtail-2.0.7.linux-amd64.tar.gz.sha256)|
+|[ilogtail-2.0.7.linux-arm64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/2.0.7/ilogtail-2.0.7.linux-arm64.tar.gz)|Linux|arm64|[ilogtail-2.0.7.linux-arm64.tar.gz.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/2.0.7/ilogtail-2.0.7.linux-arm64.tar.gz.sha256)|
+|[ilogtail-2.0.7.windows-amd64.zip](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/2.0.7/ilogtail-2.0.7.windows-amd64.zip)|Windows|x86-64|[ilogtail-2.0.7.windows-amd64.zip.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/2.0.7/ilogtail-2.0.7.windows-amd64.zip.sha256)|
+
+## Docker Image
+
+**Docker Pull Command**
+``` bash
+docker pull sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail:2.0.7
+```
diff --git a/core/options.cmake b/core/options.cmake
@@ -14,7 +14,7 @@
 
 # Name/Version information.
 if (NOT DEFINED LOGTAIL_VERSION)
-    set(LOGTAIL_VERSION "2.0.4")
+    set(LOGTAIL_VERSION "2.0.7")
 endif ()
 message(STATUS "Version: ${LOGTAIL_VERSION}")
 

diff --git a/docker/Dockerfile_build b/docker/Dockerfile_build
@@ -19,7 +19,7 @@ WORKDIR /src
 COPY . .
 
 ARG HOST_OS=Linux
-ARG VERSION=2.0.4
+ARG VERSION=2.0.7
 
 USER root
 

diff --git a/docker/Dockerfile_development_part b/docker/Dockerfile_development_part
@@ -15,7 +15,7 @@
 FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:2.0.1
 
 ARG HOST_OS=Linux
-ARG VERSION=2.0.4
+ARG VERSION=2.0.7
 
 USER root
 WORKDIR /ilogtail

diff --git a/docker/Dockerfile_e2e b/docker/Dockerfile_e2e
@@ -15,7 +15,7 @@
 FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:gcc_9.3.1-2
 
 ARG HOST_OS=Linux
-ARG VERSION=2.0.4
+ARG VERSION=2.0.7
 
 USER root
 WORKDIR /ilogtail

diff --git a/docker/Dockerfile_production b/docker/Dockerfile_production
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 FROM --platform=$TARGETPLATFORM centos:centos7.9.2009 as build
-ARG VERSION=2.0.4
+ARG VERSION=2.0.7
 ARG TARGETPLATFORM
 WORKDIR /usr/local
 COPY dist/ilogtail-${VERSION}.linux-*.tar.gz .
@@ -30,7 +30,7 @@ RUN curl -L -o /etc/yum.repos.d/CentOS-Base.repo http://mirrors.aliyun.com/repo/
 RUN yum update -y && yum upgrade -y && yum -y clean all && rm -fr /var/cache && rm -rf /core.*
 
 ARG HOST_OS=Linux
-ARG VERSION=2.0.4
+ARG VERSION=2.0.7
 ARG TARGETPLATFORM
 
 COPY --from=build /usr/local/ilogtail-${VERSION} /usr/local/ilogtail

diff --git a/docker/Dockerfile_production_minimal b/docker/Dockerfile_production_minimal
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 FROM --platform=$TARGETPLATFORM debian:bookworm as build
-ARG VERSION=2.0.4
+ARG VERSION=2.0.7
 ARG TARGETPLATFORM
 ARG UID=65532
 WORKDIR /usr/local
@@ -30,7 +30,7 @@ LABEL org.opencontainers.image.authors="[email protected], [email protected]
 COPY --from=build /usr/lib/x86_64-linux-gnu/libuuid.so.1.3.0 /lib/x86_64-linux-gnu/libuuid.so.1
 
 ARG HOST_OS=Linux
-ARG VERSION=2.0.4
+ARG VERSION=2.0.7
 ARG TARGETPLATFORM
 
 COPY --from=build --chown=$UID:$UID /usr/local/ilogtail /usr/local/ilogtail

diff --git a/docs/cn/installation/release-notes.md b/docs/cn/installation/release-notes.md
@@ -2,6 +2,45 @@
 
 # 发布历史
 
+## 2.0.7
+
+### 发布记录
+
+发版日期：2024 年 7 月 31 日
+
+问题修复
+
+- [public] [both] [fixed] fix: JSON truncation caused by escaped zero byte (#1594) (#1596)
+- [public] [both] [fixed] fix core caused by concurrent use of non-thread-safe gethostbyname (#1611)
+- [public] [both] [fixed] Fix issue that guage metric miss labels (#1618)
+- [public] [both] [fixed] recover readers exactly from checkpoint (#1620) (#1635)
+- [public] [both] [fixed] fix: GTID Truncation Issue and Improve Consistency in Checkpoint Management (#1648)
+
+* 修复转义零字节导致 JSON 截断 [#1596](https://github.com/alibaba/ilogtail/pull/1596)
+* 修复使用非线程安全的gethostbyname方法导致的coredump问题 [#1611](https://github.com/alibaba/ilogtail/pull/1611)
+* 修复opentelemetry解析guage类型指标数据的时候缺失标签的问题 [#1618](https://github.com/alibaba/ilogtail/pull/1618)
+* 修复从checkpoint恢复的时候，轮转文件过多可能导致超出reader队列长度的reader恢复失败，进一步引发在inode复用时，新的reader读到了错误的老reader的checkpoint，会导致截断和重复采集 [#1635, #1638](https://github.com/alibaba/ilogtail/pull/1635, https://github.com/alibaba/ilogtail/pull/1638)
+* 修复input_canel插件GTID不准确的问题 [#1648](https://github.com/alibaba/ilogtail/pull/1648)
+
+
+[详情和源代码](https://github.com/alibaba/ilogtail/blob/main/changes/v2.0.7.md)
+
+### 下载
+
+| 文件名                                                                                                                                          | 系统    | 架构     | SHA256 校验码                                                       |
+| -------------------------------------------------------------------------------------------------------------------------------------------- | ----- | ------ | ---------------------------------------------------------------- |
+| [ilogtail-2.0.7.linux-amd64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/2.0.7/ilogtail-2.0.7.linux-amd64.tar.gz) | Linux | x86-64 | 144b20e4dd4e20b517e49c04c745d2f6a64747ab40c0f4aefc7dcadad5803104 |
+| [ilogtail-2.0.7.linux-arm64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/2.0.7/ilogtail-2.0.7.linux-arm64.tar.gz) | Linux | arm64  | 4a54a7b11fb4cae0cea17f0f9bfbff95dea4a2163e9a925d6728ef8c8d720392 |
+
+### Docker 镜像
+
+**Docker Pull 命令**&#x20;
+
+``` bash
+docker pull sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail:2.0.7
+```
+
+
 ## 2.0.4
 
 ### 发布记录

diff --git a/docs/en/guides/How-to-build-with-docker.md b/docs/en/guides/How-to-build-with-docker.md
@@ -17,13 +17,13 @@ make solib
 ### Build image
 
     - The default {DOCKER_REPOSITORY} is `aliyun/ilogtail`.
-    - The default {VERSION} is `2.0.4`.
+    - The default {VERSION} is `2.0.7`.
     - The default {DOCKER_PUSH} is `false`. When the option is configured as true, the built images would also be pushed to the {DOCKER_REPOSITORY} with {VERSION} tag.
 
     ```shell
         DOCKER_PUSH={DOCKER_PUSH} DOCKER_REPOSITORY={DOCKER_REPOSITORY} VERSION={VERSION} make wholedocker
     ```
-   So when you exec `make wholedocker` command, the built image named as `aliyun/ilogtail:2.0.4` would be stored in local repository.
+   So when you exec `make wholedocker` command, the built image named as `aliyun/ilogtail:2.0.7` would be stored in local repository.
 
 ## Build Pure Go image
 
@@ -32,10 +32,10 @@ If the features that you want to use only in Go part, such as collecting stdout
 ### Build image
 
     - The default {DOCKER_REPOSITORY} is `aliyun/ilogtail`.
-    - The default {VERSION} is `2.0.4`.
+    - The default {VERSION} is `2.0.7`.
     - The default {DOCKER_PUSH} is `false`. When the option is configured as true, the built images would also be pushed to the {DOCKER_REPOSITORY} with {VERSION} tag.
 
     ```shell
         DOCKER_PUSH={DOCKER_PUSH} DOCKER_REPOSITORY={DOCKER_REPOSITORY} VERSION={VERSION} make docker
     ```
-So when you exec `make docker` command, the built image named as `aliyun/ilogtail:2.0.4` would be stored in local repository.
+So when you exec `make docker` command, the built image named as `aliyun/ilogtail:2.0.7` would be stored in local repository.
diff --git a/docs/en/guides/How-to-do-manual-test.md b/docs/en/guides/How-to-do-manual-test.md
@@ -114,8 +114,8 @@ program written by yourself.
 ### Run [Logtail AlibabaCloud](https://help.aliyun.com/document_detail/28979.html) on container
 
 1. Run `make docker` to compile [Logtail AlibabaCloud](https://help.aliyun.com/document_detail/28979.html) docker
-   images named `aliyun/ilogtail:2.0.4`.
-2. Rename `aliyun/ilogtail:2.0.4` to a custom name and push to the remotes, such
-   as `registry.cn-beijing.aliyuncs.com/aliyun/ilogtail:2.0.4`.
+   images named `aliyun/ilogtail:2.0.7`.
+2. Rename `aliyun/ilogtail:2.0.7` to a custom name and push to the remotes, such
+   as `registry.cn-beijing.aliyuncs.com/aliyun/ilogtail:2.0.7`.
 3. Replace the mirror of `logtail-ds` of [ACK](https://www.aliyun.com/product/list/alibabacloudnative) or your self
    platform and restart.
diff --git a/scripts/docker_build.sh b/scripts/docker_build.sh
@@ -56,7 +56,7 @@ function check_docker_buildkit_support {
 ARCH=$(arch)
 CATEGORY=$1
 GENERATED_HOME=$2
-VERSION=${3:-2.0.4}
+VERSION=${3:-2.0.7}
 REPOSITORY=${4:-aliyun/ilogtail}
 PUSH=${5:-false}
 USE_DOCKER_BUILDKIT=${6:-${DOCKER_BUILD_USE_BUILDKIT:-$(check_docker_buildkit_support)}}

diff --git a/scripts/gen_build_scripts.sh b/scripts/gen_build_scripts.sh
@@ -24,7 +24,7 @@ set -o pipefail
 # e2e: Build plugin dynamic lib with GOC and build the CPP part.
 CATEGORY=$1
 GENERATED_HOME=$2
-VERSION=${3:-2.0.4}
+VERSION=${3:-2.0.7}
 REPOSITORY=${4:-aliyun/ilogtail}
 OUT_DIR=${5:-output}
 EXPORT_GO_ENVS=${6:-${DOCKER_BUILD_EXPORT_GO_ENVS:-true}}

diff --git a/scripts/plugin_build.sh b/scripts/plugin_build.sh
@@ -27,7 +27,7 @@ function os() {
 MOD=${1:-mod}
 BUILDMODE=${2:-default}
 OUT_DIR=${3:-output}
-VERSION=${4:-2.0.4}
+VERSION=${4:-2.0.7}
 PLUGINS_CONFIG_FILE=${5:-${PLUGINS_CONFIG_FILE:-plugins.yml,external_plugins.yml}}
 GO_MOD_FILE=${6:-${GO_MOD_FILE:-go.mod}}
 NAME=ilogtail

diff --git a/scripts/windows32_build.bat b/scripts/windows32_build.bat
@@ -6,7 +6,7 @@ REM 2. Build iLogtail.
 REM 3. Build iLogtail plugin.
 REM 4. Make package.
 
-set ILOGTAIL_VERSION=2.0.4
+set ILOGTAIL_VERSION=2.0.7
 if not "%1" == "" set ILOGTAIL_VERSION=%1
 set CurrentPath=%~dp0
 set P1Path=

diff --git a/scripts/windows64_build.bat b/scripts/windows64_build.bat
@@ -6,7 +6,7 @@ REM 2. Build iLogtail.
 REM 3. Build iLogtail plugin.
 REM 4. Make package.
 
-set ILOGTAIL_VERSION=2.0.4
+set ILOGTAIL_VERSION=2.0.7
 if not "%1" == "" set ILOGTAIL_VERSION=%1
 set CurrentPath=%~dp0
 set P1Path=

diff --git a/scripts/windows64_dist.bat b/scripts/windows64_dist.bat
@@ -5,7 +5,7 @@ REM 1. Set environments.
 REM 2. Copy output to dist package dir.
 REM 3. Pack dir to zip archive.
 
-set ILOGTAIL_VERSION=2.0.4
+set ILOGTAIL_VERSION=2.0.7
 if not "%1" == "" set ILOGTAIL_VERSION=%1
 set CurrentPath=%~dp0
 set P1Path=

diff --git a/test/engine/boot/compose.go b/test/engine/boot/compose.go
@@ -55,7 +55,7 @@ services:
       interval: 1s
       retries: 10
   ilogtailC:
-    image: aliyun/ilogtail:2.0.4
+    image: aliyun/ilogtail:2.0.7
     hostname: ilogtail
     privileged: true
     pid: host