From f30c9f6f96861a7358cb7cd1c8a27bce10d3c5c9 Mon Sep 17 00:00:00 2001
From: Ed Snible <snible@us.ibm.com>
Date: Wed, 8 Jun 2022 15:30:59 -0400
Subject: [PATCH] Remove debugging Printfs

Signed-off-by: Ed Snible <snible@us.ibm.com>
---
 cmd/agent/app/builder.go                       | 1 -
 cmd/agent/app/proxy_builders.go                | 3 ---
 cmd/agent/app/reporter/grpc/collector_proxy.go | 2 --
 cmd/agent/app/reporter/grpc/reporter.go        | 2 --
 cmd/agent/app/reporter/grpc/reporter_test.go   | 4 ----
 5 files changed, 12 deletions(-)

diff --git a/cmd/agent/app/builder.go b/cmd/agent/app/builder.go
index 8f015aa7641..e9ee7831d03 100644
--- a/cmd/agent/app/builder.go
+++ b/cmd/agent/app/builder.go
@@ -244,7 +244,6 @@ func CreateCollectorProxy(
 	opts ProxyBuilderOptions,
 	builders map[reporter.Type]CollectorProxyBuilder,
 ) (CollectorProxy, error) {
-	fmt.Printf("@@@ ecs REACHED CreateCollectorProxy, opts=%#v\n", opts)
 	builder, ok := builders[opts.ReporterType]
 	if !ok {
 		return nil, fmt.Errorf("unknown reporter type %s", string(opts.ReporterType))
diff --git a/cmd/agent/app/proxy_builders.go b/cmd/agent/app/proxy_builders.go
index 5d0513ba749..1b521a95228 100644
--- a/cmd/agent/app/proxy_builders.go
+++ b/cmd/agent/app/proxy_builders.go
@@ -15,8 +15,6 @@
 package app
 
 import (
-	"fmt"
-
 	"google.golang.org/grpc/metadata"
 
 	"github.com/jaegertracing/jaeger/cmd/agent/app/reporter/grpc"
@@ -25,7 +23,6 @@ import (
 // GRPCCollectorProxyBuilder creates CollectorProxyBuilder for GRPC reporter
 func GRPCCollectorProxyBuilder(builder *grpc.ConnBuilder) CollectorProxyBuilder {
 	return func(opts ProxyBuilderOptions) (proxy CollectorProxy, err error) {
-		fmt.Printf("@@@ ecs REACHED GRPCCollectorProxyBuilder, builder=%#v, opts=%#v\n", builder, opts)
 		md := metadata.New(map[string]string{})
 		if builder.CollectorTenancyHeader != "" {
 			md = metadata.New(map[string]string{builder.CollectorTenancyHeader: builder.CollectorTenant})
diff --git a/cmd/agent/app/reporter/grpc/collector_proxy.go b/cmd/agent/app/reporter/grpc/collector_proxy.go
index e21394eb23b..e7e386b8cfd 100644
--- a/cmd/agent/app/reporter/grpc/collector_proxy.go
+++ b/cmd/agent/app/reporter/grpc/collector_proxy.go
@@ -15,7 +15,6 @@
 package grpc
 
 import (
-	"fmt"
 	"io"
 
 	"github.com/uber/jaeger-lib/metrics"
@@ -39,7 +38,6 @@ type ProxyBuilder struct {
 
 // NewCollectorProxy creates ProxyBuilder
 func NewCollectorProxy(builder *ConnBuilder, agentTags map[string]string, mFactory metrics.Factory, md metadata.MD, logger *zap.Logger) (*ProxyBuilder, error) {
-	fmt.Printf("@@@ ecs REACHED NewCollectorProxy, builder=%#v\n", builder)
 	conn, err := builder.CreateConnection(logger, mFactory)
 	if err != nil {
 		return nil, err
diff --git a/cmd/agent/app/reporter/grpc/reporter.go b/cmd/agent/app/reporter/grpc/reporter.go
index 700b2ab7272..80d2ee2e40c 100644
--- a/cmd/agent/app/reporter/grpc/reporter.go
+++ b/cmd/agent/app/reporter/grpc/reporter.go
@@ -17,7 +17,6 @@ package grpc
 
 import (
 	"context"
-	"fmt"
 
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
@@ -78,7 +77,6 @@ func (r *Reporter) send(ctx context.Context, spans []*model.Span, process *model
 	spans, process = addProcessTags(spans, process, r.agentTags)
 	batch := model.Batch{Spans: spans, Process: process}
 	req := &api_v2.PostSpansRequest{Batch: batch}
-	fmt.Printf("@@@ ecs in Reporter.send, r.metadata=%#v\n", r.metadata)
 	if len(r.metadata) > 0 {
 		ctx = metadata.NewOutgoingContext(ctx, r.metadata)
 	}
diff --git a/cmd/agent/app/reporter/grpc/reporter_test.go b/cmd/agent/app/reporter/grpc/reporter_test.go
index 1b354fdaef5..cf24ef3b6cb 100644
--- a/cmd/agent/app/reporter/grpc/reporter_test.go
+++ b/cmd/agent/app/reporter/grpc/reporter_test.go
@@ -16,7 +16,6 @@ package grpc
 
 import (
 	"context"
-	"fmt"
 	"sync"
 	"testing"
 	"time"
@@ -30,7 +29,6 @@ import (
 
 	"github.com/jaegertracing/jaeger/model"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
-	"github.com/jaegertracing/jaeger/storage"
 	jThrift "github.com/jaegertracing/jaeger/thrift-gen/jaeger"
 	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 )
@@ -64,8 +62,6 @@ func (h *mockSpanHandler) PostSpans(c context.Context, r *api_v2.PostSpansReques
 	}
 	if h.tenantHeader != "" {
 		md, ok := metadata.FromIncomingContext(c)
-		fmt.Printf("@@@ ecs in mockSpanHandler, c metadata is %#v\n", md)
-		fmt.Printf("@@@ ecs in mockSpanHandler, storage.GetTenant() is %q\n", storage.GetTenant(c))
 		if ok {
 			tenants := md.Get(h.tenantHeader)
 			if len(tenants) > 0 {