Add 'opensearch' as a supported value for SPAN_STORAGE_TYPE (#3255)

jaegertracing · Sep 10, 2021 · 17da056 · 17da056
1 parent b5d340d
commit 17da056
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/cmd/es-index-cleaner/.gitignore b/cmd/es-index-cleaner/.gitignore
@@ -0,0 +1 @@
+es-index-cleaner-*-*
diff --git a/plugin/storage/es/.gitignore b/plugin/storage/es/.gitignore
@@ -0,0 +1 @@
+esmapping-generator-*-*
diff --git a/plugin/storage/factory.go b/plugin/storage/factory.go
@@ -39,14 +39,16 @@ import (
 
 const (
 	cassandraStorageType     = "cassandra"
+	opensearchStorageType    = "opensearch"
 	elasticsearchStorageType = "elasticsearch"
 	memoryStorageType        = "memory"
 	kafkaStorageType         = "kafka"
 	grpcPluginStorageType    = "grpc-plugin"
 	badgerStorageType        = "badger"
-	downsamplingRatio        = "downsampling.ratio"
-	downsamplingHashSalt     = "downsampling.hashsalt"
-	spanStorageType          = "span-storage-type"
+
+	downsamplingRatio    = "downsampling.ratio"
+	downsamplingHashSalt = "downsampling.hashsalt"
+	spanStorageType      = "span-storage-type"
 
 	// defaultDownsamplingRatio is the default downsampling ratio.
 	defaultDownsamplingRatio = 1.0
@@ -55,7 +57,7 @@ const (
 )
 
 // AllStorageTypes defines all available storage backends
-var AllStorageTypes = []string{cassandraStorageType, elasticsearchStorageType, memoryStorageType, kafkaStorageType, badgerStorageType, grpcPluginStorageType}
+var AllStorageTypes = []string{cassandraStorageType, opensearchStorageType, elasticsearchStorageType, memoryStorageType, kafkaStorageType, badgerStorageType, grpcPluginStorageType}
 
 // Factory implements storage.Factory interface as a meta-factory for storage components.
 type Factory struct {
@@ -90,7 +92,7 @@ func (f *Factory) getFactoryOfType(factoryType string) (storage.Factory, error)
 	switch factoryType {
 	case cassandraStorageType:
 		return cassandra.NewFactory(), nil
-	case elasticsearchStorageType:
+	case elasticsearchStorageType, opensearchStorageType:
 		return es.NewFactory(), nil
 	case memoryStorageType:
 		return memory.NewFactory(), nil

diff --git a/plugin/storage/factory_config.go b/plugin/storage/factory_config.go
@@ -44,6 +44,7 @@ type FactoryConfig struct {
 // FactoryConfigFromEnvAndCLI reads the desired types of storage backends from SPAN_STORAGE_TYPE and
 // DEPENDENCY_STORAGE_TYPE environment variables. Allowed values:
 //   * `cassandra` - built-in
+//   * `opensearch` - built-in
 //   * `elasticsearch` - built-in
 //   * `memory` - built-in
 //   * `kafka` - built-in

diff --git a/plugin/storage/integration/elasticsearch_test.go b/plugin/storage/integration/elasticsearch_test.go
@@ -186,7 +186,7 @@ func healthCheck() error {
 }
 
 func testElasticsearchStorage(t *testing.T, allTagsAsFields, archive bool) {
-	if os.Getenv("STORAGE") != "elasticsearch" {
+	if os.Getenv("STORAGE") != "elasticsearch" && os.Getenv("STORAGE") != "opensearch" {
 		t.Skip("Integration test against ElasticSearch skipped; set STORAGE env var to elasticsearch to run this")
 	}
 	if err := healthCheck(); err != nil {

diff --git a/scripts/es-integration-test.sh b/scripts/es-integration-test.sh
@@ -46,14 +46,16 @@ setup_opensearch() {
 }
 
 setup_query() {
+  local distro=$1
+  local os=$(go env GOOS)
   local arch=$(go env GOARCH)
   local params=(
     --es.tls.enabled=false
     --es.version=7
     --es.server-urls=http://127.0.0.1:9200
     --query.bearer-token-propagation=true
   )
-  SPAN_STORAGE_TYPE=elasticsearch ./cmd/query/query-linux-${arch} ${params[@]}
+  SPAN_STORAGE_TYPE=${distro} ./cmd/query/query-${os}-${arch} ${params[@]}
 }
 
 teardown_es() {
@@ -68,7 +70,7 @@ teardown_query() {
 
 build_query() {
   make build-crossdock-ui-placeholder
-  GOOS=linux make build-query
+  make build-query
 }
 
 run_integration_test() {
@@ -83,16 +85,17 @@ run_integration_test() {
     echo "Unknown distribution $distro. Valid options are opensearch or elasticsearch"
     usage
   fi
-  STORAGE=elasticsearch make storage-integration-test
+  STORAGE=${distro} make storage-integration-test
   make index-cleaner-integration-test
   make index-rollover-integration-test
   teardown_es ${cid}
 }
 
 run_token_propagation_test() {
+  local distro=$1
   build_query
   make test-compile-es-scripts
-  setup_query &
+  setup_query ${distro} &
   local pid=$!
   make token-propagation-integration-test
   teardown_query ${pid}
@@ -104,7 +107,7 @@ main() {
   echo "Executing integration test for $1 $2"
   run_integration_test "$1" "$2"
   echo "Executing token propagation test"
-  run_token_propagation_test
+  run_token_propagation_test "$1"
 }
 
 main "$@"