Skip to content

Commit

Permalink
go118: Get VCS info from debug.BuildInfo
Browse files Browse the repository at this point in the history
Signed-off-by: Julien Pivotto <[email protected]>
  • Loading branch information
roidelapluie committed Dec 8, 2022
1 parent 11bcb5b commit 5b6c049
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 3 deletions.
6 changes: 3 additions & 3 deletions version/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func NewCollector(program string) prometheus.Collector {
),
ConstLabels: prometheus.Labels{
"version": Version,
"revision": Revision,
"revision": getRevision(),
"branch": Branch,
"goversion": GoVersion,
},
Expand All @@ -69,7 +69,7 @@ func Print(program string) string {
m := map[string]string{
"program": program,
"version": Version,
"revision": Revision,
"revision": getRevision(),
"branch": Branch,
"buildUser": BuildUser,
"buildDate": BuildDate,
Expand All @@ -87,7 +87,7 @@ func Print(program string) string {

// Info returns version, branch and revision information.
func Info() string {
return fmt.Sprintf("(version=%s, branch=%s, revision=%s)", Version, Branch, Revision)
return fmt.Sprintf("(version=%s, branch=%s, revision=%s)", Version, Branch, getRevision())
}

// BuildContext returns goVersion, buildUser and buildDate information.
Expand Down
21 changes: 21 additions & 0 deletions version/info_default.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright 2022 The Prometheus Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build !go1.18
// +build !go1.18

package version

func getRevision() string {
return Revision
}
58 changes: 58 additions & 0 deletions version/info_go118.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
// Copyright 2022 The Prometheus Authors
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build go1.18
// +build go1.18

package version

import "runtime/debug"

var computedRevision string

func getRevision() string {
if Revision != "" {
return Revision
}
return computedRevision
}

func init() {
computedRevision = computeRevision()
}

func computeRevision() string {
var (
rev = "unknown"
modified bool
)

buildInfo, ok := debug.ReadBuildInfo()
if !ok {
return rev
}
for _, v := range buildInfo.Settings {
if v.Key == "vcs.revision" {
rev = v.Value
}
if v.Key == "vcs.modified" {
if v.Value == "true" {
modified = true
}
}
}
if modified {
return rev + "-modified"
}
return rev
}

0 comments on commit 5b6c049

Please sign in to comment.