[Tempo 3.0] Clean up targets

CHANGELOG.md

@@ -8,6 +8,7 @@
 
 * [CHANGE] **BREAKING CHANGE** Removed `v2` block encoding and compactor component. [#6273](https://github.com/grafana/tempo/pull/6273) (@joe-elliott)
   This includes the removal of the following CLI commands which were `v2` specific: `list block`, `list index`, `view index`, `gen index`, `gen bloom`.
+* [CHANGE] **BREAKING CHANGE** Sets the `all` target to be 3.0 compatible and removes the `scalable-single-binary` target [#6283](https://github.com/grafana/tempo/pull/6283) (@joe-elliott)
 
 # v2.10.0-rc.0
 

cmd/tempo/app/app_test.go

@@ -56,5 +56,5 @@ func TestApp_RunStop(t *testing.T) {
 		// #nosec G107 -- nosemgrep: tainted-url-host
 		_, httpErr := http.Get(healthCheckURL)
 		return httpErr != nil
-	}, 30*time.Second, 1*time.Second)
+	}, 60*time.Second, 1*time.Second)
 }

cmd/tempo/app/modules.go

@@ -86,9 +86,7 @@
 	LiveStore                     string = "live-store"
 
 	// composite targets
-	SingleBinary         string = "all"
-	SingleBinary3_0      string = "all-3.0"
-	ScalableSingleBinary string = "scalable-single-binary"
+	SingleBinary string = "all"
 
 	// ring names
 	ringIngester          string = "ingester"
@@ -97,9 +95,8 @@
 	ringLiveStore         string = "live-store"
 )
 
-// IsSingleBinary returns true if the target is SingleBinary or SingleBinary3_0
 func IsSingleBinary(target string) bool {
-	return target == SingleBinary || target == SingleBinary3_0
+	return target == SingleBinary
 }
 
 func (t *App) initServer() (services.Service, error) {
@@ -368,8 +365,8 @@
 	queryRangeHandler := t.HTTPAuthMiddleware.Wrap(http.HandlerFunc(t.generator.QueryRangeHandler))
 	t.Server.HTTPRouter().Handle(path.Join(api.PathPrefixGenerator, addHTTPAPIPrefix(&t.cfg, api.PathMetricsQueryRange)), queryRangeHandler)
 
-	if t.cfg.Target != SingleBinary3_0 { // conflicts with livestore, only in single binary 3.0 mode. this will go away once SingleBinary3_0 -> SingleBinary
-		tempopb.RegisterMetricsGeneratorServer(t.Server.GRPC(), t.generator)
+	if !IsSingleBinary(t.cfg.Target) {
+		tempopb.RegisterMetricsGeneratorServer(t.Server.GRPC(), t.generator) // todo: this can be removed before 3.0 but needs to exist as long as we have any deployments anywhere on the traditional arch
 	}
 
 	return t.generator, nil
@@ -606,7 +603,7 @@
 func (t *App) initStore() (services.Service, error) {
 	// the only component that needs a functioning tempodb pool are the queriers. all other components will just spin up
 	// hundreds of never used pool goroutines. set pool size to 0 here to avoid that.
-	if t.cfg.Target != Querier && !IsSingleBinary(t.cfg.Target) && t.cfg.Target != ScalableSingleBinary {
+	if t.cfg.Target != Querier && !IsSingleBinary(t.cfg.Target) {
 		t.cfg.StorageConfig.Trace.Pool.MaxWorkers = 0
 		t.cfg.StorageConfig.Trace.Pool.QueueDepth = 0
 	}
@@ -837,8 +834,6 @@
 	mm.RegisterModule(LiveStore, t.initLiveStore)
 
 	mm.RegisterModule(SingleBinary, nil)
-	mm.RegisterModule(ScalableSingleBinary, nil)
-	mm.RegisterModule(SingleBinary3_0, nil)
 
 	deps := map[string][]string{
 		// InternalServer: nil,
@@ -871,9 +866,7 @@
 		LiveStore:                     {Common, MemberlistKV, PartitionRing},
 
 		// composite targets
-		SingleBinary:         {QueryFrontend, Querier, Ingester, Distributor, MetricsGenerator},
-		SingleBinary3_0:      {BackendScheduler, BackendWorker, QueryFrontend, Querier, Distributor, MetricsGenerator, BlockBuilder, LiveStore}, // TODO: when we cut 3.0 remove SingleBinary and replace with this
-		ScalableSingleBinary: {SingleBinary},
+		SingleBinary: {BackendScheduler, BackendWorker, QueryFrontend, Querier, Distributor, MetricsGenerator, BlockBuilder, LiveStore},
 	}
 
 	for mod, targets := range deps {

example/docker-compose/debug/docker-compose.yaml

@@ -1,7 +1,7 @@
 services:
   tempo:
     image: grafana/tempo-debug:latest
-    command: [ "-target=all-3.0", "-config.file=/etc/tempo.yaml" ]
+    command: [ "-target=all", "-config.file=/etc/tempo.yaml" ]
     volumes:
       - ./tempo.yaml:/etc/tempo.yaml
       - ./tempo-data:/var/tempo

example/docker-compose/multitenant/docker-compose.yaml

@@ -1,7 +1,7 @@
 services:
   tempo:
     image: grafana/tempo:latest
-    command: [ "-config.file=/etc/tempo.yaml", "-target=all-3.0"]
+    command: [ "-config.file=/etc/tempo.yaml", "-target=all"]
     volumes:
       - ./tempo.yaml:/etc/tempo.yaml
       - ./tempo-data:/var/tempo

example/docker-compose/single-binary/docker-compose.yaml

@@ -4,7 +4,7 @@ services:
     image: grafana/tempo:latest
     depends_on:
       - redpanda
-    command: "-target=all-3.0 -config.file=/etc/tempo.yaml"
+    command: "-target=all -config.file=/etc/tempo.yaml"
     restart: always
     volumes:
       - ./tempo.yaml:/etc/tempo.yaml

integration/util/services.go

@@ -19,7 +19,7 @@ const (
 )
 
 func NewTempoAllInOne(rp e2e.ReadinessProbe) *e2e.HTTPService {
-	args := []string{"-config.file=" + filepath.Join(e2e.ContainerSharedDir, tempoConfigFile), "-target=all-3.0"}
+	args := []string{"-config.file=" + filepath.Join(e2e.ContainerSharedDir, tempoConfigFile), "-target=all"}
 
 	s := e2e.NewHTTPService(
 		"tempo",