Merged in feature/CollectorBuildVersion (pull request #100)
Collector Build Version * lint * fixtests
This commit is contained in:
@@ -14,7 +14,6 @@ import (
|
||||
|
||||
doccleanrunner "queryorchestration/api/docCleanRunner"
|
||||
documentclean "queryorchestration/internal/document/clean"
|
||||
cleanversion "queryorchestration/internal/document/clean/version"
|
||||
"queryorchestration/internal/server/runner"
|
||||
"queryorchestration/internal/serviceconfig/objectstore"
|
||||
"queryorchestration/internal/serviceconfig/queue/documenttext"
|
||||
@@ -34,9 +33,7 @@ func main() {
|
||||
cfg := &DocCleanConfig{}
|
||||
|
||||
cfg.ControllerFunc = func() runner.Controller {
|
||||
clean := documentclean.New(cfg, &documentclean.Services{
|
||||
Version: cleanversion.New(cfg),
|
||||
})
|
||||
clean := documentclean.New(cfg)
|
||||
|
||||
return doccleanrunner.New(cfg.GetValidator(), &doccleanrunner.Services{
|
||||
Clean: clean,
|
||||
|
||||
@@ -14,7 +14,6 @@ import (
|
||||
|
||||
doctextrunner "queryorchestration/api/docTextRunner"
|
||||
documenttext "queryorchestration/internal/document/text"
|
||||
textversion "queryorchestration/internal/document/text/version"
|
||||
"queryorchestration/internal/server/runner"
|
||||
"queryorchestration/internal/serviceconfig/queue/querysync"
|
||||
|
||||
@@ -32,9 +31,7 @@ func main() {
|
||||
cfg := &DocTextConfig{}
|
||||
|
||||
cfg.ControllerFunc = func() runner.Controller {
|
||||
text := documenttext.New(cfg, &documenttext.Services{
|
||||
Version: textversion.New(cfg),
|
||||
})
|
||||
text := documenttext.New(cfg)
|
||||
|
||||
return doctextrunner.New(cfg.GetValidator(), &doctextrunner.Services{
|
||||
Text: text,
|
||||
|
||||
@@ -23,7 +23,7 @@ import (
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"queryorchestration/internal/serviceconfig/observability"
|
||||
"queryorchestration/internal/serviceconfig/build"
|
||||
|
||||
"queryorchestration/internal/serviceconfig/observability/prometheus"
|
||||
)
|
||||
@@ -54,9 +54,9 @@ func getMetricsConfig() prometheus.MetricsConfig {
|
||||
}
|
||||
|
||||
func main() {
|
||||
rawVersion := observability.GetVersion()
|
||||
rawVersion := build.GetVersion()
|
||||
fmt.Printf("Version: %s\n", rawVersion)
|
||||
timeVersion := observability.GetVersionTimestamp()
|
||||
timeVersion := build.GetVersionTimestamp()
|
||||
fmt.Printf("Version Timestamp: %s\n", timeVersion.String())
|
||||
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
|
||||
@@ -24,8 +24,6 @@ import (
|
||||
"queryorchestration/internal/collector"
|
||||
collectorset "queryorchestration/internal/collector/set"
|
||||
"queryorchestration/internal/document"
|
||||
cleanversion "queryorchestration/internal/document/clean/version"
|
||||
textversion "queryorchestration/internal/document/text/version"
|
||||
"queryorchestration/internal/export"
|
||||
"queryorchestration/internal/query"
|
||||
"queryorchestration/internal/query/result"
|
||||
@@ -56,13 +54,9 @@ func main() {
|
||||
res := result.New(cfg, &result.Services{
|
||||
Query: que,
|
||||
})
|
||||
tev := textversion.New(cfg)
|
||||
clv := cleanversion.New(cfg)
|
||||
col := collector.New(cfg)
|
||||
colupdate := collectorset.New(cfg, &collectorset.Services{
|
||||
Collector: col,
|
||||
CleanVersion: clv,
|
||||
TextVersion: tev,
|
||||
Collector: col,
|
||||
})
|
||||
cli := client.New(cfg)
|
||||
doc := document.New(cfg)
|
||||
|
||||
Reference in New Issue
Block a user