vbatts/microservices-demo
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ensure all apps use the same host:port scheme for ZIPKIN_SERVICE_ADDR

Browse source
This commit is contained in:
prune 2020-01-30 09:26:22 -05:00
parent ad1f47a65a
commit 7200b5319e
No known key found for this signature in database
GPG key ID: 35A2931CBFDC67F6
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/adservice/src/main/java/hipstershop/AdService.java
View file

@ -271,7 +271,7 @@ public final class AdService {
private static void initZipkin() { private static void initZipkin() {
String zipkinAddr = System.getenv("ZIPKIN_SERVICE_ADDR"); String zipkinAddr = System.getenv("ZIPKIN_SERVICE_ADDR");
if (zipkinAddr != null && !zipkinAddr.isEmpty()) { if (zipkinAddr != null && !zipkinAddr.isEmpty()) {
String zipkinUrl = String.format("%s", zipkinAddr); String zipkinUrl = String.format("http://%s/api/v2/spans", zipkinAddr);
// Register Zipkin Tracing. // Register Zipkin Tracing.
ZipkinTraceExporter.createAndRegister(zipkinUrl, "adservice"); ZipkinTraceExporter.createAndRegister(zipkinUrl, "adservice");
logger.info("Zipkin initialization complete."); logger.info("Zipkin initialization complete.");

2
src/checkoutservice/main.go
View file

@ -136,7 +136,7 @@ func initZipkinTracing() {
return return
} }
reporter := zipkinhttp.NewReporter(svcAddr) reporter := zipkinhttp.NewReporter(fmt.Sprintf("http://%s/api/v2/spans", svcAddr))
exporter := zipkin.NewExporter(reporter, nil) exporter := zipkin.NewExporter(reporter, nil)
trace.RegisterExporter(exporter) trace.RegisterExporter(exporter)

4
src/currencyservice/server.js
View file

@ -153,8 +153,8 @@ function setupTracerAndExporters () {
} }
const zipkinOptions = { const zipkinOptions = {
url: ZIPKIN_SERVICE_ADDR, url: "http://" + ZIPKIN_SERVICE_ADDR + "/api/v2/spans",
serviceName: 'paymentservice-server' serviceName: 'currencyservice-server'
}; };
// Creates Zipkin exporter // Creates Zipkin exporter

2
src/frontend/main.go
View file

@ -180,7 +180,7 @@ func initZipkinTracing(log logrus.FieldLogger) {
return return
} }
reporter := zipkinhttp.NewReporter(svcAddr) reporter := zipkinhttp.NewReporter(fmt.Sprintf("http://%s/api/v2/spans", svcAddr))
exporter := zipkin.NewExporter(reporter, nil) exporter := zipkin.NewExporter(reporter, nil)
trace.RegisterExporter(exporter) trace.RegisterExporter(exporter)

2
src/paymentservice/server.js
View file

@ -41,7 +41,7 @@ function setupTracerAndExporters () {
} }
const zipkinOptions = { const zipkinOptions = {
url: ZIPKIN_SERVICE_ADDR, url: "http://" + ZIPKIN_SERVICE_ADDR + "/api/v2/spans",
serviceName: 'paymentservice-server' serviceName: 'paymentservice-server'
}; };

2
src/shippingservice/main.go
View file

@ -172,7 +172,7 @@ func initZipkinTracing() {
return return
} }
reporter := zipkinhttp.NewReporter(svcAddr) reporter := zipkinhttp.NewReporter(fmt.Sprintf("http://%s/api/v2/spans", svcAddr))
exporter := zipkin.NewExporter(reporter, nil) exporter := zipkin.NewExporter(reporter, nil)
trace.RegisterExporter(exporter) trace.RegisterExporter(exporter)