merge

Signed-off-by: Vamshi Maskuri <gwcchintu@gmail.com>
jaegertracing · Mar 13, 2024 · 5d70df1 · 5d70df1
2 parents a2295d8 + df53ef5
commit 5d70df1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/cmd/collector/app/handler/zipkin_receiver.go b/cmd/collector/app/handler/zipkin_receiver.go
@@ -69,9 +69,6 @@ func startZipkinReceiver(
 	}
 
 	consumerAdapter := newConsumerDelegate(logger, spanProcessor, tm)
-	// reset Zipkin spanFormat
-	consumerAdapter.batchConsumer.spanOptions.SpanFormat = processor.ZipkinSpanFormat
-
 	nextConsumer, err := newTraces(consumerAdapter.consume)
 	if err != nil {
 		return nil, fmt.Errorf("could not create Zipkin consumer: %w", err)

diff --git a/cmd/collector/app/handler/zipkin_receiver_test.go b/cmd/collector/app/handler/zipkin_receiver_test.go
@@ -23,7 +23,6 @@ import (
 	"go.opentelemetry.io/collector/receiver"
 
 	"github.com/jaegertracing/jaeger/cmd/collector/app/flags"
-	"github.com/jaegertracing/jaeger/cmd/collector/app/processor"
 	zipkinthrift "github.com/jaegertracing/jaeger/model/converter/thrift/zipkin"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
 	"github.com/jaegertracing/jaeger/pkg/testutils"
@@ -127,7 +126,6 @@ func TestZipkinReceiver(t *testing.T) {
 				t.Logf("response: %s %s", response.Status, string(bodyBytes))
 			}
 			require.NoError(t, response.Body.Close())
-			require.Equal(t, processor.ZipkinSpanFormat, spanProcessor.getSpanFormat())
 		})
 	}
 }

diff --git a/plugin/sampling/strategystore/adaptive/options.go b/plugin/sampling/strategystore/adaptive/options.go
@@ -116,7 +116,7 @@ type Options struct {
 // AddFlags adds flags for Options
 func AddFlags(flagSet *flag.FlagSet) {
 	flagSet.Float64(targetSamplesPerSecond, defaultTargetSamplesPerSecond,
-		"The global target rate of samples per operation.",
+		"The the global target rate of samples per operation.",
 	)
 	flagSet.Float64(deltaTolerance, defaultDeltaTolerance,
 		"The acceptable amount of deviation between the observed samples-per-second and the desired (target) samples-per-second, expressed as a ratio.",

diff --git a/plugin/storage/cassandra/schema/create.sh b/plugin/storage/cassandra/schema/create.sh
@@ -12,7 +12,7 @@ function usage {
     >&2 echo "  DEPENDENCIES_TTL   - time to live for dependencies data, in seconds (default: 0, no TTL)"
     >&2 echo "  KEYSPACE           - keyspace (default: jaeger_v1_{datacenter})"
     >&2 echo "  REPLICATION_FACTOR - replication factor for prod (default: 2 for prod, 1 for test)"
-    >&2 echo "  VERSION            - Cassandra backend version, 3 or 4 (default: 4). Ignored if template is provided."
+    >&2 echo "  VERSION            - Cassandra backend version, 3 or 4 (default: 4). Ignored if template is is provided."
     >&2 echo ""
     >&2 echo "The template-file argument must be fully qualified path to a v00#.cql.tmpl template file."
     >&2 echo "If omitted, the template file with the highest available version will be used."