Merge branch 'main' into tag-filter

Author: Manik2708

.github/workflows/ci-unit-tests-go-tip.yml

@@ -26,15 +26,6 @@ jobs:
 
     - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
-    - name: Set up stable Go for tools
-      uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
-      with:
-        go-version: 1.25.x
-
-    - name: Install test deps
-      # even though the same target runs from test-ci, running it separately makes for cleaner log in GH workflow
-      run: make install-test-tools
-
     - name: Install Go Tip
       uses: ./.github/actions/setup-go-tip
       with:
@@ -48,5 +39,4 @@ jobs:
     - name: Run unit tests
       run: make test-ci
 
-    - name: Lint
-      run: echo skip linting on Go tip
+

.mockery.yaml

@@ -6,12 +6,6 @@ filename: mocks.go
 template-data:
   boilerplate-file: .mockery.header.txt
 packages:
-  github.com/jaegertracing/jaeger/cmd/ingester/app/consumer:
-    interfaces:
-      Message: {}
-  github.com/jaegertracing/jaeger/cmd/ingester/app/processor:
-    interfaces:
-      SpanProcessor: {}
   github.com/jaegertracing/jaeger/crossdock/services:
     interfaces:
       CollectorService: {}
@@ -39,9 +33,6 @@ packages:
   github.com/jaegertracing/jaeger/internal/storage/elasticsearch/client:
     config:
       all: true
-  github.com/jaegertracing/jaeger/internal/storage/kafka/consumer:
-    interfaces:
-      Consumer: {}
   github.com/jaegertracing/jaeger/internal/storage/v1:
     config:
       all: true
@@ -67,10 +58,6 @@ packages:
   github.com/jaegertracing/jaeger/internal/storage/v1/grpc/shared:
     interfaces:
       PluginCapabilities: {}
-  github.com/jaegertracing/jaeger/internal/storage/v1/kafka:
-    interfaces:
-      Marshaller: {}
-      Unmarshaller: {}
   github.com/jaegertracing/jaeger/internal/storage/v2/api/depstore:
     config:
       all: true

Makefile

@@ -40,6 +40,7 @@ ALL_SRC = $(shell find . -name '*.go' \
 # All .sh or .py or Makefile or .mk files that should be auto-formatted and linted.
 SCRIPTS_SRC = $(shell find . \( -name '*.sh' -o -name '*.py' -o -name '*.mk' -o -name 'Makefile*' -o -name 'Dockerfile*' \) \
 						-not -path './.git/*' \
+						-not -path './vendor/*' \
 						-not -path './idl/*' \
 						-not -path './jaeger-ui/*' \
 						-type f | \

cmd/internal/env/command.go

@@ -16,10 +16,9 @@ import (
 )
 
 const (
-	spanStorageType = "span-storage.type" // deprecated
-	logLevel        = "log-level"
-	logEncoding     = "log-encoding" // json or console
-	configFile      = "config-file"
+	logLevel    = "log-level"
+	logEncoding = "log-encoding" // json or console
+	configFile  = "config-file"
 )
 
 // AddConfigFileFlag adds flags for ExternalConfFlags
@@ -92,12 +91,6 @@ type logging struct {
 	Encoding string
 }
 
-// AddFlags adds flags for SharedFlags
-func AddFlags(flagSet *flag.FlagSet) {
-	flagSet.String(spanStorageType, "", "(deprecated) please use SPAN_STORAGE_TYPE environment variable. Run this binary with the 'env' command for help.")
-	AddLoggingFlags(flagSet)
-}
-
 // AddLoggingFlag adds logging flag for SharedFlags
 func AddLoggingFlags(flagSet *flag.FlagSet) {
 	flagSet.String(logLevel, "info", "Minimal allowed log Level. For more levels see https://github.com/uber-go/zap")

cmd/internal/env/command_test.go

@@ -28,9 +28,6 @@ type Service struct {
 	// AdminPort is the HTTP port number for admin server.
 	AdminPort int
 
-	// NoStorage indicates that storage-type CLI flag is not applicable
-	NoStorage bool
-
 	// Admin is the admin server that hosts the health check and metrics endpoints.
 	Admin *AdminServer
 
@@ -43,29 +40,6 @@ type Service struct {
 	signalsChannel chan os.Signal
 }
 
-func PrintV1EOL() {
-	fmt.Fprintln(os.Stderr, (`
-*******************************************************************************
-
-🛑  WARNING: End-of-life Notice for Jaeger v1
-
-You are currently running a v1 version of Jaeger, which is deprecated and will
-reach end-of-life on December 31st, 2025. This means there will be no further
-development, bug fixes, or security patches for v1 after this date.
-
-We strongly recommend migrating to Jaeger v2 for continued support and access
-to new features.
-
-For detailed migration instructions, please refer to the official Jaeger
-documentation:  https://www.jaegertracing.io/docs/latest/migration/
-
-Tracking issue: https://github.com/jaegertracing/jaeger/issues/6321
-
-🛑  WARNING: End-of-life Notice for Jaeger v1
-
-*******************************************************************************`))
-}
-
 // NewService creates a new Service.
 func NewService(adminPort int) *Service {
 	signalsChannel := make(chan os.Signal, 1)
@@ -80,11 +54,7 @@ func NewService(adminPort int) *Service {
 // AddFlags registers CLI flags.
 func (s *Service) AddFlags(flagSet *flag.FlagSet) {
 	AddConfigFileFlag(flagSet)
-	if s.NoStorage {
-		AddLoggingFlags(flagSet)
-	} else {
-		AddFlags(flagSet)
-	}
+	AddLoggingFlags(flagSet)
 	metricsbuilder.AddFlags(flagSet)
 	s.Admin.AddFlags(flagSet)
 	featuregate.GlobalRegistry().RegisterFlags(flagSet)

cmd/internal/flags/flags.go

@@ -21,9 +21,6 @@ import (
 func TestAddFlags(*testing.T) {
 	s := NewService(0)
 	s.AddFlags(new(flag.FlagSet))
-
-	s.NoStorage = true
-	s.AddFlags(new(flag.FlagSet))
 }
 
 func TestStartErrors(t *testing.T) {

cmd/internal/flags/service.go

@@ -0,0 +1,134 @@
+// Copyright (c) 2025 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package storageconfig
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"time"
+
+	"go.opentelemetry.io/collector/confmap"
+
+	"github.com/jaegertracing/jaeger/internal/config/promcfg"
+	cascfg "github.com/jaegertracing/jaeger/internal/storage/cassandra/config"
+	escfg "github.com/jaegertracing/jaeger/internal/storage/elasticsearch/config"
+	"github.com/jaegertracing/jaeger/internal/storage/metricstore/prometheus"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/badger"
+	"github.com/jaegertracing/jaeger/internal/storage/v1/cassandra"
+	es "github.com/jaegertracing/jaeger/internal/storage/v1/elasticsearch"
+	"github.com/jaegertracing/jaeger/internal/storage/v2/clickhouse"
+	"github.com/jaegertracing/jaeger/internal/storage/v2/grpc"
+	"github.com/jaegertracing/jaeger/internal/storage/v2/memory"
+)
+
+var (
+	_ confmap.Unmarshaler = (*TraceBackend)(nil)
+	_ confmap.Unmarshaler = (*MetricBackend)(nil)
+)
+
+// Config contains configuration(s) for Jaeger trace storage.
+type Config struct {
+	TraceBackends  map[string]TraceBackend  `mapstructure:"backends"`
+	MetricBackends map[string]MetricBackend `mapstructure:"metric_backends"`
+}
+
+// TraceBackend contains configuration for a single trace storage backend.
+type TraceBackend struct {
+	Memory        *memory.Configuration     `mapstructure:"memory"`
+	Badger        *badger.Config            `mapstructure:"badger"`
+	GRPC          *grpc.Config              `mapstructure:"grpc"`
+	Cassandra     *cassandra.Options        `mapstructure:"cassandra"`
+	Elasticsearch *escfg.Configuration      `mapstructure:"elasticsearch"`
+	Opensearch    *escfg.Configuration      `mapstructure:"opensearch"`
+	ClickHouse    *clickhouse.Configuration `mapstructure:"clickhouse"`
+}
+
+// MetricBackend contains configuration for a single metric storage backend.
+type MetricBackend struct {
+	Prometheus    *PrometheusConfiguration `mapstructure:"prometheus"`
+	Elasticsearch *escfg.Configuration     `mapstructure:"elasticsearch"`
+	Opensearch    *escfg.Configuration     `mapstructure:"opensearch"`
+}
+
+type PrometheusConfiguration struct {
+	Configuration  promcfg.Configuration `mapstructure:",squash"`
+	Authentication escfg.Authentication  `mapstructure:"auth"`
+}
+
+// Unmarshal implements confmap.Unmarshaler. This allows us to provide
+// defaults for different configs.
+func (cfg *TraceBackend) Unmarshal(conf *confmap.Conf) error {
+	// apply defaults
+	if conf.IsSet("memory") {
+		cfg.Memory = &memory.Configuration{
+			MaxTraces: 1_000_000,
+		}
+	}
+	if conf.IsSet("badger") {
+		v := badger.DefaultConfig()
+		cfg.Badger = v
+	}
+	if conf.IsSet("grpc") {
+		v := grpc.DefaultConfig()
+		cfg.GRPC = &v
+	}
+	if conf.IsSet("cassandra") {
+		cfg.Cassandra = &cassandra.Options{
+			NamespaceConfig: cassandra.NamespaceConfig{
+				Configuration: cascfg.DefaultConfiguration(),
+				Enabled:       true,
+			},
+			SpanStoreWriteCacheTTL: 12 * time.Hour,
+			Index: cassandra.IndexConfig{
+				Tags:        true,
+				ProcessTags: true,
+				Logs:        true,
+			},
+		}
+	}
+	if conf.IsSet("elasticsearch") {
+		v := es.DefaultConfig()
+		cfg.Elasticsearch = &v
+	}
+	if conf.IsSet("opensearch") {
+		v := es.DefaultConfig()
+		cfg.Opensearch = &v
+	}
+	return conf.Unmarshal(cfg)
+}
+
+// Unmarshal implements confmap.Unmarshaler for MetricBackend.
+func (cfg *MetricBackend) Unmarshal(conf *confmap.Conf) error {
+	// apply defaults
+	if conf.IsSet("prometheus") {
+		v := prometheus.DefaultConfig()
+		cfg.Prometheus = &PrometheusConfiguration{
+			Configuration: v,
+		}
+	}
+	if conf.IsSet("elasticsearch") {
+		v := es.DefaultConfig()
+		cfg.Elasticsearch = &v
+	}
+	if conf.IsSet("opensearch") {
+		v := es.DefaultConfig()
+		cfg.Opensearch = &v
+	}
+	return conf.Unmarshal(cfg)
+}
+
+// Validate validates the storage configuration.
+func (c *Config) Validate() error {
+	if len(c.TraceBackends) == 0 {
+		return errors.New("at least one storage backend is required")
+	}
+	for name, b := range c.TraceBackends {
+		empty := TraceBackend{}
+		if reflect.DeepEqual(b, empty) {
+			return fmt.Errorf("empty backend configuration for storage '%s'", name)
+		}
+	}
+	return nil
+}