[v2] Configure health check extension for all configs

cmd/jaeger/config-badger.yaml

@@ -1,12 +1,17 @@
 service:
-  extensions: [jaeger_storage, jaeger_query]
+  extensions: [jaeger_storage, jaeger_query, healthcheckv2]
   pipelines:
     traces:
       receivers: [otlp]
       processors: [batch]
       exporters: [jaeger_storage_exporter]
 
 extensions:
+  healthcheckv2:
+    use_v2: true
+    http:
+      endpoint: "0.0.0.0:13133"
+    grpc:
   jaeger_query:
     trace_storage: some_store
     trace_storage_archive: another_store

cmd/jaeger/config-cassandra.yaml

@@ -1,12 +1,17 @@
 service:
-  extensions: [jaeger_storage, jaeger_query]
+  extensions: [jaeger_storage, jaeger_query, healthcheckv2]
   pipelines:
     traces:
       receivers: [otlp]
       processors: [batch]
       exporters: [jaeger_storage_exporter]
 
 extensions:
+  healthcheckv2:
+    use_v2: true
+    http:
+      endpoint: "0.0.0.0:13133"
+    grpc:
   jaeger_query:
     trace_storage: some_storage
     trace_storage_archive: another_storage

cmd/jaeger/config-elasticsearch.yaml

@@ -1,12 +1,17 @@
 service:
-  extensions: [jaeger_storage, jaeger_query]
+  extensions: [jaeger_storage, jaeger_query, healthcheckv2]
   pipelines:
     traces:
       receivers: [otlp]
       processors: [batch]
       exporters: [jaeger_storage_exporter]
 
 extensions:
+  healthcheckv2:
+    use_v2: true
+    http:
+      endpoint: "0.0.0.0:13133"
+    grpc:
   jaeger_query:
     trace_storage: some_storage
     trace_storage_archive: another_storage

cmd/jaeger/collector-with-kafka.yaml → cmd/jaeger/config-kafka-collector.yaml

@@ -1,4 +1,5 @@
 service:
+  extensions: [healthcheckv2]
   pipelines:
     traces:
       receivers: [otlp, jaeger]
@@ -10,6 +11,13 @@ service:
     metrics:
       level: detailed
 
+extensions:
+  healthcheckv2:
+    use_v2: true
+    http:
+      endpoint: "0.0.0.0:14133"
+    grpc:
+
 receivers:
   otlp:
     protocols:

cmd/jaeger/ingester-remote-storage.yaml → cmd/jaeger/config-kafka-ingester.yaml

@@ -1,5 +1,5 @@
 service:
-  extensions: [jaeger_storage, jaeger_query]
+  extensions: [jaeger_storage, jaeger_query, healthcheckv2]
   pipelines:
     traces:
       receivers: [kafka]
@@ -12,6 +12,11 @@ service:
       level: debug
 
 extensions:
+  healthcheckv2:
+    use_v2: true
+    http:
+      endpoint: "localhost:13133"
+    grpc:
   jaeger_query:
     trace_storage: some_storage
 
@@ -21,7 +26,7 @@ extensions:
         memory:
           max_traces: 100000
 
-receivers:  
+receivers:
   kafka:
     brokers:
       - localhost:9092

cmd/jaeger/config-opensearch.yaml

@@ -1,12 +1,17 @@
 service:
-  extensions: [jaeger_storage, jaeger_query]
+  extensions: [jaeger_storage, jaeger_query, healthcheckv2]
   pipelines:
     traces:
       receivers: [otlp]
       processors: [batch]
       exporters: [jaeger_storage_exporter]
 
 extensions:
+  healthcheckv2:
+    use_v2: true
+    http:
+      endpoint: "0.0.0.0:13133"
+    grpc:
   jaeger_query:
     trace_storage: some_storage
     trace_storage_archive: another_storage

cmd/jaeger/config-remote-storage.yaml

@@ -1,12 +1,17 @@
 service:
-  extensions: [jaeger_storage, jaeger_query]
+  extensions: [jaeger_storage, jaeger_query, healthcheckv2]
   pipelines:
     traces:
       receivers: [otlp]
       processors: [batch]
       exporters: [jaeger_storage_exporter]
 
 extensions:
+  healthcheckv2:
+    use_v2: true
+    http:
+      endpoint: "0.0.0.0:13133"
+    grpc:
   jaeger_query:
     trace_storage: some-storage
     ui_config: ./cmd/jaeger/config-ui.json

cmd/jaeger/config.yaml

@@ -1,13 +1,17 @@
 service:
-  extensions: [jaeger_storage, jaeger_query, remote_sampling]
+  extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2]
   pipelines:
     traces:
       receivers: [otlp, jaeger, zipkin]
       processors: [batch, adaptive_sampling]
       exporters: [jaeger_storage_exporter]
 
 extensions:
-  # health_check:
+  healthcheckv2:
+    use_v2: true
+    http:
+      endpoint: "0.0.0.0:13133"
+    grpc:
   # pprof:
   #   endpoint: 0.0.0.0:1777
   # zpages:

cmd/jaeger/internal/integration/e2e_integration.go

@@ -5,6 +5,7 @@ package integration
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
@@ -109,7 +110,24 @@ func (s *E2EStorageIntegration) e2eInitialize(t *testing.T, storage string) {
 			return false
 		}
 		defer resp.Body.Close()
-		return resp.StatusCode == http.StatusOK
+		if s.HealthCheckEndpoint == "" {
+			return resp.StatusCode == http.StatusOK
+		}
+
+		var healthResponse struct {
+			Status string `json:"status"`
+		}
+		if err := json.NewDecoder(resp.Body).Decode(&healthResponse); err != nil {
+			t.Logf("Failed to decode JSON response: %v", err)
+			return false
+		}
+
+		// Check if the status field in the JSON is "StatusOK"
+		if healthResponse.Status != "StatusOK" {
+			t.Logf("Received non-StatusOK status: %s", healthResponse.Status)
+			return false
+		}
+		return true
 	}, 60*time.Second, 3*time.Second, "Jaeger-v2 did not start")
 	t.Log("Jaeger-v2 is ready")
 	t.Cleanup(func() {

cmd/jaeger/internal/integration/kafka_test.go

@@ -97,19 +97,20 @@ func TestKafkaStorage(t *testing.T) {
 
 			collector := &E2EStorageIntegration{
 				SkipStorageCleaner:  true,
-				ConfigFile:          createConfigWithEncoding(t, "../../collector-with-kafka.yaml", test.encoding, uniqueTopic),
-				HealthCheckEndpoint: "http://localhost:8888/metrics",
+				ConfigFile:          createConfigWithEncoding(t, "../../config-kafka-collector.yaml", test.encoding, uniqueTopic),
+				HealthCheckEndpoint: "http://localhost:13133/status",
 			}
 			collector.e2eInitialize(t, "kafka")
 			t.Log("Collector initialized")
 
 			ingester := &E2EStorageIntegration{
-				ConfigFile: createConfigWithEncoding(t, "../../ingester-remote-storage.yaml", test.encoding, uniqueTopic),
+				ConfigFile: createConfigWithEncoding(t, "../../config-kafka-ingester.yaml", test.encoding, uniqueTopic),
 				StorageIntegration: integration.StorageIntegration{
 					CleanUp:                      purge,
 					GetDependenciesReturnsSource: true,
 					SkipArchiveTest:              true,
 				},
+				HealthCheckEndpoint: "http://localhost:14133/status",
 			}
 			ingester.e2eInitialize(t, "kafka")
 			t.Log("Ingester initialized")