From ae11248715e180e43f2114233ca00ba753b3a7ce Mon Sep 17 00:00:00 2001 From: eeliu <27064129+eeliu@users.noreply.github.com> Date: Thu, 10 Oct 2024 15:55:19 +0800 Subject: [PATCH] fix doc and workflows --- .github/workflows/publish-collector-agent.yml | 11 +++++------ .gitignore | 3 ++- DOC/collector-agent/Readme-CN.md | 4 ++-- DOC/collector-agent/Readme-KR.md | 4 ++-- DOC/collector-agent/Readme.md | 4 ++-- collector-agent/1.cap | Bin 693 -> 0 bytes collector-agent/common/config.go | 1 - collector-agent/makefile | 2 +- collector-agent/server.go | 9 +++++++-- collector-agent/server/Server.go | 2 +- common/CHANGES.md | 2 +- common/readme.md | 2 +- 12 files changed, 24 insertions(+), 20 deletions(-) delete mode 100644 collector-agent/1.cap diff --git a/.github/workflows/publish-collector-agent.yml b/.github/workflows/publish-collector-agent.yml index 5720b459..a6bd3f7d 100644 --- a/.github/workflows/publish-collector-agent.yml +++ b/.github/workflows/publish-collector-agent.yml @@ -3,6 +3,7 @@ name: publish-collector-agent on: release: types: [created] + workflow_dispatch: permissions: contents: write @@ -10,7 +11,7 @@ permissions: env: REGISTRY_IMAGE: ghcr.io/${{ github.repository }}/collector-agent - TAG_NAME: ${{ github.head_ref || github.ref_name }} + TAG_NAME: 0.7 jobs: collector-agent: @@ -58,9 +59,6 @@ jobs: with: context: collector-agent platforms: ${{ matrix.platform }} - # tags: | - # ghcr.io/${{ github.repository }}/collector-agent:${{ inputs.tag }} - # ghcr.io/${{ github.repository }}/collector-agent:latest github-token: ${{ secrets.GITHUB_TOKEN }} labels: ${{ steps.meta.outputs.labels }} outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true @@ -115,10 +113,11 @@ jobs: - name: Inspect image run: | - docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} + docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ env.TAG_NAME }} Release-Collector-agent: runs-on: ubuntu-latest + if: github.event_name == 'release' strategy: matrix: # build and publish in parallel: linux/386, linux/amd64, linux/arm64, windows/386, windows/amd64, darwin/amd64, darwin/arm64 @@ -132,7 +131,7 @@ jobs: id: release-ca with: github_token: ${{ secrets.GITHUB_TOKEN }} - goversion: "https://dl.google.com/go/go1.18.10.linux-amd64.tar.gz" + goversion: 1.19 goos: ${{ matrix.goos }} goarch: ${{ matrix.goarch }} project_path: "collector-agent" diff --git a/.gitignore b/.gitignore index 50e51cc3..505fa967 100644 --- a/.gitignore +++ b/.gitignore @@ -84,4 +84,5 @@ x86 output config.nice.bat configure.bat -configure.js \ No newline at end of file +configure.js +*.cap \ No newline at end of file diff --git a/DOC/collector-agent/Readme-CN.md b/DOC/collector-agent/Readme-CN.md index d5ab9368..8261a41f 100644 --- a/DOC/collector-agent/Readme-CN.md +++ b/DOC/collector-agent/Readme-CN.md @@ -39,7 +39,7 @@ pinpoint-collector的桥接模块 #### 例子: ```sh -docker run -itd -p 9999:9999 --env-file ./env.list ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:latest +docker run -itd -p 9999:9999 --env-file ./env.list ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:0.7 ``` ### 3. K8S 中以sidecar 模式运行 @@ -47,7 +47,7 @@ docker run -itd -p 9999:9999 --env-file ./env.list ghcr.io/pinpoint-apm/pinpoin server.yaml sample ``` yml -- image: ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:v0.6.4 +- image: ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:0.7 name: collector-agent args: ["-RecvBufSize=1048576"] securityContext: diff --git a/DOC/collector-agent/Readme-KR.md b/DOC/collector-agent/Readme-KR.md index 3c1a87c1..92be0f2d 100644 --- a/DOC/collector-agent/Readme-KR.md +++ b/DOC/collector-agent/Readme-KR.md @@ -39,7 +39,7 @@ pinpoint-collector의 브리지 모듈 #### 예시: ```sh -docker run -itd -p 9999:9999 --env-file ./env.list ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:latest +docker run -itd -p 9999:9999 --env-file ./env.list ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:0.7 ``` ### 3. K8S에서 sidecar 모드로 실행 @@ -47,7 +47,7 @@ docker run -itd -p 9999:9999 --env-file ./env.list ghcr.io/pinpoint-apm/pinpoin server.yaml sample ``` yml -- image: ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:v0.6.4 +- image: ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:0.7 name: collector-agent args: ["-RecvBufSize=1048576"] securityContext: diff --git a/DOC/collector-agent/Readme.md b/DOC/collector-agent/Readme.md index e4ff323f..ec62feb8 100644 --- a/DOC/collector-agent/Readme.md +++ b/DOC/collector-agent/Readme.md @@ -39,7 +39,7 @@ A bridger to pinpoint-collector. #### Example: ```sh -docker run -itd -p 9999:9999 --env-file ./env.list ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:latest +docker run -itd -p 9999:9999 --env-file ./env.list ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:0.7 ``` ### 3. K8s side car @@ -47,7 +47,7 @@ docker run -itd -p 9999:9999 --env-file ./env.list ghcr.io/pinpoint-apm/pinpoin server.yaml sample ``` yml -- image: ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:v0.6.4 +- image: ghcr.io/pinpoint-apm/pinpoint-c-agent/collector-agent:0.7 name: collector-agent args: ["-RecvBufSize=1048576"] securityContext: diff --git a/collector-agent/1.cap b/collector-agent/1.cap deleted file mode 100644 index bfd93f5b592ce09a980d822e3e84dccff1fa4bc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 693 zcmca|c+)~A1{MYcU}0bcaw6Q=((ed!GI#;mAdCz+7+e_`Y_=#mFgUPv%&2EzU0e;VCnkm)d!zXMHn0@?(^$N=nSlPyYMH_wNe40UrH(DbGT0Valj z8bCKPLfi{7735Y%aZZMbK%+ny8Gub}&U*tg@oXE+M5tSvKyGc20Ge11H}NAZ6o96< zS1TnJ6lA6-St;e^E9rnZd5O8HFm6dEm~CioWMN`vVq$J&YH12oRhC**oSB~oR8?l6 zXQpSOR10#TG|+)~ysQlN@;sOWk-U5n&C4JMevAg1sQ8l^kBND2!Ct-sGZE_Li(oGc gA_rnZ6wE{`ye4i@0lRT7%tRzNUTP3QH!&d!0Flp?ApigX diff --git a/collector-agent/common/config.go b/collector-agent/common/config.go index cb392dd2..8c446601 100644 --- a/collector-agent/common/config.go +++ b/collector-agent/common/config.go @@ -28,7 +28,6 @@ type UserSetting struct { LoggerLevel string LoggerDir string LogStdout bool - Profile bool } func (u *UserSetting) String() string { diff --git a/collector-agent/makefile b/collector-agent/makefile index 34fe96a5..9b4cb0ea 100644 --- a/collector-agent/makefile +++ b/collector-agent/makefile @@ -1,5 +1,5 @@ -TAG ?=v0.6.4 +TAG ?=v0.7 .PHONY: default default: server ; diff --git a/collector-agent/server.go b/collector-agent/server.go index e775c57f..f67d7d5b 100644 --- a/collector-agent/server.go +++ b/collector-agent/server.go @@ -25,6 +25,7 @@ var ( log_level = flag.String("LogLevel", "debug", "Set logging output level(debug/info/warn/error); eg: -LogLevel=info") server_recv_buf = flag.Int("RecvBufSize", 4096*100, "Set recv buf; eg: -RecvBufSize=409600") enable_profile = flag.Bool("EnableProfile", false, "enable net/http/pprof") + show_version = flag.Bool("v", false, "show current version and exit") ) func parseConfig() *common.Config { @@ -38,7 +39,6 @@ func parseConfig() *common.Config { LoggerLevel: *log_level, LogStdout: *log_stdout, LoggerDir: *log_dir, - Profile: *enable_profile, } if ip, ok := os.LookupEnv("PP_COLLECTOR_AGENT_SPAN_IP"); ok { if port, ok := os.LookupEnv("PP_COLLECTOR_AGENT_SPAN_PORT"); ok { @@ -87,7 +87,12 @@ func main() { config := parseConfig() - if config.User.Profile { + if *show_version { + fmt.Fprintf(os.Stderr, "collector-agent:%s \r\n", server.Version) + return + } + + if *enable_profile { go func() { log.Println(http.ListenAndServe("0.0.0.0:8081", nil)) runtime.SetBlockProfileRate(1) diff --git a/collector-agent/server/Server.go b/collector-agent/server/Server.go index 62dc0e7d..6d60b5c6 100644 --- a/collector-agent/server/Server.go +++ b/collector-agent/server/Server.go @@ -20,7 +20,7 @@ import ( "github.com/sirupsen/logrus" ) -var Version = "v0.6.4" +var Version = "0.7" type Server struct { listener net.Listener diff --git a/common/CHANGES.md b/common/CHANGES.md index 96b3ebee..7fdfa940 100644 --- a/common/CHANGES.md +++ b/common/CHANGES.md @@ -1,4 +1,4 @@ -## v0.6.0 +## v0.6.0 2024-10-10 - refactor span json protocol - add async api - data structure change: multiple map to list diff --git a/common/readme.md b/common/readme.md index 67961361..8aa81a45 100644 --- a/common/readme.md +++ b/common/readme.md @@ -4,6 +4,6 @@ ```shell $ cmake -DWITH_TEST_CASE=1 -DWITH_CODECOVERAGE=1 -DCMAKE_BUILD_TYPE=Debug .. -$ ./bin/TestCommon --gtest_filter=node.wakeTrace +$ ./bin/TestCommon ```