@@ -6,6 +6,7 @@ package main
66
77import (
88 "context"
9+ "errors"
910 "fmt"
1011 "io"
1112 "log"
@@ -16,9 +17,6 @@ import (
1617 _ "go.uber.org/automaxprocs"
1718 "go.uber.org/zap"
1819
19- agentApp "github.com/jaegertracing/jaeger/cmd/agent/app"
20- agentRep "github.com/jaegertracing/jaeger/cmd/agent/app/reporter"
21- agentGrpcRep "github.com/jaegertracing/jaeger/cmd/agent/app/reporter/grpc"
2220 "github.com/jaegertracing/jaeger/cmd/all-in-one/setupcontext"
2321 collectorApp "github.com/jaegertracing/jaeger/cmd/collector/app"
2422 collectorFlags "github.com/jaegertracing/jaeger/cmd/collector/app/flags"
@@ -76,8 +74,8 @@ func main() {
7674 v := viper .New ()
7775 command := & cobra.Command {
7876 Use : "jaeger-all-in-one" ,
79- Short : "Jaeger all-in-one distribution with agent, collector and query in one process." ,
80- Long : `Jaeger all-in-one distribution with agent, collector and query. Use with caution this version
77+ Short : "Jaeger all-in-one distribution with collector and query in one process." ,
78+ Long : `Jaeger all-in-one distribution with collector and query. Use with caution: this version
8179by default uses only in-memory database.` ,
8280 RunE : func (_ * cobra.Command , _ /* args */ []string ) error {
8381 if err := svc .Start (v ); err != nil {
@@ -86,7 +84,6 @@ by default uses only in-memory database.`,
8684 logger := svc .Logger // shortcut
8785 baseFactory := svc .MetricsFactory .Namespace (metrics.NSOptions {Name : "jaeger" })
8886 version .NewInfoMetrics (baseFactory )
89- agentMetricsFactory := baseFactory .Namespace (metrics.NSOptions {Name : "agent" })
9087 collectorMetricsFactory := baseFactory .Namespace (metrics.NSOptions {Name : "collector" })
9188 queryMetricsFactory := baseFactory .Namespace (metrics.NSOptions {Name : "query" })
9289
@@ -132,12 +129,6 @@ by default uses only in-memory database.`,
132129 logger .Fatal ("Failed to create sampling strategy provider" , zap .Error (err ))
133130 }
134131
135- aOpts := new (agentApp.Builder ).InitFromViper (v )
136- repOpts := new (agentRep.Options ).InitFromViper (v , logger )
137- grpcBuilder , err := agentGrpcRep .NewConnBuilder ().InitFromViper (v )
138- if err != nil {
139- logger .Fatal ("Failed to configure connection for grpc" , zap .Error (err ))
140- }
141132 cOpts , err := new (collectorFlags.CollectorOptions ).InitFromViper (v , logger )
142133 if err != nil {
143134 logger .Fatal ("Failed to initialize collector" , zap .Error (err ))
@@ -164,25 +155,6 @@ by default uses only in-memory database.`,
164155 log .Fatal (err )
165156 }
166157
167- // agent
168- // if the agent reporter grpc host:port was not explicitly set then use whatever the collector is listening on
169- if len (grpcBuilder .CollectorHostPorts ) == 0 {
170- grpcBuilder .CollectorHostPorts = append (grpcBuilder .CollectorHostPorts , cOpts .GRPC .HostPort )
171- }
172- ctx , cancel := context .WithCancel (context .Background ())
173- defer cancel ()
174- builders := map [agentRep.Type ]agentApp.CollectorProxyBuilder {
175- agentRep .GRPC : agentApp .GRPCCollectorProxyBuilder (grpcBuilder ),
176- }
177- cp , err := agentApp .CreateCollectorProxy (ctx , agentApp.ProxyBuilderOptions {
178- Options : * repOpts ,
179- Logger : logger ,
180- Metrics : agentMetricsFactory ,
181- }, builders )
182- if err != nil {
183- logger .Fatal ("Could not create collector proxy" , zap .Error (err ))
184- }
185- agent := startAgent (cp , aOpts , logger , agentMetricsFactory )
186158 telset := telemetery.Setting {
187159 Logger : svc .Logger ,
188160 TracerProvider : tracer .OTEL ,
@@ -197,20 +169,16 @@ by default uses only in-memory database.`,
197169 )
198170
199171 svc .RunAndThen (func () {
200- agent .Stop ()
201- _ = cp .Close ()
202- _ = c .Close ()
203- _ = querySrv .Close ()
172+ var errs []error
173+ errs = append (errs , c .Close ())
174+ errs = append (errs , querySrv .Close ())
204175 if closer , ok := spanWriter .(io.Closer ); ok {
205- if err := closer .Close (); err != nil {
206- logger .Error ("Failed to close span writer" , zap .Error (err ))
207- }
176+ errs = append (errs , closer .Close ())
208177 }
209- if err := storageFactory .Close (); err != nil {
210- logger .Error ("Failed to close storage factory" , zap .Error (err ))
211- }
212- if err := tracer .Close (context .Background ()); err != nil {
213- logger .Error ("Error shutting down tracer provider" , zap .Error (err ))
178+ errs = append (errs , storageFactory .Close ())
179+ errs = append (errs , tracer .Close (context .Background ()))
180+ if err := errors .Join (errs ... ); err != nil {
181+ logger .Error ("Failed to close services" , zap .Error (err ))
214182 }
215183 })
216184 return nil
@@ -228,9 +196,6 @@ by default uses only in-memory database.`,
228196 command ,
229197 svc .AddFlags ,
230198 storageFactory .AddPipelineFlags ,
231- agentApp .AddFlags ,
232- agentRep .AddFlags ,
233- agentGrpcRep .AddFlags ,
234199 collectorFlags .AddFlags ,
235200 queryApp .AddFlags ,
236201 samplingStrategyFactory .AddFlags ,
@@ -242,25 +207,6 @@ by default uses only in-memory database.`,
242207 }
243208}
244209
245- func startAgent (
246- cp agentApp.CollectorProxy ,
247- b * agentApp.Builder ,
248- logger * zap.Logger ,
249- baseFactory metrics.Factory ,
250- ) * agentApp.Agent {
251- agent , err := b .CreateAgent (cp , logger , baseFactory )
252- if err != nil {
253- logger .Fatal ("Unable to initialize Jaeger Agent" , zap .Error (err ))
254- }
255-
256- logger .Info ("Starting agent" )
257- if err := agent .Run (); err != nil {
258- logger .Fatal ("Failed to run the agent" , zap .Error (err ))
259- }
260-
261- return agent
262- }
263-
264210func startQuery (
265211 svc * flags.Service ,
266212 qOpts * queryApp.QueryOptions ,
0 commit comments