@@ -10,40 +10,40 @@ import (
10
10
)
11
11
12
12
var (
13
- GitCommit string
14
- GitBranch string
15
- GitSummary string
16
- BuildDate string
17
- AppVersion string
18
- IronlibVersion = ironlibVersion ()
19
- BmclibVersion = bmclibVersion ()
20
- ServerserviceVersion = serverserviceVersion ()
21
- GoVersion = runtime .Version ()
13
+ GitCommit string
14
+ GitBranch string
15
+ GitSummary string
16
+ BuildDate string
17
+ AppVersion string
18
+ IronlibVersion = ironlibVersion ()
19
+ BmclibVersion = bmclibVersion ()
20
+ FleetDBAPIVersion = fleetdbAPIVersion ()
21
+ GoVersion = runtime .Version ()
22
22
)
23
23
24
24
type Version struct {
25
- GitCommit string `json:"git_commit"`
26
- GitBranch string `json:"git_branch"`
27
- GitSummary string `json:"git_summary"`
28
- BuildDate string `json:"build_date"`
29
- AppVersion string `json:"app_version"`
30
- GoVersion string `json:"go_version"`
31
- IronlibVersion string `json:"ironlib_version"`
32
- BmclibVersion string `json:"bmclib_version"`
33
- ServerserviceVersion string `json:"serverservice_version "`
25
+ GitCommit string `json:"git_commit"`
26
+ GitBranch string `json:"git_branch"`
27
+ GitSummary string `json:"git_summary"`
28
+ BuildDate string `json:"build_date"`
29
+ AppVersion string `json:"app_version"`
30
+ GoVersion string `json:"go_version"`
31
+ IronlibVersion string `json:"ironlib_version"`
32
+ BmclibVersion string `json:"bmclib_version"`
33
+ FleetDBAPIVersion string `json:"fleetdbapi_version "`
34
34
}
35
35
36
36
func Current () Version {
37
37
return Version {
38
- GitBranch : GitBranch ,
39
- GitCommit : GitCommit ,
40
- GitSummary : GitSummary ,
41
- BuildDate : BuildDate ,
42
- AppVersion : AppVersion ,
43
- GoVersion : GoVersion ,
44
- IronlibVersion : IronlibVersion ,
45
- BmclibVersion : BmclibVersion ,
46
- ServerserviceVersion : ServerserviceVersion ,
38
+ GitBranch : GitBranch ,
39
+ GitCommit : GitCommit ,
40
+ GitSummary : GitSummary ,
41
+ BuildDate : BuildDate ,
42
+ AppVersion : AppVersion ,
43
+ GoVersion : GoVersion ,
44
+ IronlibVersion : IronlibVersion ,
45
+ BmclibVersion : BmclibVersion ,
46
+ FleetDBAPIVersion : FleetDBAPIVersion ,
47
47
}
48
48
}
49
49
@@ -53,10 +53,10 @@ func ExportBuildInfoMetric() {
53
53
Name : "alloy_build_info" ,
54
54
Help : "A metric with a constant '1' value, labeled by branch, commit, summary, builddate, version, goversion from which Alloy was built." ,
55
55
},
56
- []string {"branch" , "commit" , "summary" , "builddate" , "version" , "goversion" , "ironlibversion" , "serverserviceVersion " },
56
+ []string {"branch" , "commit" , "summary" , "builddate" , "version" , "goversion" , "ironlibversion" , "fleetdbAPIVersion " },
57
57
)
58
58
59
- buildInfo .WithLabelValues (GitBranch , GitCommit , GitSummary , BuildDate , AppVersion , GoVersion , IronlibVersion , ServerserviceVersion ).Set (1 )
59
+ buildInfo .WithLabelValues (GitBranch , GitCommit , GitSummary , BuildDate , AppVersion , GoVersion , IronlibVersion , FleetDBAPIVersion ).Set (1 )
60
60
}
61
61
62
62
func ironlibVersion () string {
@@ -89,14 +89,14 @@ func bmclibVersion() string {
89
89
return ""
90
90
}
91
91
92
- func serverserviceVersion () string {
92
+ func fleetdbAPIVersion () string {
93
93
buildInfo , ok := rdebug .ReadBuildInfo ()
94
94
if ! ok {
95
95
return ""
96
96
}
97
97
98
98
for _ , d := range buildInfo .Deps {
99
- if strings .Contains (d .Path , "serverservice " ) {
99
+ if strings .Contains (d .Path , "fleetdb " ) {
100
100
return d .Version
101
101
}
102
102
}
0 commit comments