From 5b9db4afa874163c32eb0d4477e0a7cbd3c28e2a Mon Sep 17 00:00:00 2001 From: eeliu <27064129+eeliu@users.noreply.github.com> Date: Tue, 13 Aug 2024 10:30:30 +0800 Subject: [PATCH] Update README.md remove multiple langues version --- .github/workflows/publish-collector-agent.yml | 40 ++++++++++++++++++- README.md | 2 - collector-agent/makefile | 2 +- collector-agent/server.go | 12 +++--- collector-agent/server/SpanServer.go | 2 +- 5 files changed, 46 insertions(+), 12 deletions(-) diff --git a/.github/workflows/publish-collector-agent.yml b/.github/workflows/publish-collector-agent.yml index 0a42deb8..71b036f2 100644 --- a/.github/workflows/publish-collector-agent.yml +++ b/.github/workflows/publish-collector-agent.yml @@ -1,7 +1,12 @@ name: publish-collector-agent on: - workflow_dispatch: + release: + types: [created] + +permissions: + contents: write + packages: write env: REGISTRY_IMAGE: ghcr.io/${{ github.repository }}/collector-agent @@ -110,3 +115,36 @@ jobs: - name: Inspect image run: | docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} + + Release-Collector-agent: + runs-on: ubuntu-latest + strategy: + matrix: + # build and publish in parallel: linux/386, linux/amd64, linux/arm64, windows/386, windows/amd64, darwin/amd64, darwin/arm64 + goos: [linux, windows, darwin] + goarch: ["386", amd64, arm64] + exclude: + - goarch: "386" + goos: darwin + - goarch: arm64 + goos: windows + steps: + - name: Show environment + run: export + - uses: actions/checkout@v2 + - uses: wangyoucao577/go-release-action@v1 + id: release-ca + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + goversion: "https://dl.google.com/go/go1.18.10.linux-amd64.tar.gz" + goos: ${{ matrix.goos }} + goarch: ${{ matrix.goarch }} + project_path: "collector-agent" + binary_name: "collector-agent" + extra_files: LICENSE collector-agent/CHANGES.md + + # - name: Release collector-agent-package + # id: rel_php_pak + # uses: softprops/action-gh-release@v2 + # with: + # files: ${{ steps.release-ca.outputs.release_asset_dir }}/* \ No newline at end of file diff --git a/README.md b/README.md index 6d59b6a5..881cf850 100644 --- a/README.md +++ b/README.md @@ -66,8 +66,6 @@ Our advantage: ### Blogs - [Intro pinpoint php aop](https://github.com/pinpoint-apm/pinpoint-php-aop/wiki/Intro-pinpoint-php-aop) -- [pinpoint php aop 内部原理](https://github.com/pinpoint-apm/pinpoint-php-aop/wiki/pinpoint-php-aop-%E5%86%85%E9%83%A8%E5%8E%9F%E7%90%86) -- [pinpoint php aop 내부 원리](https://github.com/pinpoint-apm/pinpoint-php-aop/wiki/pinpoint-php-aop-%EB%82%B4%EB%B6%80-%EC%9B%90%EB%A6%AC) - [pinpoint php on phpmyadmin](https://github.com/pinpoint-apm/pinpoint-c-agent/wiki/phpmyadmin_en) diff --git a/collector-agent/makefile b/collector-agent/makefile index e5c20438..34fe96a5 100644 --- a/collector-agent/makefile +++ b/collector-agent/makefile @@ -1,5 +1,5 @@ -TAG ?=v0.5.2 +TAG ?=v0.6.4 .PHONY: default default: server ; diff --git a/collector-agent/server.go b/collector-agent/server.go index b33555e4..b3a3f01a 100644 --- a/collector-agent/server.go +++ b/collector-agent/server.go @@ -1,9 +1,7 @@ package main import ( - "net/http" - _ "net/http/pprof" - "runtime" + // _ "net/http/pprof" "flag" @@ -30,10 +28,10 @@ func main() { server.InitServerConfig() spanServer := server.SpanServer{} // disable performance profile - go func() { - log.Println(http.ListenAndServe("0.0.0.0:8081", nil)) - runtime.SetBlockProfileRate(1) - }() + // go func() { + // log.Println(http.ListenAndServe("0.0.0.0:8081", nil)) + // runtime.SetBlockProfileRate(1) + // }() if _, err := spanServer.Run(); err != nil { log.Warn("SpanServer is exit ....") diff --git a/collector-agent/server/SpanServer.go b/collector-agent/server/SpanServer.go index f2c23a14..9cdc7645 100644 --- a/collector-agent/server/SpanServer.go +++ b/collector-agent/server/SpanServer.go @@ -20,7 +20,7 @@ import ( log "github.com/sirupsen/logrus" ) -var Version = "v0.5.3" +var Version = "v0.6.4" type SpanServer struct { listener net.Listener