Add build information to OTEL binaries (#2237)

Signed-off-by: Pavol Loffay <ploffay@redhat.com>
jaegertracing · May 11, 2020 · cd19b64 · cd19b64
1 parent 8a23c73
commit cd19b64
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/cmd/opentelemetry-collector/cmd/agent/main.go b/cmd/opentelemetry-collector/cmd/agent/main.go
@@ -30,6 +30,7 @@ import (
 	"github.com/jaegertracing/jaeger/cmd/opentelemetry-collector/app/defaults"
 	"github.com/jaegertracing/jaeger/cmd/opentelemetry-collector/app/processor/resourceprocessor"
 	jconfig "github.com/jaegertracing/jaeger/pkg/config"
+	"github.com/jaegertracing/jaeger/pkg/version"
 	"github.com/jaegertracing/jaeger/plugin/sampling/strategystore/static"
 )
 
@@ -40,12 +41,12 @@ func main() {
 		}
 	}
 
+	ver := version.Get()
 	info := service.ApplicationStartInfo{
 		ExeName:  "jaeger-opentelemetry-agent",
 		LongName: "Jaeger OpenTelemetry Agent",
-		// TODO
-		//Version:  version.Version,
-		//GitHash:  version.GitHash,
+		Version:  ver.GitVersion,
+		GitHash:  ver.GitCommit,
 	}
 
 	v := viper.New()

diff --git a/cmd/opentelemetry-collector/cmd/collector/main.go b/cmd/opentelemetry-collector/cmd/collector/main.go
@@ -32,6 +32,7 @@ import (
 	"github.com/jaegertracing/jaeger/cmd/opentelemetry-collector/app/defaults"
 	"github.com/jaegertracing/jaeger/cmd/opentelemetry-collector/app/processor/resourceprocessor"
 	jConfig "github.com/jaegertracing/jaeger/pkg/config"
+	"github.com/jaegertracing/jaeger/pkg/version"
 	"github.com/jaegertracing/jaeger/plugin/sampling/strategystore/static"
 	"github.com/jaegertracing/jaeger/plugin/storage"
 )
@@ -43,12 +44,12 @@ func main() {
 		}
 	}
 
+	ver := version.Get()
 	info := service.ApplicationStartInfo{
 		ExeName:  "jaeger-opentelemetry-collector",
 		LongName: "Jaeger OpenTelemetry Collector",
-		// TODO
-		//Version:  version.Version,
-		//GitHash:  version.GitHash,
+		Version:  ver.GitVersion,
+		GitHash:  ver.GitCommit,
 	}
 
 	v := viper.New()

diff --git a/cmd/opentelemetry-collector/cmd/ingester/main.go b/cmd/opentelemetry-collector/cmd/ingester/main.go
@@ -30,6 +30,7 @@ import (
 	"github.com/jaegertracing/jaeger/cmd/opentelemetry-collector/app"
 	"github.com/jaegertracing/jaeger/cmd/opentelemetry-collector/app/defaults"
 	jconfig "github.com/jaegertracing/jaeger/pkg/config"
+	"github.com/jaegertracing/jaeger/pkg/version"
 	"github.com/jaegertracing/jaeger/plugin/storage"
 )
 
@@ -40,12 +41,12 @@ func main() {
 		}
 	}
 
+	ver := version.Get()
 	info := service.ApplicationStartInfo{
 		ExeName:  "jaeger-opentelemetry-ingester",
 		LongName: "Jaeger OpenTelemetry Ingester",
-		// TODO
-		//Version:  version.Version,
-		//GitHash:  version.GitHash,
+		Version:  ver.GitVersion,
+		GitHash:  ver.GitCommit,
 	}
 
 	v := viper.New()