Merge branch 'main' into dep-cli-flags

Signed-off-by: Harshith Mente <109957201+joeyyy09@users.noreply.github.com>

.github/workflows/ci-elasticsearch.yml

@@ -21,12 +21,6 @@ jobs:
     strategy:
       matrix:
         version:
-        - major: 5.x
-          image: 5.6.16
-          distribution: elasticsearch
-        - major: 6.x
-          image: 6.8.18
-          distribution: elasticsearch
         - major: 7.x
           image: 7.14.0
           distribution: elasticsearch

.github/workflows/dependency-review.yml

@@ -24,4 +24,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@5bbc3ba658137598168acb2ab73b21c432dd411b # v4.2.5
+        uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # v4.3.2

.gitignore

@@ -17,7 +17,6 @@ cover.html
 vendor/
 examples/hotrod/hotrod
 examples/hotrod/hotrod-*
-examples/memstore-plugin/memstore-plugin
 cmd/all-in-one/all-in-one-*
 cmd/agent/agent
 cmd/agent/agent-*

Makefile

@@ -139,7 +139,6 @@ badger-storage-integration-test:
 
 .PHONY: grpc-storage-integration-test
 grpc-storage-integration-test:
-	(cd examples/memstore-plugin/ && go build .)
 	STORAGE=grpc $(MAKE) storage-integration-test
 
 # this test assumes STORAGE environment variable is set to elasticsearch|opensearch

cmd/jaeger/internal/integration/badger_test.go

@@ -15,7 +15,6 @@ func TestBadgerStorage(t *testing.T) {
 	s := &E2EStorageIntegration{
 		ConfigFile: "../../config-badger.yaml",
 		StorageIntegration: integration.StorageIntegration{
-			SkipBinaryAttrs: true,
 			SkipArchiveTest: true,
 			CleanUp:         purge,
 

cmd/jaeger/internal/integration/cassandra_test.go

@@ -17,7 +17,6 @@ func TestCassandraStorage(t *testing.T) {
 			CleanUp:                      purge,
 			GetDependenciesReturnsSource: true,
 			SkipArchiveTest:              true,
-			SkipBinaryAttrs:              true,
 
 			SkipList: integration.CassandraSkippedTests,
 		},

cmd/jaeger/internal/integration/es_test.go

@@ -17,7 +17,6 @@ func TestESStorage(t *testing.T) {
 		StorageIntegration: integration.StorageIntegration{
 			CleanUp:                      purge,
 			Fixtures:                     integration.LoadAndParseQueryTestCases(t, "fixtures/queries_es.json"),
-			SkipBinaryAttrs:              true,
 			GetOperationsMissingSpanKind: true,
 		},
 	}

cmd/jaeger/internal/integration/grpc_test.go

@@ -30,9 +30,6 @@ func TestGRPCStorage(t *testing.T) {
 	s := &GRPCStorageIntegration{
 		E2EStorageIntegration: E2EStorageIntegration{
 			ConfigFile: "../../config-remote-storage.yaml",
-			StorageIntegration: integration.StorageIntegration{
-				SkipBinaryAttrs: true,
-			},
 		},
 	}
 	s.CleanUp = s.cleanUp

cmd/jaeger/internal/integration/os_test.go

@@ -16,7 +16,6 @@ func TestOSStorage(t *testing.T) {
 		StorageIntegration: integration.StorageIntegration{
 			CleanUp:                      purge,
 			Fixtures:                     integration.LoadAndParseQueryTestCases(t, "fixtures/queries_es.json"),
-			SkipBinaryAttrs:              true,
 			GetOperationsMissingSpanKind: true,
 		},
 	}

crossdock/jaeger-docker-compose.yml

@@ -22,7 +22,7 @@ services:
         - "14250"
         - "9411:9411"
       environment:
-        - SPAN_STORAGE_TYPE=grpc-plugin
+        - SPAN_STORAGE_TYPE=grpc
         - LOG_LEVEL=debug
       restart: on-failure
       depends_on:
@@ -37,7 +37,7 @@ services:
         - "16686:16686"
         - "16687"
       environment:
-        - SPAN_STORAGE_TYPE=grpc-plugin
+        - SPAN_STORAGE_TYPE=grpc
       restart: on-failure
       depends_on:
         - jaeger-remote-storage

docker-compose/kafka/docker-compose.yml

@@ -72,7 +72,7 @@ services:
       - "--grpc-storage.server=jaeger-remote-storage:17271"
       - "--log-level=debug"
     environment:
-      - SPAN_STORAGE_TYPE=grpc-plugin
+      - SPAN_STORAGE_TYPE=grpc
       - KAFKA_CONSUMER_BROKERS=kafka:9092
     healthcheck:
       test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:14270/ || exit 1"]
@@ -117,7 +117,7 @@ services:
       - "--grpc-storage.server=jaeger-remote-storage:17271"
       - "--log-level=debug"
     environment:
-      - SPAN_STORAGE_TYPE=grpc-plugin
+      - SPAN_STORAGE_TYPE=grpc
       - JAEGER_AGENT_HOST=jaeger-agent
     ports:
       - "16686:16686"

go.mod

@@ -220,7 +220,7 @@ require (
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.23.0 // indirect
-	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
+  golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
 	golang.org/x/text v0.15.0 // indirect
 	gonum.org/v1/gonum v0.15.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect

plugin/storage/factory.go

@@ -44,7 +44,8 @@ const (
 	elasticsearchStorageType = "elasticsearch"
 	memoryStorageType        = "memory"
 	kafkaStorageType         = "kafka"
-	grpcPluginStorageType    = "grpc-plugin"
+	grpcStorageType          = "grpc"
+	grpcPluginDeprecated     = "grpc-plugin"
 	badgerStorageType        = "badger"
 	blackholeStorageType     = "blackhole"
 
@@ -67,7 +68,7 @@ var AllStorageTypes = []string{
 	kafkaStorageType,
 	badgerStorageType,
 	blackholeStorageType,
-	grpcPluginStorageType,
+	grpcStorageType,
 }
 
 // AllSamplingStorageTypes returns all storage backends that implement adaptive sampling
@@ -135,7 +136,7 @@ func (f *Factory) getFactoryOfType(factoryType string) (storage.Factory, error)
 		return kafka.NewFactory(), nil
 	case badgerStorageType:
 		return badger.NewFactory(), nil
-	case grpcPluginStorageType:
+	case grpcStorageType:
 		return grpc.NewFactory(), nil
 	case blackholeStorageType:
 		return blackhole.NewFactory(), nil

plugin/storage/factory_config.go

@@ -53,7 +53,7 @@ type FactoryConfig struct {
 // * `memory` - built-in
 // * `kafka` - built-in
 // * `blackhole` - built-in
-// * `plugin` - loads a dynamic plugin that implements storage.Factory interface (not supported at the moment)
+// * `grpc` - build-in
 //
 // For backwards compatibility it also parses the args looking for deprecated --span-storage.type flag.
 // If found, it writes a deprecation warning to the log.
@@ -66,6 +66,13 @@ func FactoryConfigFromEnvAndCLI(args []string, log io.Writer) FactoryConfig {
 	if spanStorageType == "" {
 		spanStorageType = cassandraStorageType
 	}
+	if spanStorageType == grpcPluginDeprecated {
+		fmt.Fprintf(log,
+			"WARNING: `%s` storage type is deprecated and will be remove from v1.60. Use `%s`.\n\n",
+			grpcPluginDeprecated, grpcStorageType,
+		)
+		spanStorageType = grpcStorageType
+	}
 	spanWriterTypes := strings.Split(spanStorageType, ",")
 	if len(spanWriterTypes) > 1 {
 		fmt.Fprintf(log,