ar0c/goc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feat: add commit HASH to extra v2

Browse Source
This commit is contained in:
liruichen 2023-09-08 11:31:19 +08:00
parent 7e18447f9a
commit 7b53901a34
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/build/agent.tpl
View File

@ -46,6 +46,7 @@ var (
id string id string
cond = sync.NewCond(&sync.Mutex{}) cond = sync.NewCond(&sync.Mutex{})
register_extra = "" register_extra = ""
commitID string = "{{.CommitID}}"
) )
func init() { func init() {
@ -115,8 +116,9 @@ func register (host string) {
time.Sleep(waitDelay) time.Sleep(waitDelay)
continue continue
} }
app := os.Getenv("ECHO_APP_ID")
register_extra = fmt.Sprintf("%v_%v", os.Getenv("ECHO_APP_ID"), {{.CommitID}}) log.Printf("app: %v, commit: %v", app, commitID)
register_extra = fmt.Sprintf("%v_%v", app, commitID)
// 注册，直接将元信息放在 ws 地址中 // 注册，直接将元信息放在 ws 地址中
v := url.Values{} v := url.Values{}
v.Set("hostname", ps.hostname) v.Set("hostname", ps.hostname)

2
pkg/build/goenv.go
View File

@ -71,7 +71,7 @@ func (b *Build) displayProjectMetaInfo() {
log.Infof("GOPATH: %v", b.GOPATH) log.Infof("GOPATH: %v", b.GOPATH)
log.Infof("GOBIN: %v", b.GOBIN) log.Infof("GOBIN: %v", b.GOBIN)
log.Infof("Project Directory: %v", b.CurModProjectDir) log.Infof("Project Directory: %v", b.CurModProjectDir)
log.Infof("GOC_REGISTER_EXTRA: %v", os.Getenv("GOC_REGISTER_EXTRA")) log.Infof("GOC_REGISTER_EXTRA from env: %v", os.Getenv("GOC_REGISTER_EXTRA"))
log.Infof("Temporary Project Directory: %v", b.TmpModProjectDir) log.Infof("Temporary Project Directory: %v", b.TmpModProjectDir)
if b.IsVendorMod { if b.IsVendorMod {
log.Infof("Project in vendor mod") log.Infof("Project in vendor mod")

8
pkg/build/inject.go
View File

@ -19,6 +19,7 @@ import (
"os/exec" "os/exec"
"path" "path"
"path/filepath" "path/filepath"
"strings"
"github.com/RickLeee/goc-v2/pkg/build/internal/tool" "github.com/RickLeee/goc-v2/pkg/build/internal/tool"
"github.com/RickLeee/goc-v2/pkg/build/internal/websocket" "github.com/RickLeee/goc-v2/pkg/build/internal/websocket"
@ -190,14 +191,15 @@ func (b *Build) injectGocAgent(where string, covers []*PackageCover) {
} else { } else {
_coverMode = b.Mode _coverMode = b.Mode
} }
var CommitID string var commitID string
cmd := exec.Command("git", "describe", "--abbrev=8", "--always") cmd := exec.Command("git", "describe", "--abbrev=8", "--always")
output, err := cmd.Output() output, err := cmd.Output()
if err != nil { if err != nil {
log.Errorf("git describe Error:", err) log.Errorf("git describe Error:", err)
} else { } else {
CommitID = string(output) commitID = strings.TrimRight(string(output), "\n")
} }
log.Infof("[goc][info] commitID: %v", commitID)
tmplData := struct { tmplData := struct {
Covers []*PackageCover Covers []*PackageCover
GlobalCoverVarImportPath string GlobalCoverVarImportPath string
@ -211,7 +213,7 @@ func (b *Build) injectGocAgent(where string, covers []*PackageCover) {
Package: injectPkgName, Package: injectPkgName,
Host: b.Host, Host: b.Host,
Mode: _coverMode, Mode: _coverMode,
CommitID: CommitID, CommitID: commitID,
} }
if err := coverMainTmpl.Execute(f2, tmplData); err != nil { if err := coverMainTmpl.Execute(f2, tmplData); err != nil {