diff --git a/test/e2e/e2ethanos/services.go b/test/e2e/e2ethanos/services.go index 49ab2cd3d43..a57cf3fcab1 100644 --- a/test/e2e/e2ethanos/services.go +++ b/test/e2e/e2ethanos/services.go @@ -206,7 +206,8 @@ func NewAvalanche(e e2e.Environment, name string, o AvalancheOptions) *e2emon.In } func NewPrometheusWithJaegerTracingSidecarCustomImage(e e2e.Environment, name, promConfig, webConfig, - promImage, minTime, sidecarImage, jaegerConfig string, enableFeatures ...string) (e2e.InstrumentedRunnable, e2e.InstrumentedRunnable) { + promImage, minTime, sidecarImage, jaegerConfig string, enableFeatures ...string) ( + *e2emon.InstrumentedRunnable, *e2emon.InstrumentedRunnable) { prom := NewPrometheus(e, name, promConfig, webConfig, promImage, enableFeatures...) args := map[string]string{ @@ -225,13 +226,16 @@ func NewPrometheusWithJaegerTracingSidecarCustomImage(e e2e.Environment, name, p if minTime != "" { args["--min-time"] = minTime } - sidecar := e2e.NewInstrumentedRunnable(e, fmt.Sprintf("sidecar-%s", name)). - WithPorts(map[string]int{"http": 8080, "grpc": 9091}, "http"). + + sidecarRunnable := e.Runnable(fmt.Sprintf("sidecar-%s", name)). + WithPorts(map[string]int{"http": 8080, "grpc": 9091}). Init(wrapWithDefaults(e2e.StartOptions{ Image: sidecarImage, Command: e2e.NewCommand("sidecar", e2e.BuildArgs(args)...), Readiness: e2e.NewHTTPReadinessProbe("http", "/-/ready", 200, 200), })) + sidecar := e2emon.AsInstrumented(sidecarRunnable, "http") + return prom, sidecar } diff --git a/test/e2e/tracing_test.go b/test/e2e/tracing_test.go index f2804d066fa..26a39aec0a6 100644 --- a/test/e2e/tracing_test.go +++ b/test/e2e/tracing_test.go @@ -31,7 +31,7 @@ func TestJaegerTracing(t *testing.T) { testutil.Ok(t, err) t.Cleanup(env.Close) name := "testing" - newJaeger := e2e.NewInstrumentedRunnable(env, fmt.Sprintf("jaeger-%s", name)). + newJaeger := e2emon.AsInstrumented(env, fmt.Sprintf("jaeger-%s", name)). WithPorts( map[string]int{ "http": 16686,