test: update e2e services

Signed-off-by: Simon Pasquier <[email protected]>

Author: simonpasquier

go.mod

@@ -7,8 +7,8 @@ toolchain go1.23.9
 require (
 	github.com/brancz/kube-rbac-proxy v0.19.0
 	github.com/coreos/go-oidc/v3 v3.15.0
-	github.com/efficientgo/core v1.0.0-rc.3
-	github.com/efficientgo/e2e v0.14.1-0.20230413162904-ebc233c5a32f
+	github.com/efficientgo/core v1.0.0-rc.3.0.20250509094815-bd2ec8febb66
+	github.com/efficientgo/e2e v0.14.1-0.20251204144843-44570aa52a90
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-chi/chi/v5 v5.2.2
 	github.com/go-chi/httprate v0.14.1

go.sum

@@ -102,10 +102,10 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/edsrzf/mmap-go v1.2.0 h1:hXLYlkbaPzt1SaQk+anYwKSRNhufIDCchSPkUD6dD84=
 github.com/edsrzf/mmap-go v1.2.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
-github.com/efficientgo/core v1.0.0-rc.3 h1:X6CdgycYWDcbYiJr1H1+lQGzx13o7bq3EUkbB9DsSPc=
-github.com/efficientgo/core v1.0.0-rc.3/go.mod h1:FfGdkzWarkuzOlY04VY+bGfb1lWrjaL6x/GLcQ4vJps=
-github.com/efficientgo/e2e v0.14.1-0.20230413162904-ebc233c5a32f h1:o6k4pEAY+B54emx/ZkSo1aeBDgzIIvBYluezcWjKilw=
-github.com/efficientgo/e2e v0.14.1-0.20230413162904-ebc233c5a32f/go.mod h1:plsKU0YHE9uX+7utvr7SiDtVBSHJyEfHRO4UnUgDmts=
+github.com/efficientgo/core v1.0.0-rc.3.0.20250509094815-bd2ec8febb66 h1:dbyJxOkY0GfW7gCJw2T0XPkxUeal/eKKI24jMJVEd0w=
+github.com/efficientgo/core v1.0.0-rc.3.0.20250509094815-bd2ec8febb66/go.mod h1:FfGdkzWarkuzOlY04VY+bGfb1lWrjaL6x/GLcQ4vJps=
+github.com/efficientgo/e2e v0.14.1-0.20251204144843-44570aa52a90 h1:IxIFadkrIijEI41AgVvLjx7ePtBi+c7Fhmq/Zwkrb9g=
+github.com/efficientgo/e2e v0.14.1-0.20251204144843-44570aa52a90/go.mod h1:plsKU0YHE9uX+7utvr7SiDtVBSHJyEfHRO4UnUgDmts=
 github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
 github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=

test/e2e/configs.go

@@ -320,17 +320,25 @@ exporters:
       headers:
         x-tenant: test-oidc
         # (Use hard-coded auth header, because this forwarding collector
-        # is unable to do OIDC password grant.)
+        # is unable to do OIDC password grant)
         authorization: bearer %[2]s
 
 extensions:
   health_check:
+    endpoint: 0.0.0.0:13133
+  zpages:
+    endpoint: 0.0.0.0:55679
 
 service:
-    extensions: [health_check]
+    extensions: [health_check, zpages]
     telemetry:
       metrics:
-        address: :8888
+        readers:
+          - pull:
+              exporter:
+                prometheus:
+                  host: '0.0.0.0'
+                  port: 8888
         level: detailed
     # extensions: [oauth2client]
     pipelines:
@@ -471,7 +479,9 @@ distributor:
     otlp:
       protocols:
         http:
+          endpoint: 0.0.0.0:4318
         grpc:
+          endpoint: 0.0.0.0:4317
     opencensus:
 
 ingester:

test/e2e/helpers.go

@@ -123,6 +123,7 @@ func getTLSClientConfig(t *testing.T, e e2e.Environment) *tls.Config {
 }
 
 func assertResponse(t *testing.T, response string, expected string) {
+	t.Helper()
 	testutil.Assert(
 		t,
 		strings.Contains(response, expected),

test/e2e/services.go

@@ -20,16 +20,15 @@ import (
 const (
 	apiImage = "quay.io/observatorium/api:local_e2e_test" // Image that is built if you run `make container-test`.
 
-	// Labels matching below thanos v0.24 will fail with "no matchers specified (excluding external labels)" if you specify only tenant matcher. Fixed later on.
-	thanosImage       = "quay.io/thanos/thanos:v0.32.4"
-	lokiImage         = "grafana/loki:2.6.1"
-	upImage           = "quay.io/observatorium/up:master-2022-10-27-d8bb06f"
-	alertmanagerImage = "quay.io/prometheus/alertmanager:v0.25.0"
+	thanosImage       = "quay.io/thanos/thanos:v0.40.1"
+	lokiImage         = "grafana/loki:2.9.17"
+	upImage           = "quay.io/observatorium/up:master-2025-12-18-b1c89d2"
+	alertmanagerImage = "quay.io/prometheus/alertmanager:v0.30.0"
 	probesImage       = "quay.io/redhat-services-prod/openshift/rhobs-synthetics-api:latest"
 
 	jaegerAllInOneImage = "jaegertracing/all-in-one:1.57.0"
-	otelCollectorImage  = "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.101.0"
-	tempoImage          = "grafana/tempo:2.2.4"
+	otelCollectorImage  = "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.142.0"
+	tempoImage          = "grafana/tempo:2.9.0"
 
 	dexImage              = "dexidp/dex:v2.30.0"
 	opaImage              = "openpolicyagent/opa:1.5.1-static"
@@ -164,7 +163,6 @@ func startTempoServicesForTraces(t *testing.T, e e2e.Environment) (tempoDistribu
 				},
 			},
 		})
-	createTempoConfigYAML(t, e)
 
 	testutil.Ok(t, e2e.StartAndWaitReady(tempo))
 

test/e2e/traces_test.go

@@ -556,6 +556,7 @@ func TestTracesTempo(t *testing.T) {
 					"grpc":         4317,
 					"health_check": 13133,
 					"telemetry":    8888,
+					"zpages":       55679,
 				}).
 			Init(e2e.StartOptions{
 				Image: otelCollectorImage,
@@ -606,6 +607,5 @@ func TestTracesTempo(t *testing.T) {
 			httpObservatoriumTempoEndpoint, "5B8EFFF798038103D269B633813FC60C",
 			true, fmt.Sprintf("bearer %s", token), http.StatusOK)
 		assertResponse(t, returnedTrace, tempoTraceResponse5B)
-
 	})
 }