Merge branch 'main' into gcp_resource_v2

Author: MrAlias

samplers/jaegerremote/sampler_remote.go

@@ -127,6 +127,8 @@ func (s *Sampler) pollController() {
 }
 
 func (s *Sampler) pollControllerWithTicker(ticker *time.Ticker) {
+	s.UpdateSampler()
+
 	for {
 		select {
 		case <-ticker.C:

samplers/jaegerremote/sampler_remote_test.go

@@ -90,12 +90,19 @@ type testSamplingStrategyParser struct {
 func (p *testSamplingStrategyParser) Parse(response []byte) (interface{}, error) {
 	strategy := new(jaeger_api_v2.SamplingStrategyResponse)
 
-	if string(response) == "probabilistic" {
+	switch string(response) {
+	case "probabilistic":
 		strategy.StrategyType = jaeger_api_v2.SamplingStrategyType_PROBABILISTIC
 		strategy.ProbabilisticSampling = &jaeger_api_v2.ProbabilisticSamplingStrategy{
 			SamplingRate: 0.85,
 		}
 		return strategy, nil
+	case "rateLimiting":
+		strategy.StrategyType = jaeger_api_v2.SamplingStrategyType_RATE_LIMITING
+		strategy.RateLimitingSampling = &jaeger_api_v2.RateLimitingSamplingStrategy{
+			MaxTracesPerSecond: 100,
+		}
+		return strategy, nil
 	}
 
 	return nil, errors.New("unknown strategy test request")
@@ -280,6 +287,29 @@ func TestRemotelyControlledSampler_updateSampler(t *testing.T) {
 	}
 }
 
+func TestRemotelyControlledSampler_ImmediatelyUpdateOnStartup(t *testing.T) {
+	initSampler := newProbabilisticSampler(0.123)
+	fetcher := &testSamplingStrategyFetcher{response: []byte("rateLimiting")}
+	parser := new(testSamplingStrategyParser)
+	updaters := []samplerUpdater{new(probabilisticSamplerUpdater), new(rateLimitingSamplerUpdater)}
+	sampler := New(
+		"test",
+		WithMaxOperations(42),
+		WithOperationNameLateBinding(true),
+		WithInitialSampler(initSampler),
+		WithSamplingServerURL("my url"),
+		WithSamplingRefreshInterval(10*time.Minute),
+		withSamplingStrategyFetcher(fetcher),
+		withSamplingStrategyParser(parser),
+		withUpdaters(updaters...),
+	)
+	time.Sleep(100 * time.Millisecond) // waiting for s.pollController
+	sampler.Close()                    // stop pollController, avoid date race
+	s, ok := sampler.sampler.(*rateLimitingSampler)
+	assert.True(t, ok)
+	assert.Equal(t, float64(100), s.maxTracesPerSecond)
+}
+
 func TestRemotelyControlledSampler_multiStrategyResponse(t *testing.T) {
 	agent, sampler := initAgent(t)
 	defer agent.Close()