Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Log version/build info on startup #4723

Merged
merged 3 commits into from
Sep 4, 2023
Merged

Log version/build info on startup #4723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13d5441
Log version/build info on startup
yurishkuro Sep 4, 2023
db33ef0
fix
yurishkuro Sep 4, 2023
3f2f0a4
fix
yurishkuro Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ cmd/query/query
cmd/query/query-*
cmd/tracegen/tracegen
cmd/tracegen/tracegen-*
cmd/docs/*.md
cmd/docs/*.rst
cmd/docs/*.1
cmd/docs/*.yaml
crossdock/crossdock-*
run-crossdock.log
proto-gen/.patched-otel-proto/
Expand Down
2 changes: 1 addition & 1 deletion cmd/agent/app/reporter/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/cmd/all-in-one/setupcontext"
"github.com/jaegertracing/jaeger/cmd/flags"
"github.com/jaegertracing/jaeger/cmd/internal/flags"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions cmd/agent/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (
"github.com/jaegertracing/jaeger/cmd/agent/app"
"github.com/jaegertracing/jaeger/cmd/agent/app/reporter"
"github.com/jaegertracing/jaeger/cmd/agent/app/reporter/grpc"
"github.com/jaegertracing/jaeger/cmd/docs"
"github.com/jaegertracing/jaeger/cmd/flags"
"github.com/jaegertracing/jaeger/cmd/status"
"github.com/jaegertracing/jaeger/cmd/internal/docs"
"github.com/jaegertracing/jaeger/cmd/internal/flags"
"github.com/jaegertracing/jaeger/cmd/internal/status"
"github.com/jaegertracing/jaeger/internal/metrics/expvar"
"github.com/jaegertracing/jaeger/internal/metrics/fork"
"github.com/jaegertracing/jaeger/pkg/config"
Expand Down
8 changes: 4 additions & 4 deletions cmd/all-in-one/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ import (
"github.com/jaegertracing/jaeger/cmd/all-in-one/setupcontext"
collectorApp "github.com/jaegertracing/jaeger/cmd/collector/app"
collectorFlags "github.com/jaegertracing/jaeger/cmd/collector/app/flags"
"github.com/jaegertracing/jaeger/cmd/docs"
"github.com/jaegertracing/jaeger/cmd/env"
"github.com/jaegertracing/jaeger/cmd/flags"
"github.com/jaegertracing/jaeger/cmd/internal/docs"
"github.com/jaegertracing/jaeger/cmd/internal/env"
"github.com/jaegertracing/jaeger/cmd/internal/flags"
"github.com/jaegertracing/jaeger/cmd/internal/status"
queryApp "github.com/jaegertracing/jaeger/cmd/query/app"
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
"github.com/jaegertracing/jaeger/cmd/status"
"github.com/jaegertracing/jaeger/internal/metrics/expvar"
"github.com/jaegertracing/jaeger/internal/metrics/fork"
"github.com/jaegertracing/jaeger/pkg/config"
Expand Down
2 changes: 1 addition & 1 deletion cmd/collector/app/flags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/spf13/viper"
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/cmd/flags"
"github.com/jaegertracing/jaeger/cmd/internal/flags"
"github.com/jaegertracing/jaeger/pkg/config/corscfg"
"github.com/jaegertracing/jaeger/pkg/config/tlscfg"
"github.com/jaegertracing/jaeger/pkg/tenancy"
Expand Down
2 changes: 1 addition & 1 deletion cmd/collector/app/span_handler_builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/cmd/collector/app/flags"
cmdFlags "github.com/jaegertracing/jaeger/cmd/flags"
cmdFlags "github.com/jaegertracing/jaeger/cmd/internal/flags"
"github.com/jaegertracing/jaeger/pkg/config"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/pkg/tenancy"
Expand Down
8 changes: 4 additions & 4 deletions cmd/collector/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import (

"github.com/jaegertracing/jaeger/cmd/collector/app"
"github.com/jaegertracing/jaeger/cmd/collector/app/flags"
"github.com/jaegertracing/jaeger/cmd/docs"
"github.com/jaegertracing/jaeger/cmd/env"
cmdFlags "github.com/jaegertracing/jaeger/cmd/flags"
"github.com/jaegertracing/jaeger/cmd/status"
"github.com/jaegertracing/jaeger/cmd/internal/docs"
"github.com/jaegertracing/jaeger/cmd/internal/env"
cmdFlags "github.com/jaegertracing/jaeger/cmd/internal/flags"
"github.com/jaegertracing/jaeger/cmd/internal/status"
"github.com/jaegertracing/jaeger/internal/metrics/expvar"
"github.com/jaegertracing/jaeger/internal/metrics/fork"
"github.com/jaegertracing/jaeger/pkg/config"
Expand Down
8 changes: 4 additions & 4 deletions cmd/ingester/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ import (
_ "go.uber.org/automaxprocs"
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/cmd/docs"
"github.com/jaegertracing/jaeger/cmd/env"
"github.com/jaegertracing/jaeger/cmd/flags"
"github.com/jaegertracing/jaeger/cmd/ingester/app"
"github.com/jaegertracing/jaeger/cmd/ingester/app/builder"
"github.com/jaegertracing/jaeger/cmd/status"
"github.com/jaegertracing/jaeger/cmd/internal/docs"
"github.com/jaegertracing/jaeger/cmd/internal/env"
"github.com/jaegertracing/jaeger/cmd/internal/flags"
"github.com/jaegertracing/jaeger/cmd/internal/status"
"github.com/jaegertracing/jaeger/pkg/config"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/pkg/version"
Expand Down
4 changes: 4 additions & 0 deletions cmd/internal/docs/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*.md
*.rst
*.1
*.yaml
0 cmd/docs/command.go → cmd/internal/docs/command.go
View file
Open in desktop
File renamed without changes.
0 cmd/docs/command_test.go → cmd/internal/docs/command_test.go
View file
Open in desktop
File renamed without changes.
0 cmd/env/command.go → cmd/internal/env/command.go
View file
Open in desktop
File renamed without changes.
0 cmd/env/command_test.go → cmd/internal/env/command_test.go
View file
Open in desktop
File renamed without changes.
0 cmd/flags/.nocover → cmd/internal/flags/.nocover
View file
Open in desktop
File renamed without changes.
0 cmd/flags/admin.go → cmd/internal/flags/admin.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/flags/admin_test.go → cmd/internal/flags/admin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
"github.com/jaegertracing/jaeger/ports"
)

var testCertKeyLocation = "../../pkg/config/tlscfg/testdata"
var testCertKeyLocation = "../../../pkg/config/tlscfg/testdata"

func TestAdminServerHandlesPortZero(t *testing.T) {
adminServer := NewAdminServer(":0")
Expand Down
0 cmd/flags/doc.go → cmd/internal/flags/doc.go
View file
Open in desktop
File renamed without changes.
0 cmd/flags/flags.go → cmd/internal/flags/flags.go
View file
Open in desktop
File renamed without changes.
0 cmd/flags/flags_test.go → cmd/internal/flags/flags_test.go
View file
Open in desktop
File renamed without changes.
0 cmd/flags/service.go → cmd/internal/flags/service.go
View file
Open in desktop
File renamed without changes.
0 cmd/flags/service_test.go → cmd/internal/flags/service_test.go
View file
Open in desktop
File renamed without changes.
0 cmd/status/command.go → cmd/internal/status/command.go
View file
Open in desktop
File renamed without changes.
0 cmd/status/command_test.go → cmd/internal/status/command_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/query/app/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/insecure"

"github.com/jaegertracing/jaeger/cmd/flags"
"github.com/jaegertracing/jaeger/cmd/internal/flags"
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
"github.com/jaegertracing/jaeger/internal/grpctest"
"github.com/jaegertracing/jaeger/model"
Expand Down
2 changes: 1 addition & 1 deletion cmd/query/app/token_propagation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/stretchr/testify/require"
"go.uber.org/zap/zaptest"

"github.com/jaegertracing/jaeger/cmd/flags"
"github.com/jaegertracing/jaeger/cmd/internal/flags"
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
"github.com/jaegertracing/jaeger/pkg/bearertoken"
"github.com/jaegertracing/jaeger/pkg/config"
Expand Down
8 changes: 4 additions & 4 deletions cmd/query/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ import (
_ "go.uber.org/automaxprocs"
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/cmd/docs"
"github.com/jaegertracing/jaeger/cmd/env"
"github.com/jaegertracing/jaeger/cmd/flags"
"github.com/jaegertracing/jaeger/cmd/internal/docs"
"github.com/jaegertracing/jaeger/cmd/internal/env"
"github.com/jaegertracing/jaeger/cmd/internal/flags"
"github.com/jaegertracing/jaeger/cmd/internal/status"
"github.com/jaegertracing/jaeger/cmd/query/app"
"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
"github.com/jaegertracing/jaeger/cmd/status"
"github.com/jaegertracing/jaeger/pkg/bearertoken"
"github.com/jaegertracing/jaeger/pkg/config"
"github.com/jaegertracing/jaeger/pkg/jtracer"
Expand Down
2 changes: 1 addition & 1 deletion cmd/remote-storage/app/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/insecure"

"github.com/jaegertracing/jaeger/cmd/flags"
"github.com/jaegertracing/jaeger/cmd/internal/flags"
"github.com/jaegertracing/jaeger/internal/grpctest"
"github.com/jaegertracing/jaeger/pkg/config/tlscfg"
"github.com/jaegertracing/jaeger/pkg/healthcheck"
Expand Down
8 changes: 4 additions & 4 deletions cmd/remote-storage/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import (
_ "go.uber.org/automaxprocs"
"go.uber.org/zap"

"github.com/jaegertracing/jaeger/cmd/docs"
"github.com/jaegertracing/jaeger/cmd/env"
"github.com/jaegertracing/jaeger/cmd/flags"
"github.com/jaegertracing/jaeger/cmd/internal/docs"
"github.com/jaegertracing/jaeger/cmd/internal/env"
"github.com/jaegertracing/jaeger/cmd/internal/flags"
"github.com/jaegertracing/jaeger/cmd/internal/status"
"github.com/jaegertracing/jaeger/cmd/remote-storage/app"
"github.com/jaegertracing/jaeger/cmd/status"
"github.com/jaegertracing/jaeger/pkg/config"
"github.com/jaegertracing/jaeger/pkg/metrics"
"github.com/jaegertracing/jaeger/pkg/tenancy"
Expand Down
3 changes: 3 additions & 0 deletions cmd/tracegen/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import (

"github.com/jaegertracing/jaeger/internal/jaegerclientenv2otel"
"github.com/jaegertracing/jaeger/internal/tracegen"
"github.com/jaegertracing/jaeger/pkg/version"
)

func main() {
Expand All @@ -52,6 +53,8 @@ func main() {
cfg.Flags(fs)
flag.Parse()

logger.Info(version.Get().String())

otel.SetTextMapPropagator(propagation.TraceContext{})
jaegerclientenv2otel.MapJaegerToOtelEnvVars(logger)

Expand Down
17 changes: 14 additions & 3 deletions pkg/version/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@

package version

import "github.com/jaegertracing/jaeger/pkg/metrics"
import (
"fmt"

"github.com/jaegertracing/jaeger/pkg/metrics"
)

var (
// commitFromGit is a constant representing the source version that
Expand All @@ -27,14 +31,14 @@ var (
date string
)

// Info holds build information
// Info holds build information.
type Info struct {
GitCommit string `json:"gitCommit"`
GitVersion string `json:"gitVersion"`
BuildDate string `json:"buildDate"`
}

// InfoMetrics hold metrics about build information
// InfoMetrics hold a gauge whose tags include build information.
type InfoMetrics struct {
BuildInfo metrics.Gauge `metric:"build_info"`
}
Expand Down Expand Up @@ -62,3 +66,10 @@ func NewInfoMetrics(metricsFactory metrics.Factory) *InfoMetrics {

return &info
}

func (i Info) String() string {
return fmt.Sprintf(
"application version: git-commit=%s, git-version=%s, build-date=%s",
i.GitCommit, i.GitVersion, i.BuildDate,
)
}
4 changes: 3 additions & 1 deletion pkg/version/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,20 @@ package version
import (
"encoding/json"
"fmt"
"log"

"github.com/spf13/cobra"
)

// Command creates version command
func Command() *cobra.Command {
info := Get()
log.Println(info)
return &cobra.Command{
Use: "version",
Short: "Print the version.",
Long: `Print the version and build information.`,
RunE: func(cmd *cobra.Command, args []string) error {
info := Get()
json, err := json.Marshal(info)
if err != nil {
return err
Expand Down