From 86a65b00c267f6c4fa68700b896b7566c289387b Mon Sep 17 00:00:00 2001 From: yyuuttaaoo Date: Tue, 2 Jan 2024 15:39:53 +0800 Subject: [PATCH] bump version to v1.8.4 --- Makefile | 2 +- changes/v1.8.4.md | 40 ++++++++++++++++++++++ core/CMakeLists.txt | 2 +- core/processor/daemon/LogProcess.cpp | 2 +- docker/Dockerfile_build | 2 +- docker/Dockerfile_development_part | 2 +- docker/Dockerfile_production | 4 +-- docs/cn/installation/release-notes.md | 40 ++++++++++++++++++++++ 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 | 2 +- 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, 101 insertions(+), 21 deletions(-) create mode 100644 changes/v1.8.4.md diff --git a/Makefile b/Makefile index 0bd0d03e00..f1b18592bf 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ # limitations under the License. .DEFAULT_GOAL := all -VERSION ?= 1.8.3 +VERSION ?= 1.8.4 DOCKER_PUSH ?= false DOCKER_REPOSITORY ?= aliyun/ilogtail BUILD_REPOSITORY ?= aliyun/ilogtail_build diff --git a/changes/v1.8.4.md b/changes/v1.8.4.md new file mode 100644 index 0000000000..9ec4254dbe --- /dev/null +++ b/changes/v1.8.4.md @@ -0,0 +1,40 @@ +# 1.8.4 + +## Changes + +All issues and pull requests are [here](https://github.com/alibaba/ilogtail/milestone/21). + +### Features + +- [public] [both] [updated] Improve goprofile plugin to support real local IP inclusion #1281 + +### Fixed + +- [public] [both] [fixed] fix panic when k8s_event.GetEventRecorder() is nil #1264 +- [public] [both] [fixed] When REGEX_LOG is set, mTimeKey will be set to "time". #1272 +- [public] [both] [fixed] [backport]fix: resolve crash by setting CURLOPT_NOSIGNAL for thread safety #1286 +- [public] [both] [fixed] [backport]Fix delimiter parsing for logs with leading spaces #1288 +- [public] [both] [fixed] [backport]Fix timezone handling in native processors #1293 +- [public] [both] [fixed] [backport]Fix log content duplication in ParseJsonNativeProcessor #1295 +- [public] [both] [fixed] [backport]fix memory leak in ProcessorParseDelimiterNative #1299 +- [public] [both] [fixed] [backport] fix: reset checkpoint dump time after dir registration completes to avoid log duplication #1301 +- [public] [both] [fixed] [backport]Fix timestamp parsing compatibility issue for apsara log #1302 +- [public] [both] [fixed] Fix: remove content if native processor parse failed #1304 +- [public] [both] [fixed] Fix issue where container IP is occasionally empty for Kubernetes pods in HostNetwork mode #1280 + +### Doc + +## Download + +| **Filename** | **OS** | **Arch** | **SHA256 Checksum** | +| ---- | ---- | ---- | ---- | +|[ilogtail-1.8.4.linux-amd64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.4/ilogtail-1.8.4.linux-amd64.tar.gz)|Linux|x86-64|[ilogtail-1.8.4.linux-amd64.tar.gz.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.4/ilogtail-1.8.4.linux-amd64.tar.gz.sha256)| +|[ilogtail-1.8.4.linux-arm64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.4/ilogtail-1.8.4.linux-arm64.tar.gz)|Linux|arm64|[ilogtail-1.8.4.linux-arm64.tar.gz.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.4/ilogtail-1.8.4.linux-arm64.tar.gz.sha256)| + +## Docker Image + +**Docker Pull Command** + +``` bash +docker pull sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail:1.8.4 +``` diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index ba29b5c5c4..dcfce8a624 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -24,7 +24,7 @@ option(WITHOUTGDB "Build Logtail without gdb" OFF) # Name/Version information. if (NOT DEFINED LOGTAIL_VERSION) - set(LOGTAIL_VERSION "1.8.3") + set(LOGTAIL_VERSION "1.8.4") endif () message(STATUS "Version: ${LOGTAIL_VERSION}") diff --git a/core/processor/daemon/LogProcess.cpp b/core/processor/daemon/LogProcess.cpp index 772ec27b37..2098e14568 100644 --- a/core/processor/daemon/LogProcess.cpp +++ b/core/processor/daemon/LogProcess.cpp @@ -488,7 +488,7 @@ void LogProcess::FillEventGroupMetadata(LogBuffer& logBuffer, PipelineEventGroup eventGroup.SetMetadataNoCopy(EventGroupMetaKey::HOST_IP, LogFileProfiler::mIpAddr); eventGroup.SetMetadataNoCopy(EventGroupMetaKey::HOST_NAME, LogFileProfiler::mHostname); eventGroup.SetMetadata(EventGroupMetaKey::LOG_READ_OFFSET, std::to_string(logBuffer.readOffset)); - eventGroup.SetMetadata(EventGroupMetaKey::LOG_READ_OFFSET, std::to_string(logBuffer.readLength)); + eventGroup.SetMetadata(EventGroupMetaKey::LOG_READ_LENGTH, std::to_string(logBuffer.readLength)); } void LogProcess::FillLogGroupLogs(const PipelineEventGroup& eventGroup, diff --git a/docker/Dockerfile_build b/docker/Dockerfile_build index bb6a2fa696..a18567825c 100644 --- a/docker/Dockerfile_build +++ b/docker/Dockerfile_build @@ -19,7 +19,7 @@ WORKDIR /src COPY . . ARG HOST_OS=Linux -ARG VERSION=1.8.3 +ARG VERSION=1.8.4 USER root diff --git a/docker/Dockerfile_development_part b/docker/Dockerfile_development_part index 8ba1a819a0..b7e47cbc24 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:1.3.0 ARG HOST_OS=Linux -ARG VERSION=1.8.3 +ARG VERSION=1.8.4 USER root WORKDIR /ilogtail diff --git a/docker/Dockerfile_production b/docker/Dockerfile_production index 0147d12d85..c0f4f6c430 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.3 +ARG VERSION=1.8.4 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.3 +ARG VERSION=1.8.4 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 dd9930dfb3..9f7bf5f3be 100644 --- a/docs/cn/installation/release-notes.md +++ b/docs/cn/installation/release-notes.md @@ -1,5 +1,45 @@ # 发布历史 +## 1.8.4 + +### 发布记录 + +发版日期：2024 年 1 月 2 日 + +优化 + +* goprofile插件上报数据中使用机器的IP地址 [#1281](https://github.com/alibaba/ilogtail/pull/1281) + +问题修复 + +* 修复正则配置time_key没有默认设置为time的兼容性问题 [#1272](https://github.com/alibaba/ilogtail/pull/1272) +* 修复使用libcurl因没有设置CURLOPT_NOSIGNAL导致偶尔崩溃的问题 [#1286](https://github.com/alibaba/ilogtail/pull/1286) +* 修复原生分隔符解析插件解析行首有空格的日志时字段错乱的问题 [#1288](https://github.com/alibaba/ilogtail/pull/1288) +* 修复原生插件丢弃超时日志时区处理错误的问题 [#1293](https://github.com/alibaba/ilogtail/pull/1293) +* 修复解析任意含有content key的json后，原生JSON插件总是错误保留原始content字段的问题 [#1295](https://github.com/alibaba/ilogtail/pull/1295) +* 修复原生分隔符插件的内存泄露问题 [#1299](https://github.com/alibaba/ilogtail/pull/1299) +* 修复因检查点转储早于目录注册导致的日志重复问题 [#1301](https://github.com/alibaba/ilogtail/pull/1301) +* 修复飞天日志无法解析带逗号时间格式的兼容性问题 [#1302](https://github.com/alibaba/ilogtail/pull/1302) +* 如果原生解析失败并选择保留原始日志，原始日志将仅保留在__raw_log__而不再保留在content字段以避免数据重复 [#1304](https://github.com/alibaba/ilogtail/pull/1304) +* 修复K8s集群Pod网络为HostNetwork时获取到的容器IP有时为空的问题 [#1280](https://github.com/alibaba/ilogtail/pull/1280) + +[详情和源代码](https://github.com/alibaba/ilogtail/blob/main/changes/v1.8.4.md) + +### 下载 + +| 文件名 | 系统 | 架构 | SHA256 校验码 | +| -------------------------------------------------------------------------------------------------------------------------------------------- | ----- | ------ | ---------------------------------------------------------------- | +| [ilogtail-1.8.4.linux-amd64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.4/ilogtail-1.8.4.linux-amd64.tar.gz) | Linux | x86-64 | 70d16cac33616e5e374d9da0c5ec1721aa1f9e692069aa5d519bcaf206eb043b | +| [ilogtail-1.8.4.linux-arm64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.4/ilogtail-1.8.4.linux-arm64.tar.gz) | Linux | arm64 | e28021ad408779183cc068986c288916f7534643e7184b12f615b736ec413f53 | + +### Docker 镜像 + +**Docker Pull 命令** + +``` bash +docker pull sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail:1.8.4 +``` + ## 1.8.3 ### 发布记录 diff --git a/docs/en/guides/How-to-build-with-docker.md b/docs/en/guides/How-to-build-with-docker.md index 925e597b4e..4d060172c6 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.3`. + - The default {VERSION} is `1.8.4`. - 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.3` would be stored in local repository. + So when you exec `make wholedocker` command, the built image named as `aliyun/ilogtail:1.8.4` 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.3`. + - The default {VERSION} is `1.8.4`. - 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.3` 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.4` 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 003851cc93..4488cfb256 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.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`. + images named `aliyun/ilogtail:1.8.4`. +2. Rename `aliyun/ilogtail:1.8.4` to a custom name and push to the remotes, such + as `registry.cn-beijing.aliyuncs.com/aliyun/ilogtail:1.8.4`. 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 da4c58f3bd..5741465202 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.3} +VERSION=${3:-1.8.4} 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 7304022753..85b3bb8e48 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.3} +VERSION=${3:-1.8.4} 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 index f154e0f1c4..8352c6e045 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.3} +VERSION=${4:-1.8.4} 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 ae2d5b377c..f225b6610a 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.3 +set ILOGTAIL_VERSION=1.8.4 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 db91fef042..d3351e92f6 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.3 +set ILOGTAIL_VERSION=1.8.4 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 660476d698..7d072fe94d 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.3 +set ILOGTAIL_VERSION=1.8.4 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 9c5a2d0184..e950c49012 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.3 + image: aliyun/ilogtail:1.8.4 hostname: ilogtail privileged: true pid: host