Add e2e integration test for Query Service (jaegertracing#6966)

## Which problem is this PR solving?
- part of jaegertracing#6683

## Description of the changes

- Add new e2e integration tests to exercise jaeger-query.yaml
configuration
   - Add configure e2e pipeline

## How was this change tested?
- `STORAGE=query SPAN_STORAGE_TYPE=memory make
jaeger-v2-storage-integration-test ` command runs successfully locally

## 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`: `npm run lint` and `npm run test`

---------

Signed-off-by: pipiland <[email protected]>
Signed-off-by: pipiland <[email protected]>
Co-authored-by: Yuri Shkuro <[email protected]>
Signed-off-by: amol-verma-allen <[email protected]>

Author: 2 people

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

@@ -0,0 +1,37 @@
+name: CIT Query
+
+on:
+  workflow_call:
+
+concurrency:
+  group: cit-query-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
+  cancel-in-progress: true
+
+# See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
+permissions:  # added using https://github.com/step-security/secure-workflows
+  contents: read
+
+jobs:
+  query:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Harden Runner
+      uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+      with:
+        egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        
+    - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
+      with:
+        go-version: 1.24.x
+
+    - name: Run Memory storage integration tests
+      run: |
+        STORAGE=query SPAN_STORAGE_TYPE=memory make jaeger-v2-storage-integration-test
+
+    - name: Upload coverage to codecov
+      uses: ./.github/actions/upload-codecov
+      with:
+        files: cover.out
+        flags: query

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.yaml

@@ -32,7 +32,10 @@ extensions:
       traces_archive: another-storage
     ui:
       config_file: ./cmd/jaeger/config-ui.json
-
+    grpc:
+      endpoint: "${env:JAEGER_QUERY_GRPC_ENDPOINT:-localhost:16685}"
+    http:
+      endpoint: "${env:JAEGER_QUERY_HTTP_ENDPOINT:-localhost:16686}"
   jaeger_storage:
     backends:
       some-storage:

cmd/jaeger/internal/integration/e2e_integration.go

@@ -42,7 +42,9 @@ type E2EStorageIntegration struct {
 	SkipStorageCleaner bool
 	ConfigFile         string
 	BinaryName         string
-	HealthCheckPort    int // overridable for Kafka tests which run two binaries and need different ports
+
+	MetricsPort     int // overridable, default to 8888
+	HealthCheckPort int // overridable for tests (e.g. Kafka, query) which run two binaries and need different ports
 
 	// EnvVarOverrides contains a map of environment variables to set.
 	// The key in the map is the environment variable to override and the value
@@ -99,14 +101,20 @@ func (s *E2EStorageIntegration) e2eInitialize(t *testing.T, storage string) {
 	require.NoError(t, err)
 
 	t.Cleanup(func() {
-		scrapeMetrics(t, storage)
+		s.scrapeMetrics(t, storage)
 		require.NoError(t, s.TraceReader.(io.Closer).Close())
 		require.NoError(t, s.TraceWriter.(io.Closer).Close())
 	})
 }
 
-func scrapeMetrics(t *testing.T, storage string) {
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, "http://localhost:8888/metrics", nil)
+func (s *E2EStorageIntegration) scrapeMetrics(t *testing.T, storage string) {
+	metricsPort := 8888
+	if s.MetricsPort != 0 {
+		metricsPort = s.MetricsPort
+	}
+	metricsUrl := fmt.Sprintf("http://localhost:%d/metrics", metricsPort)
+
+	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, metricsUrl, nil)
 	require.NoError(t, err)
 
 	client := &http.Client{}

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,11 +42,8 @@ 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)
-		s.archiveRemoteStorage.Close(t)
-	})
+	t.Cleanup(func() { s.closeRemoteStorages(t) })
 	s.RunSpanStoreTests(t)
 }

cmd/jaeger/internal/integration/query_test.go

@@ -0,0 +1,47 @@
+// Copyright (c) 2025 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package integration
+
+import (
+	"testing"
+
+	"github.com/jaegertracing/jaeger/internal/storage/integration"
+)
+
+func TestJaegerQueryService(t *testing.T) {
+	integration.SkipUnlessEnv(t, "query")
+
+	// Start instance of Jaeger with jaeger_query reading from Remote Storage, which
+	// will be started in GRPCStorageIntegration below
+	query := &E2EStorageIntegration{
+		ConfigFile:         "../../config-query.yaml",
+		SkipStorageCleaner: true,
+		// referencing values in config-query.yaml
+		HealthCheckPort: 12133,
+		MetricsPort:     8887,
+	}
+	query.e2eInitialize(t, "grpc")
+	t.Log("Query initialized")
+
+	// Start another instance of Jaeger receiving traces and write traces to Remote Storage
+	collector := &GRPCStorageIntegration{
+		E2EStorageIntegration: E2EStorageIntegration{
+			ConfigFile:         "../../config-remote-storage.yaml",
+			SkipStorageCleaner: true,
+			EnvVarOverrides: map[string]string{
+				// Run jaeger_query on different ports here to avoid conflict
+				// with jaeger_query instance of Jaeger above
+				"JAEGER_QUERY_GRPC_ENDPOINT": "localhost:0",
+				"JAEGER_QUERY_HTTP_ENDPOINT": "localhost:0",
+			},
+		},
+	}
+	collector.CleanUp = collector.cleanUp
+	collector.initializeRemoteStorages(t)
+	collector.e2eInitialize(t, "grpc")
+	t.Cleanup(func() { collector.closeRemoteStorages(t) })
+	t.Log("Collector initialized")
+
+	collector.RunSpanStoreTests(t)
+}