fix

Signed-off-by: Yuri Shkuro <[email protected]>
jaegertracing · Dec 30, 2024 · ab896dc · ab896dc
1 parent c0a6e47
commit ab896dc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/cmd/jaeger/internal/all-in-one.yaml b/cmd/jaeger/internal/all-in-one.yaml
@@ -1,5 +1,5 @@
 service:
-  extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2, expvar]
+  extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2, expvar, zpages]
   pipelines:
     traces:
       receivers: [otlp, jaeger, zipkin]
@@ -49,6 +49,11 @@ extensions:
   expvar:
     endpoint: "${env:JAEGER_LISTEN_HOST:-localhost}:27777"
 
+  zpages:
+    # for some reason the official extension listens on ephemeral port 55679
+    # so we override it with a normal port
+    endpoint: "${env:JAEGER_LISTEN_HOST:-localhost}:27778"
+
 receivers:
   otlp:
     protocols:

diff --git a/cmd/jaeger/internal/extension/remotesampling/config.go b/cmd/jaeger/internal/extension/remotesampling/config.go
@@ -32,10 +32,9 @@ var (
 		"jaeger.sampling.includeDefaultOpStrategies",
 		featuregate.StageBeta, // enabed by default
 		featuregate.WithRegisterFromVersion("v2.2.0"),
+		featuregate.WithRegisterToVersion("v2.5.0"),
 		featuregate.WithRegisterDescription("Forces service strategy to be merged with default strategy, including per-operation overrides."),
 		featuregate.WithRegisterReferenceURL("https://github.com/jaegertracing/jaeger/issues/5270"),
-		// TODO set ToVersion after going to Beta stage
-		// featuregate.WithRegisterToVersion("v0.70.0"),
 	)
 )