Don't include 'unknown' revision value in logs

knative · Jul 16, 2022 · 512c6b4 · 512c6b4
1 parent e1dbd0a
commit 512c6b4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/changeset/commit.go b/changeset/commit.go
@@ -24,6 +24,8 @@ import (
 	"sync"
 )
 
+const Unknown = "unknown"
+
 var (
 	shaRegexp = regexp.MustCompile(`^[a-f0-9]{40,64}$`)
 	rev       string
@@ -65,7 +67,7 @@ func get() (string, error) {
 	}
 
 	if revision == "" {
-		return "unknown", nil
+		return Unknown, nil
 	}
 
 	if shaRegexp.MatchString(revision) {

diff --git a/changeset/commit_test.go b/changeset/commit_test.go
@@ -40,7 +40,7 @@ func TestGet(t *testing.T) {
 		name:   "missing revision",
 		ok:     true,
 		info:   &debug.BuildInfo{},
-		result: "unknown",
+		result: Unknown,
 	}, {
 		name: "SHA1 revision is truncated",
 		ok:   true,

diff --git a/logging/config.go b/logging/config.go
@@ -76,8 +76,8 @@ func NewLogger(configJSON string, levelOverride string, opts ...zap.Option) (*za
 
 func enrichLoggerWithCommitID(logger *zap.Logger) *zap.SugaredLogger {
 	revision, err := changeset.Get()
-	if err != nil {
-		logger.Info("Fetch git commit sha", zap.Error(err))
+	if err != nil || revision == changeset.Unknown {
+		logger.Info("Unable to read vcs.revision from binary", zap.Error(err))
 		return logger.Sugar()
 	}