From 0925f20d0585e629b84df078069e913bc698231a Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Thu, 3 Sep 2020 09:23:54 -0400 Subject: [PATCH] Refactor load of tracer load --- internal/ingress/controller/template/template.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/internal/ingress/controller/template/template.go b/internal/ingress/controller/template/template.go index 696447442..18da4f0f4 100644 --- a/internal/ingress/controller/template/template.go +++ b/internal/ingress/controller/template/template.go @@ -31,7 +31,6 @@ import ( "os/exec" "reflect" "regexp" - "runtime" "sort" "strings" text_template "text/template" @@ -956,16 +955,13 @@ func buildOpentracing(c interface{}, s interface{}) string { } buf := bytes.NewBufferString("") - if cfg.ZipkinCollectorHost != "" { - buf.WriteString("opentracing_load_tracer /usr/local/lib/libzipkin_opentracing.so /etc/nginx/opentracing.json;") - } else if cfg.JaegerCollectorHost != "" { - if runtime.GOARCH == "arm" { - buf.WriteString("# Jaeger tracer is not available for ARM https://github.com/jaegertracing/jaeger-client-cpp/issues/151") - } else { - buf.WriteString("opentracing_load_tracer /usr/local/lib/libjaegertracing_plugin.so /etc/nginx/opentracing.json;") - } - } else if cfg.DatadogCollectorHost != "" { + + if cfg.DatadogCollectorHost != "" { buf.WriteString("opentracing_load_tracer /usr/local/lib64/libdd_opentracing.so /etc/nginx/opentracing.json;") + } else if cfg.ZipkinCollectorHost != "" { + buf.WriteString("opentracing_load_tracer /usr/local/lib/libzipkin_opentracing_plugin.so /etc/nginx/opentracing.json;") + } else if cfg.JaegerCollectorHost != "" { + buf.WriteString("opentracing_load_tracer /usr/local/lib/libjaegertracing_plugin.so /etc/nginx/opentracing.json;") } buf.WriteString("\r\n")