From 847b26056b267e08ff8194a973e3eef7981b55b3 Mon Sep 17 00:00:00 2001
From: Sachin Maurya <57769917+slayer321@users.noreply.github.com>
Date: Sat, 30 Sep 2023 01:08:47 +0530
Subject: [PATCH] [tests] Fix failing e2e test  for Cassandra storage (#4776)

## Which problem is this PR solving?

Resolves #4782
## Description of the changes
- Recently a [PR](https://github.com/jaegertracing/jaeger/pull/4773) was
raised to run all integration tests against Cassandra while checking
it's [CI for
cassandra](https://github.com/jaegertracing/jaeger/actions/runs/6287799686/job/17072619668)
I found that the some test where failing but CI passed.
- Fixed the script so that if the test fail we get exit code as
non-zero.
- Fixed `TestCassandraStorage/GetLargeSpans` test which was failing due
to older traces not getting cleanup from db.

## How was this change tested?
- run the cassandra script to test it.

## Checklist
- [x] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [x] I have added unit tests for the new functionality
- [x] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: slayer321 <sachin.maurya7666@gmail.com>
---
 plugin/storage/cassandra/factory.go          |  5 +++++
 plugin/storage/integration/cassandra_test.go | 18 ++++++++++++++++--
 plugin/storage/integration/integration.go    |  3 ++-
 scripts/cassandra-integration-test.sh        |  2 +-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/plugin/storage/cassandra/factory.go b/plugin/storage/cassandra/factory.go
index f41ff4080b7..d8e8676dc9b 100644
--- a/plugin/storage/cassandra/factory.go
+++ b/plugin/storage/cassandra/factory.go
@@ -217,3 +217,8 @@ func (f *Factory) Close() error {
 	}
 	return f.Options.GetPrimary().TLS.Close()
 }
+
+// PrimarySession is used from integration tests to clean database between tests
+func (f *Factory) PrimarySession() cassandra.Session {
+	return f.primarySession
+}
diff --git a/plugin/storage/integration/cassandra_test.go b/plugin/storage/integration/cassandra_test.go
index 9e8f20efe12..83a8ee8182f 100644
--- a/plugin/storage/integration/cassandra_test.go
+++ b/plugin/storage/integration/cassandra_test.go
@@ -24,6 +24,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 
+	dbsession "github.com/jaegertracing/jaeger/pkg/cassandra"
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
@@ -44,12 +45,22 @@ func newCassandraStorageIntegration() *CassandraStorageIntegration {
 		StorageIntegration: StorageIntegration{
 			GetDependenciesReturnsSource: true,
 
-			Refresh: func() error { return nil },
-			CleanUp: func() error { return nil },
+			Refresh:  func() error { return nil },
+			CleanUp:  func() error { return nil },
+			SkipList: []string{"Tags_+_Operation_name_+_Duration_range", "Tags_+_Duration_range", "Tags_+_Operation_name_+_max_Duration", "Tags_+_max_Duration", "Operation_name_+_Duration_range", "Duration_range", "max_Duration"},
 		},
 	}
 }
 
+func (s *CassandraStorageIntegration) cleanUp(q dbsession.Session) (func() error, error) {
+	return func() error {
+		if err := q.Query("TRUNCATE traces").Exec(); err != nil {
+			return err
+		}
+		return nil
+	}, nil
+}
+
 func (s *CassandraStorageIntegration) initializeCassandraFactory(flags []string) (*cassandra.Factory, error) {
 	s.logger, _ = testutils.NewLogger()
 	f := cassandra.NewFactory()
@@ -77,6 +88,9 @@ func (s *CassandraStorageIntegration) initializeCassandra() error {
 	if s.SpanReader, err = f.CreateSpanReader(); err != nil {
 		return err
 	}
+	if s.CleanUp, err = s.cleanUp(f.PrimarySession()); err != nil {
+		return err
+	}
 	if err = s.initializeDependencyReaderAndWriter(f); err != nil {
 		return err
 	}
diff --git a/plugin/storage/integration/integration.go b/plugin/storage/integration/integration.go
index d1f154386d1..f3ba7aad3a4 100644
--- a/plugin/storage/integration/integration.go
+++ b/plugin/storage/integration/integration.go
@@ -96,7 +96,8 @@ func (s *StorageIntegration) refresh(t *testing.T) {
 
 func (s *StorageIntegration) skipIfNeeded(t *testing.T) {
 	for _, pat := range s.SkipList {
-		ok, err := regexp.MatchString(pat, t.Name())
+		escapedPat := regexp.QuoteMeta(pat)
+		ok, err := regexp.MatchString(escapedPat, t.Name())
 		assert.NoError(t, err)
 		if ok {
 			t.Skip()
diff --git a/scripts/cassandra-integration-test.sh b/scripts/cassandra-integration-test.sh
index 0922f83f4dc..c0e55032c06 100755
--- a/scripts/cassandra-integration-test.sh
+++ b/scripts/cassandra-integration-test.sh
@@ -55,7 +55,7 @@ run_integration_test() {
   apply_schema "$2"
   STORAGE=cassandra make storage-integration-test
   exit_status=$?
-  trap 'teardown_cassandra ${cid}' EXIT
+  trap "teardown_cassandra ${cid}" EXIT
 }
 
 main() {