From 7200b5319e9346899d22c1067962c14e8c044ee6 Mon Sep 17 00:00:00 2001 From: prune Date: Thu, 30 Jan 2020 09:26:22 -0500 Subject: [PATCH] ensure all apps use the same host:port scheme for ZIPKIN_SERVICE_ADDR --- src/adservice/src/main/java/hipstershop/AdService.java | 2 +- src/checkoutservice/main.go | 2 +- src/currencyservice/server.js | 4 ++-- src/frontend/main.go | 2 +- src/paymentservice/server.js | 2 +- src/shippingservice/main.go | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/adservice/src/main/java/hipstershop/AdService.java b/src/adservice/src/main/java/hipstershop/AdService.java index 8c00999..539ef69 100644 --- a/src/adservice/src/main/java/hipstershop/AdService.java +++ b/src/adservice/src/main/java/hipstershop/AdService.java @@ -271,7 +271,7 @@ public final class AdService { private static void initZipkin() { String zipkinAddr = System.getenv("ZIPKIN_SERVICE_ADDR"); if (zipkinAddr != null && !zipkinAddr.isEmpty()) { - String zipkinUrl = String.format("%s", zipkinAddr); + String zipkinUrl = String.format("http://%s/api/v2/spans", zipkinAddr); // Register Zipkin Tracing. ZipkinTraceExporter.createAndRegister(zipkinUrl, "adservice"); logger.info("Zipkin initialization complete."); diff --git a/src/checkoutservice/main.go b/src/checkoutservice/main.go index 3e5ae8d..1d09c60 100644 --- a/src/checkoutservice/main.go +++ b/src/checkoutservice/main.go @@ -136,7 +136,7 @@ func initZipkinTracing() { return } - reporter := zipkinhttp.NewReporter(svcAddr) + reporter := zipkinhttp.NewReporter(fmt.Sprintf("http://%s/api/v2/spans", svcAddr)) exporter := zipkin.NewExporter(reporter, nil) trace.RegisterExporter(exporter) diff --git a/src/currencyservice/server.js b/src/currencyservice/server.js index 946cabd..f44c9d1 100644 --- a/src/currencyservice/server.js +++ b/src/currencyservice/server.js @@ -153,8 +153,8 @@ function setupTracerAndExporters () { } const zipkinOptions = { - url: ZIPKIN_SERVICE_ADDR, - serviceName: 'paymentservice-server' + url: "http://" + ZIPKIN_SERVICE_ADDR + "/api/v2/spans", + serviceName: 'currencyservice-server' }; // Creates Zipkin exporter diff --git a/src/frontend/main.go b/src/frontend/main.go index 16cc89c..8781145 100644 --- a/src/frontend/main.go +++ b/src/frontend/main.go @@ -180,7 +180,7 @@ func initZipkinTracing(log logrus.FieldLogger) { return } - reporter := zipkinhttp.NewReporter(svcAddr) + reporter := zipkinhttp.NewReporter(fmt.Sprintf("http://%s/api/v2/spans", svcAddr)) exporter := zipkin.NewExporter(reporter, nil) trace.RegisterExporter(exporter) diff --git a/src/paymentservice/server.js b/src/paymentservice/server.js index 14d68b0..8c79366 100644 --- a/src/paymentservice/server.js +++ b/src/paymentservice/server.js @@ -41,7 +41,7 @@ function setupTracerAndExporters () { } const zipkinOptions = { - url: ZIPKIN_SERVICE_ADDR, + url: "http://" + ZIPKIN_SERVICE_ADDR + "/api/v2/spans", serviceName: 'paymentservice-server' }; diff --git a/src/shippingservice/main.go b/src/shippingservice/main.go index 6181cc7..b843196 100644 --- a/src/shippingservice/main.go +++ b/src/shippingservice/main.go @@ -172,7 +172,7 @@ func initZipkinTracing() { return } - reporter := zipkinhttp.NewReporter(svcAddr) + reporter := zipkinhttp.NewReporter(fmt.Sprintf("http://%s/api/v2/spans", svcAddr)) exporter := zipkin.NewExporter(reporter, nil) trace.RegisterExporter(exporter)