DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix opentracing in v0.X (#7676)

Browse source
This commit is contained in:
Ricardo Katz 2021-09-20 21:38:23 -03:00 committed by GitHub
parent 3d277a6200
commit a104d4fbc3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/ingress/controller/template/template.go
View file

@ -1103,7 +1103,7 @@ func buildOpentracing(c interface{}, s interface{}) string {
buf := bytes.NewBufferString("") buf := bytes.NewBufferString("")
if cfg.DatadogCollectorHost != "" { if cfg.DatadogCollectorHost != "" {
buf.WriteString("opentracing_load_tracer /usr/local/lib64/libdd_opentracing.so /etc/nginx/opentracing.json;") buf.WriteString("opentracing_load_tracer /usr/local/lib/libdd_opentracing.so /etc/nginx/opentracing.json;")
} else if cfg.ZipkinCollectorHost != "" { } else if cfg.ZipkinCollectorHost != "" {
buf.WriteString("opentracing_load_tracer /usr/local/lib/libzipkin_opentracing_plugin.so /etc/nginx/opentracing.json;") buf.WriteString("opentracing_load_tracer /usr/local/lib/libzipkin_opentracing_plugin.so /etc/nginx/opentracing.json;")
} else if cfg.JaegerCollectorHost != "" || cfg.JaegerEndpoint != "" { } else if cfg.JaegerCollectorHost != "" || cfg.JaegerEndpoint != "" {

4
internal/ingress/controller/template/template_test.go
View file

@ -1288,7 +1288,7 @@ func TestBuildOpenTracing(t *testing.T) {
EnableOpentracing: true, EnableOpentracing: true,
DatadogCollectorHost: "datadog-host.com", DatadogCollectorHost: "datadog-host.com",
} }
expected = "opentracing_load_tracer /usr/local/lib64/libdd_opentracing.so /etc/nginx/opentracing.json;\r\n" expected = "opentracing_load_tracer /usr/local/lib/libdd_opentracing.so /etc/nginx/opentracing.json;\r\n"
actual = buildOpentracing(cfgDatadog, []*ingress.Server{}) actual = buildOpentracing(cfgDatadog, []*ingress.Server{})
if expected != actual { if expected != actual {
@ -1312,7 +1312,7 @@ func TestBuildOpenTracing(t *testing.T) {
OpentracingOperationName: "my-operation-name", OpentracingOperationName: "my-operation-name",
OpentracingLocationOperationName: "my-location-operation-name", OpentracingLocationOperationName: "my-location-operation-name",
} }
expected = "opentracing_load_tracer /usr/local/lib64/libdd_opentracing.so /etc/nginx/opentracing.json;\r\n" expected = "opentracing_load_tracer /usr/local/lib/libdd_opentracing.so /etc/nginx/opentracing.json;\r\n"
expected += "opentracing_operation_name \"my-operation-name\";\n" expected += "opentracing_operation_name \"my-operation-name\";\n"
expected += "opentracing_location_operation_name \"my-location-operation-name\";\n" expected += "opentracing_location_operation_name \"my-location-operation-name\";\n"
actual = buildOpentracing(cfgOpenTracing, []*ingress.Server{}) actual = buildOpentracing(cfgOpenTracing, []*ingress.Server{})