Remove HAProxy zipkin check (#554)

jaegertracing · Nov 21, 2017 · 3136216 · 3136216
1 parent e018d3e
commit 3136216
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 19 deletions.
diff --git a/cmd/collector/app/zipkin/annotation.go b/cmd/collector/app/zipkin/annotation.go
@@ -15,8 +15,6 @@
 package zipkin
 
 import (
-	"strings"
-
 	"github.com/jaegertracing/jaeger/thrift-gen/zipkincore"
 )
 
@@ -42,10 +40,8 @@ func FindServiceName(span *zipkincore.Span) string {
 		if endpoint == nil {
 			continue
 		}
-		if IsCore(anno.Value) || strings.Index(anno.Value, "haproxy.") == 0 {
-			if endpoint.GetServiceName() != "" {
-				return endpoint.GetServiceName()
-			}
+		if IsCore(anno.Value) && endpoint.GetServiceName() != "" {
+			return endpoint.GetServiceName()
 		}
 	}
 	return ""

diff --git a/cmd/collector/app/zipkin/annotation_test.go b/cmd/collector/app/zipkin/annotation_test.go
@@ -70,15 +70,6 @@ func TestFindServiceName(t *testing.T) {
 	span.Annotations = append(span.Annotations, anno)
 	assert.Equal(t, "zoidberg", FindServiceName(span), "first suitable annotation is picked")
 
-	anno = &zc.Annotation{
-		Value: "haproxy.Tr",
-		Host: &zc.Endpoint{
-			ServiceName: "tracegen",
-		},
-	}
-	span.Annotations = []*zc.Annotation{anno}
-	assert.Equal(t, "tracegen", FindServiceName(span), "haproxy annotations also count")
-
 	anno = &zc.Annotation{
 		Value: "random event",
 		Host: &zc.Endpoint{

diff --git a/model/converter/thrift/jaeger/fixtures/model_01.json b/model/converter/thrift/jaeger/fixtures/model_01.json
@@ -23,7 +23,7 @@
         "vNum":53931
       },
       {
-        "key":"haproxy.sa",
+        "key":"someBool",
         "vType":"bool",
         "vNum":1
       },

diff --git a/model/converter/thrift/jaeger/fixtures/model_03.json b/model/converter/thrift/jaeger/fixtures/model_03.json
@@ -23,7 +23,7 @@
         "vNum":53931
       },
       {
-        "key":"haproxy.sa",
+        "key":"someBool",
         "vType":"bool",
         "vNum":1
       },
@@ -121,7 +121,7 @@
         "vNum":53931
       },
       {
-        "key":"haproxy.sa",
+        "key":"someBool",
         "vType":"bool",
         "vNum":1
       },

diff --git a/model/converter/thrift/jaeger/fixtures/thrift_batch_01.json b/model/converter/thrift/jaeger/fixtures/thrift_batch_01.json
@@ -44,7 +44,7 @@
           "vLong": 53931
         },
         {
-          "key": "haproxy.sa",
+          "key": "someBool",
           "vType": "BOOL",
           "vBool": true
         },