From 7b53901a34ebdc49592ec6df806a134946d93cef Mon Sep 17 00:00:00 2001
From: liruichen <anchor_lee@163.com>
Date: Fri, 8 Sep 2023 11:31:19 +0800
Subject: [PATCH] feat: add commit HASH to extra v2

---
 pkg/build/agent.tpl | 6 ++++--
 pkg/build/goenv.go  | 2 +-
 pkg/build/inject.go | 8 +++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkg/build/agent.tpl b/pkg/build/agent.tpl
index 20b1335..1ac5db7 100644
--- a/pkg/build/agent.tpl
+++ b/pkg/build/agent.tpl
@@ -46,6 +46,7 @@ var (
 	id string
 	cond = sync.NewCond(&sync.Mutex{})
 	register_extra = ""
+	commitID string = "{{.CommitID}}"
 )
 
 func init() {
@@ -115,8 +116,9 @@ func register (host string) {
 			time.Sleep(waitDelay)
 			continue
 		}
-
-        register_extra = fmt.Sprintf("%v_%v", os.Getenv("ECHO_APP_ID"), {{.CommitID}})
+        app := os.Getenv("ECHO_APP_ID")
+        log.Printf("app: %v, commit: %v", app, commitID)
+        register_extra = fmt.Sprintf("%v_%v", app, commitID)
 		// 注册，直接将元信息放在 ws 地址中
 		v := url.Values{}
 		v.Set("hostname", ps.hostname)
diff --git a/pkg/build/goenv.go b/pkg/build/goenv.go
index 5368654..0cc095d 100644
--- a/pkg/build/goenv.go
+++ b/pkg/build/goenv.go
@@ -71,7 +71,7 @@ func (b *Build) displayProjectMetaInfo() {
 	log.Infof("GOPATH: %v", b.GOPATH)
 	log.Infof("GOBIN: %v", b.GOBIN)
 	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)
 	if b.IsVendorMod {
 		log.Infof("Project in vendor mod")
diff --git a/pkg/build/inject.go b/pkg/build/inject.go
index b9fe2a8..27781ac 100644
--- a/pkg/build/inject.go
+++ b/pkg/build/inject.go
@@ -19,6 +19,7 @@ import (
 	"os/exec"
 	"path"
 	"path/filepath"
+	"strings"
 
 	"github.com/RickLeee/goc-v2/pkg/build/internal/tool"
 	"github.com/RickLeee/goc-v2/pkg/build/internal/websocket"
@@ -190,14 +191,15 @@ func (b *Build) injectGocAgent(where string, covers []*PackageCover) {
 	} else {
 		_coverMode = b.Mode
 	}
-	var CommitID string
+	var commitID string
 	cmd := exec.Command("git", "describe", "--abbrev=8", "--always")
 	output, err := cmd.Output()
 	if err != nil {
 		log.Errorf("git describe Error:", err)
 	} else {
-		CommitID = string(output)
+		commitID = strings.TrimRight(string(output), "\n")
 	}
+	log.Infof("[goc][info] commitID: %v", commitID)
 	tmplData := struct {
 		Covers                   []*PackageCover
 		GlobalCoverVarImportPath string
@@ -211,7 +213,7 @@ func (b *Build) injectGocAgent(where string, covers []*PackageCover) {
 		Package:                  injectPkgName,
 		Host:                     b.Host,
 		Mode:                     _coverMode,
-		CommitID:                 CommitID,
+		CommitID:                 commitID,
 	}
 
 	if err := coverMainTmpl.Execute(f2, tmplData); err != nil {