minor fixes; temp prints

Signed-off-by: Aditi Ahuja <ahuja.aditi@gmail.com>

pkg/tracing/jaeger/config_yaml.go

@@ -4,6 +4,7 @@
 package jaeger
 
 import (
+	"fmt"
 	"net"
 	"net/url"
 	"os"
@@ -162,7 +163,11 @@ func parseTags(sTags string) []opentracing.Tag {
 	pairs := strings.Split(sTags, ",")
 	tags := make([]opentracing.Tag, 0)
 	for _, p := range pairs {
+		fmt.Printf("\n\n p is: %s", p)
 		kv := strings.SplitN(p, "=", 2)
+		if len(kv) < 2 {
+			continue // to avoid panic
+		}
 		k, v := strings.TrimSpace(kv[0]), strings.TrimSpace(kv[1])
 
 		if strings.HasPrefix(v, "${") && strings.HasSuffix(v, "}") {

pkg/tracing/jaeger/jaeger.go

@@ -72,13 +72,19 @@ func NewTracerProvider(ctx context.Context, logger log.Logger, conf []byte) (*tr
 		}
 	}
 
-	tags := getAttributesFromTags(config)
+	var tags []attribute.KeyValue
+	if config.Tags != "" {
+		tags = getAttributesFromTags(config)
+	}
 	samplingFraction := getSamplingFraction(config.SamplerType, config.SamplerParam)
 	var queueSize tracesdk.BatchSpanProcessorOption
+	var processor tracesdk.SpanProcessor
 	if config.ReporterMaxQueueSize != 0 {
 		queueSize = tracesdk.WithMaxQueueSize(config.ReporterMaxQueueSize)
+		processor = tracesdk.NewBatchSpanProcessor(exporter, queueSize)
+	} else {
+		processor = tracesdk.NewBatchSpanProcessor(exporter)
 	}
-	processor := tracesdk.NewBatchSpanProcessor(exporter, queueSize)
 	tp := newTraceProvider(ctx, logger, processor, samplingFraction, tags, config.ServiceName)
 
 	return tp, nil

test/e2e/e2ethanos/services.go

@@ -82,7 +82,7 @@ func DefaultImage() string {
 		return os.Getenv("THANOS_IMAGE")
 	}
 
-	return "thanosio/thanos:main-2022-06-16-0d15bc0d"
+	return "thanos"
 }
 
 func defaultPromHttpConfig() string {

test/e2e/tracing_test.go

@@ -102,6 +102,7 @@ config:
 
 		// Jaeger might give a 404 or 500 before the trace is there.  Retry.
 		if response.StatusCode != http.StatusOK {
+			t.Logf("\n\n WAITING")
 			b.Wait()
 			continue
 		}