Merge branch 'main' into parallelism-on-test

jaegertracing · Oct 29, 2024 · 540e45f · 540e45f
2 parents b6ace28 + e327edb
commit 540e45f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/examples/hotrod/docker-compose-v2.yml b/examples/hotrod/docker-compose-v2.yml
@@ -4,7 +4,9 @@
 services:
   jaeger:
     image: ${REGISTRY:-}jaegertracing/jaeger:${JAEGER_VERSION:-latest}
-    command: ["--feature-gates=-component.UseLocalHostAsDefaultHost"]
+    command:
+      - --set=receivers.otlp.protocols.grpc.endpoint="0.0.0.0:4317"
+      - --set=receivers.otlp.protocols.http.endpoint="0.0.0.0:4318"
     ports:
       - "16686:16686"
       - "4317:4317"

diff --git a/plugin/sampling/strategyprovider/static/factory.go b/plugin/sampling/strategyprovider/static/factory.go
@@ -47,7 +47,7 @@ func (f *Factory) Initialize(_ metrics.Factory, _ storage.SamplingStoreFactory,
 	return nil
 }
 
-// CreateStrategyStore implements samplingstrategy.Factory
+// CreateStrategyProvider implements samplingstrategy.Factory
 func (f *Factory) CreateStrategyProvider() (samplingstrategy.Provider, samplingstrategy.Aggregator, error) {
 	s, err := NewProvider(*f.options, f.logger)
 	if err != nil {