Improve query e2e-integration test based on review

Signed-off-by: pipiland <[email protected]>

Author: pipiland2612

.github/workflows/ci-e2e-query.yaml

@@ -28,7 +28,7 @@ jobs:
 
     - name: Run Memory storage integration tests
       run: |
-        STORAGE=query make jaeger-v2-storage-integration-test
+        STORAGE=query SPAN_STORAGE_TYPE=memory make jaeger-v2-storage-integration-test
 
     - name: Upload coverage to codecov
       uses: ./.github/actions/upload-codecov

cmd/jaeger/config-query.yaml

@@ -36,8 +36,10 @@ extensions:
   jaeger_storage:
     backends:
       query_storage:
-        memory:
-          max_traces: 100000
+        grpc:
+          endpoint: localhost:17271
+          tls:
+            insecure: true
 
 receivers:
   nop:

cmd/jaeger/config-remote-storage-without-query.yaml

@@ -0,0 +1,46 @@
+service:
+  extensions: [jaeger_storage, healthcheckv2]
+  pipelines:
+    traces:
+      receivers: [otlp]
+      processors: [batch]
+      exporters: [jaeger_storage_exporter]
+  telemetry:
+    resource:
+      service.name: jaeger
+    metrics:
+      level: detailed
+      readers:
+        - pull:
+            exporter:
+              prometheus:
+                host: 0.0.0.0
+                port: 8888
+    logs:
+      level: info
+
+extensions:
+  healthcheckv2:
+    use_v2: true
+    http:
+
+  jaeger_storage:
+    backends:
+      some-storage:
+        grpc:
+          endpoint: localhost:17271
+          tls:
+            insecure: true
+
+receivers:
+  otlp:
+    protocols:
+      grpc:
+      http:
+
+processors:
+  batch:
+
+exporters:
+  jaeger_storage_exporter:
+    trace_storage: some-storage

cmd/jaeger/internal/integration/grpc_test.go

@@ -17,15 +17,19 @@ type GRPCStorageIntegration struct {
 	archiveRemoteStorage *integration.RemoteMemoryStorage
 }
 
-func (s *GRPCStorageIntegration) initialize(t *testing.T) {
+func (s *GRPCStorageIntegration) initializeRemoteStorages(t *testing.T) {
 	s.remoteStorage = integration.StartNewRemoteMemoryStorage(t, ports.RemoteStorageGRPC)
 	s.archiveRemoteStorage = integration.StartNewRemoteMemoryStorage(t, ports.RemoteStorageGRPC+1)
 }
 
-func (s *GRPCStorageIntegration) cleanUp(t *testing.T) {
+func (s *GRPCStorageIntegration) closeRemoteStorages(t *testing.T) {
 	s.remoteStorage.Close(t)
 	s.archiveRemoteStorage.Close(t)
-	s.initialize(t)
+}
+
+func (s *GRPCStorageIntegration) cleanUp(t *testing.T) {
+	s.closeRemoteStorages(t)
+	s.initializeRemoteStorages(t)
 }
 
 func TestGRPCStorage(t *testing.T) {
@@ -38,7 +42,7 @@ func TestGRPCStorage(t *testing.T) {
 		},
 	}
 	s.CleanUp = s.cleanUp
-	s.initialize(t)
+	s.initializeRemoteStorages(t)
 	s.e2eInitialize(t, "grpc")
 	t.Cleanup(func() {
 		s.remoteStorage.Close(t)

cmd/jaeger/internal/integration/query_test.go

@@ -4,62 +4,40 @@
 package integration
 
 import (
-	"context"
 	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"go.opentelemetry.io/collector/pdata/pcommon"
-	"go.opentelemetry.io/collector/pdata/ptrace"
 
 	"github.com/jaegertracing/jaeger/internal/storage/integration"
-	"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
-	"github.com/jaegertracing/jaeger/internal/storage/v2/v1adapter"
 )
 
 func TestJaegerQueryService(t *testing.T) {
 	integration.SkipUnlessEnv(t, "query")
-	s := &E2EStorageIntegration{
-		ConfigFile: "../../config-query.yaml",
-		StorageIntegration: integration.StorageIntegration{
-			CleanUp: func(_ *testing.T) {}, // nothing to clean
-		},
-		HealthCheckPort:    12133, // referencing value in config-query.yaml
-		MetricsPort:        8887,
+
+	// Start instance of Jaeger with jaeger_query reading from remote storage
+	query := &E2EStorageIntegration{
+		ConfigFile:         "../../config-query.yaml",
 		SkipStorageCleaner: true,
+		// referencing values in config-query.yaml
+		HealthCheckPort: 12133,
+		MetricsPort:     8887,
 	}
-	s.e2eInitialize(t, "memory")
-
-	runTraceReaderSmokeTests(context.Background(), s.TraceReader, t)
-}
-
-// RunTraceReaderSmokeTests runs tests on TraceReader to see it returns no error
-func runTraceReaderSmokeTests(ctx context.Context, traceReader tracestore.Reader, t *testing.T) {
-	t.Run("TraceReader.GetTraces", func(t *testing.T) {
-		iterTraces := traceReader.GetTraces(ctx)
-		_, err := v1adapter.V1TracesFromSeq2(iterTraces)
-		assert.NoError(t, err)
-	})
-
-	t.Run("TraceReader.GetServices", func(t *testing.T) {
-		_, err := traceReader.GetServices(ctx)
-		assert.NoError(t, err)
-	})
-
-	t.Run("TraceReader.GetOperations", func(t *testing.T) {
-		_, err := traceReader.GetOperations(ctx, tracestore.OperationQueryParams{ServiceName: "random-service-name"})
-		assert.NoError(t, err)
+	query.e2eInitialize(t, "grpc")
+	t.Log("Query initialized")
+
+	// Start another instance of Jaeger receiving traces from OTLP and write traces to remote storage
+	collector := &GRPCStorageIntegration{
+		E2EStorageIntegration: E2EStorageIntegration{
+			ConfigFile:         "../../config-remote-storage-without-query.yaml",
+			SkipStorageCleaner: true,
+		},
+	}
+	collector.CleanUp = collector.cleanUp
+	collector.initializeRemoteStorages(t)
+	collector.e2eInitialize(t, "grpc")
+	t.Cleanup(func() {
+		collector.remoteStorage.Close(t)
+		collector.archiveRemoteStorage.Close(t)
 	})
+	t.Log("Collector initialized")
 
-	t.Run("TraceReader.FindTraces", func(t *testing.T) {
-		iter := traceReader.FindTraces(ctx, tracestore.TraceQueryParams{
-			ServiceName:  "random-service-name",
-			Attributes:   pcommon.NewMap(),
-			StartTimeMin: time.Now().Add(-2 * time.Hour),
-			StartTimeMax: time.Now(),
-		})
-		iter(func(_ []ptrace.Traces, err error) bool {
-			return assert.NoError(t, err)
-		})
-	})
+	collector.RunSpanStoreTests(t)
 }