From a1e3ce5a758715f2922712286b23d810ab83b6af Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Mon, 11 Dec 2023 11:53:11 +0800 Subject: [PATCH] Merge 1.8.3 back (#1257) * Bump version to v1.8.3 * Update 1.8.3 artifact signatures Signed-off-by: yyuuttaaoo --------- Signed-off-by: yyuuttaaoo --- CHANGELOG.md | 1 - Makefile | 2 +- changes/v1.8.3.md | 36 ++++++++++++++++++++++ core/CMakeLists.txt | 6 ++-- docker/Dockerfile_build | 2 +- docker/Dockerfile_development_part | 2 +- docker/Dockerfile_production | 4 +-- docs/cn/installation/release-notes.md | 35 +++++++++++++++++++++ docs/en/guides/How-to-build-with-docker.md | 8 ++--- docs/en/guides/How-to-do-manual-test.md | 6 ++-- scripts/docker_build.sh | 2 +- scripts/gen_build_scripts.sh | 6 ++-- scripts/plugin_build.sh | 2 +- scripts/windows32_build.bat | 2 +- scripts/windows64_build.bat | 2 +- scripts/windows64_dist.bat | 2 +- test/engine/boot/compose.go | 2 +- 17 files changed, 95 insertions(+), 25 deletions(-) create mode 100644 changes/v1.8.3.md diff --git a/CHANGELOG.md b/CHANGELOG.md index b357ddd095..ead75716cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,4 +38,3 @@ your changes, such as: ## [Unreleased] - [public] [both] [added] add UsingOldContentTag. When UsingOldContentTag is set to false, the Tag is now placed in the Meta instead of Logs during cgo. - diff --git a/Makefile b/Makefile index 9b60d5cbb6..0bd0d03e00 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ # limitations under the License. .DEFAULT_GOAL := all -VERSION ?= 1.8.1 +VERSION ?= 1.8.3 DOCKER_PUSH ?= false DOCKER_REPOSITORY ?= aliyun/ilogtail BUILD_REPOSITORY ?= aliyun/ilogtail_build diff --git a/changes/v1.8.3.md b/changes/v1.8.3.md new file mode 100644 index 0000000000..6544617b11 --- /dev/null +++ b/changes/v1.8.3.md @@ -0,0 +1,36 @@ +# 1.8.3 + +## Changes + +All issues and pull requests are [here](https://github.com/alibaba/ilogtail/milestone/21). + +### Features + + +### Fixed + +- [public] [both] [fixed] fix log duplication problem arised from #1216 +- [public] [both] [fixed] fix plugin crash due to nil in container info +- [public] [both] [fixed] resolve issue with ProcessorParseDelimiterNative capturing next line data +- [public] [both] [fixed] correct premature file read termination triggered by sender back pressure +- [public] [both] [fixed] implement panic recovery mechanism in plugin export +- [public] [both] [fixed] resolve crash issue during Apsara log parsing +- [public] [both] [fixed] correct parsing errors in ProcessorParseApsaraNative with large buffer input + +### Doc + + +## Download + +| **Filename** | **OS** | **Arch** | **SHA256 Checksum** | +| ---- | ---- | ---- | ---- | +|[ilogtail-1.8.3.linux-amd64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.3/ilogtail-1.8.3.linux-amd64.tar.gz)|Linux|x86-64|[ilogtail-1.8.3.linux-amd64.tar.gz.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.3/ilogtail-1.8.3.linux-amd64.tar.gz.sha256)| +|[ilogtail-1.8.3.linux-arm64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.3/ilogtail-1.8.3.linux-arm64.tar.gz)|Linux|arm64|[ilogtail-1.8.3.linux-arm64.tar.gz.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.3/ilogtail-1.8.3.linux-arm64.tar.gz.sha256)| +|[ilogtail-1.8.3.windows-amd64.zip](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.3/ilogtail-1.8.3.windows-amd64.zip)|Windows|x86-64|[ilogtail-1.8.3.windows-amd64.zip.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.3/ilogtail-1.8.3.windows-amd64.zip.sha256)| + +## Docker Image + +**Docker Pull Command** +``` bash +docker pull sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail:1.8.3 +``` diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 8f97f34c0f..ba29b5c5c4 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -18,13 +18,13 @@ project(logtail) # Options. option(BUILD_LOGTAIL "Build Logtail executable and tools" ON) option(BUILD_LOGTAIL_UT "Build unit test for Logtail" OFF) -option(ENABLE_COMPATIBLE_MODE "Build Logtail in compatible mode (for low version Linux)" ON) -option(ENABLE_STATIC_LINK_CRT "Build Logtail by linking CRT statically" ON) +option(ENABLE_COMPATIBLE_MODE "Build Logtail in compatible mode (for low version Linux)" OFF) +option(ENABLE_STATIC_LINK_CRT "Build Logtail by linking CRT statically" OFF) option(WITHOUTGDB "Build Logtail without gdb" OFF) # Name/Version information. if (NOT DEFINED LOGTAIL_VERSION) - set(LOGTAIL_VERSION "1.8.1") + set(LOGTAIL_VERSION "1.8.3") endif () message(STATUS "Version: ${LOGTAIL_VERSION}") diff --git a/docker/Dockerfile_build b/docker/Dockerfile_build index 4b52c9c7c7..9d3006cc85 100644 --- a/docker/Dockerfile_build +++ b/docker/Dockerfile_build @@ -19,7 +19,7 @@ WORKDIR /src COPY . . ARG HOST_OS=Linux -ARG VERSION=1.8.1 +ARG VERSION=1.8.3 USER root diff --git a/docker/Dockerfile_development_part b/docker/Dockerfile_development_part index 74d331c6f1..27855f86c1 100644 --- 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:gcc_9.3.1-3 ARG HOST_OS=Linux -ARG VERSION=1.8.1 +ARG VERSION=1.8.3 USER root WORKDIR /ilogtail diff --git a/docker/Dockerfile_production b/docker/Dockerfile_production index 491d300227..0147d12d85 100644 --- 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=1.8.1 +ARG VERSION=1.8.3 ARG TARGETPLATFORM WORKDIR /usr/local COPY dist/ilogtail-${VERSION}.linux-*.tar.gz . @@ -28,7 +28,7 @@ ENV container docker RUN yum update -y && yum upgrade -y && yum -y clean all && rm -fr /var/cache && rm -rf /core.* ARG HOST_OS=Linux -ARG VERSION=1.8.1 +ARG VERSION=1.8.3 ARG TARGETPLATFORM COPY --from=build /usr/local/ilogtail-${VERSION} /usr/local/ilogtail diff --git a/docs/cn/installation/release-notes.md b/docs/cn/installation/release-notes.md index 57337edc18..dd9930dfb3 100644 --- a/docs/cn/installation/release-notes.md +++ b/docs/cn/installation/release-notes.md @@ -1,5 +1,40 @@ # 发布历史 +## 1.8.3 + +### 发布记录 + +发版日期：2023 年 12 月 7 日 + +问题修复 + +* 修复因#1216引入的日志重复采集问题 [#1232](https://github.com/alibaba/ilogtail/pull/1232) +* 修复container info含nil字段导致的插件崩溃 [#1247](https://github.com/alibaba/ilogtail/pull/1247) +* 修复ProcessorParseDelimiterNative解析携带下一行数据的问题 [#1250](https://github.com/alibaba/ilogtail/pull/1250) +* 修复在反压情况下可能出现的文件无法读完的问题 [#1251](https://github.com/alibaba/ilogtail/pull/1251) +* 修复plugin_export panic导致插件崩溃的问题 [#1252](https://github.com/alibaba/ilogtail/pull/1252) +* 修复解析Apsara格式日志导致的崩溃问题 [#1253](https://github.com/alibaba/ilogtail/pull/1253) +* 修复解析Apsara格式日志解析数据黏连问题 [#1255](https://github.com/alibaba/ilogtail/pull/1255) + +[详情和源代码](https://github.com/alibaba/ilogtail/blob/main/changes/v1.8.3.md) + +### 下载 + +| 文件名 | 系统 | 架构 | SHA256 校验码 | +| -------------------------------------------------------------------------------------------------------------------------------------------- | ----- | ------ | ---------------------------------------------------------------- | +| [ilogtail-1.8.3.linux-amd64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.3/ilogtail-1.8.3.linux-amd64.tar.gz) | Linux | x86-64 | 1cd352dec783247c4500074f77d8cfb88b607e28f6c95039c8f3da2a7b5880e3 | +| [ilogtail-1.8.3.linux-arm64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.3/ilogtail-1.8.3.linux-arm64.tar.gz) | Linux | arm64 | 6d77b86ed4b38605ed9e87b3d3ec049da5497b8c48e2cb9ec5334324ef26f0aa | + +### Docker 镜像 + +**Docker Pull 命令** + +``` bash +docker pull sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail:1.8.3 +``` + +# 发布历史 + ## 1.8.1 ### 发布记录 diff --git a/docs/en/guides/How-to-build-with-docker.md b/docs/en/guides/How-to-build-with-docker.md index 2b4eb9c0f2..925e597b4e 100644 --- a/docs/en/guides/How-to-build-with-docker.md +++ b/docs/en/guides/How-to-build-with-docker.md @@ -13,13 +13,13 @@ make solib ### Build image. - The default {DOCKER_REPOSITORY} is `aliyun/ilogtail`. - - The default {VERSION} is `1.8.1`. + - The default {VERSION} is `1.8.3`. - 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:1.8.1` would be stored in local repository. + So when you exec `make wholedocker` command, the built image named as `aliyun/ilogtail:1.8.3` would be stored in local repository. ## Build Pure Go image. @@ -27,10 +27,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 `1.8.1`. + - The default {VERSION} is `1.8.3`. - 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:1.8.1` would be stored in local repository. \ No newline at end of file +So when you exec `make docker` command, the built image named as `aliyun/ilogtail:1.8.3` would be stored in local repository. \ No newline at end of file diff --git a/docs/en/guides/How-to-do-manual-test.md b/docs/en/guides/How-to-do-manual-test.md index cf2275ddb9..003851cc93 100644 --- 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:1.8.1`. -2. Rename `aliyun/ilogtail:1.8.1` to a custom name and push to the remotes, such - as `registry.cn-beijing.aliyuncs.com/aliyun/ilogtail:1.8.1`. + images named `aliyun/ilogtail:1.8.3`. +2. Rename `aliyun/ilogtail:1.8.3` to a custom name and push to the remotes, such + as `registry.cn-beijing.aliyuncs.com/aliyun/ilogtail:1.8.3`. 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 index 257df01c85..da4c58f3bd 100755 --- 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:-1.8.1} +VERSION=${3:-1.8.3} 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 index 514a9a3297..7304022753 100755 --- 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:-1.8.1} +VERSION=${3:-1.8.3} REPOSITORY=${4:-aliyun/ilogtail} OUT_DIR=${5:-output} EXPORT_GO_ENVS=${6:-${DOCKER_BUILD_EXPORT_GO_ENVS:-true}} @@ -35,8 +35,8 @@ GO_MOD_FILE=${9:-${GO_MOD_FILE:-go.mod}} BUILD_TYPE=${BUILD_TYPE:-Release} BUILD_LOGTAIL=${BUILD_LOGTAIL:-ON} BUILD_LOGTAIL_UT=${BUILD_LOGTAIL_UT:-OFF} -ENABLE_COMPATIBLE_MODE=${ENABLE_COMPATIBLE_MODE:-ON} -ENABLE_STATIC_LINK_CRT=${ENABLE_STATIC_LINK_CRT:-ON} +ENABLE_COMPATIBLE_MODE=${ENABLE_COMPATIBLE_MODE:-OFF} +ENABLE_STATIC_LINK_CRT=${ENABLE_STATIC_LINK_CRT:-OFF} WITHOUTGDB==${WITHOUTGDB:-OFF} BUILD_SCRIPT_FILE=$GENERATED_HOME/gen_build.sh COPY_SCRIPT_FILE=$GENERATED_HOME/gen_copy_docker.sh diff --git a/scripts/plugin_build.sh b/scripts/plugin_build.sh index 0f852ae9f0..f154e0f1c4 100755 --- 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:-1.8.1} +VERSION=${4:-1.8.3} 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 index b639b865ba..ae2d5b377c 100644 --- 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=1.8.1 +set ILOGTAIL_VERSION=1.8.3 if not "%1" == "" set ILOGTAIL_VERSION=%1 set CurrentPath=%~dp0 set P1Path= diff --git a/scripts/windows64_build.bat b/scripts/windows64_build.bat index 13e9c6314d..db91fef042 100644 --- 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=1.8.1 +set ILOGTAIL_VERSION=1.8.3 if not "%1" == "" set ILOGTAIL_VERSION=%1 set CurrentPath=%~dp0 set P1Path= diff --git a/scripts/windows64_dist.bat b/scripts/windows64_dist.bat index efb9595eb4..660476d698 100644 --- 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=1.8.1 +set ILOGTAIL_VERSION=1.8.3 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 index 7ceae1508d..9c5a2d0184 100644 --- 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:1.8.1 + image: aliyun/ilogtail:1.8.3 hostname: ilogtail privileged: true pid: host