Use shared jaeger-compose in xdock (#91)

Author: pavolloffay

.gitignore

@@ -56,3 +56,4 @@ perf.svg
 *.swp
 .idea/
 
+crossdock/jaeger-docker-compose.yml

crossdock/docker-compose.yml

@@ -40,6 +40,8 @@ services:
         image: jaegertracing/xdock-java
         ports:
             - "8080-8082"
+        links:
+           - "jaeger-agent:test_driver"
 
     python:
         build:
@@ -48,14 +50,11 @@ services:
         ports:
             - "8080-8082"
 
-    cassandra:
-        image: "cassandra:3.9"
-
     test_driver:
         image: jaegertracing/test-driver
-        links:
-            - cassandra
         depends_on:
-            - cassandra
+            - jaeger-query
+            - jaeger-collector
+            - jaeger-agent
         ports:
             - "8080"

crossdock/rules.mk

@@ -1,5 +1,7 @@
 XDOCK_YAML=crossdock/docker-compose.yml
 TRACETEST_THRIFT=idl/thrift/crossdock/tracetest.thrift
+JAEGER_COMPOSE_URL=https://raw.githubusercontent.com/jaegertracing/jaeger/master/docker-compose/jaeger-docker-compose.yml
+XDOCK_JAEGER_YAML=crossdock/jaeger-docker-compose.yml
 
 .PHONY: clean-compile
 clean-compile:
@@ -9,27 +11,27 @@ ${TRACETEST_THRIFT}:
 	git submodule update --init idl
 
 .PHONY: docker
-docker: clean-compile
+docker: clean-compile crossdock-download-jaeger
 	docker build -f crossdock/Dockerfile -t jaeger-client-python .
 
 .PHONY: crossdock
-crossdock: ${TRACETEST_THRIFT}
-	docker-compose -f $(XDOCK_YAML) kill python
-	docker-compose -f $(XDOCK_YAML) rm -f python
-	docker-compose -f $(XDOCK_YAML) build python
-	docker-compose -f $(XDOCK_YAML) run crossdock
+crossdock: ${TRACETEST_THRIFT} crossdock-download-jaeger
+	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) kill python
+	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) rm -f python
+	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) build python
+	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) run crossdock
 
 .PHONY: crossdock-fresh
-crossdock-fresh: ${TRACETEST_THRIFT}
-	docker-compose -f $(XDOCK_YAML) kill
-	docker-compose -f $(XDOCK_YAML) rm --force
-	docker-compose -f $(XDOCK_YAML) pull
-	docker-compose -f $(XDOCK_YAML) build
-	docker-compose -f $(XDOCK_YAML) run crossdock
-
-.PHONY: crossdock-logs
+crossdock-fresh: ${TRACETEST_THRIFT} crossdock-download-jaeger
+	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) kill
+	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) rm --force
+	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) pull
+	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) build
+	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) run crossdock
+
+.PHONY: crossdock-logs crossdock-download-jaeger
 crossdock-logs:
-	docker-compose -f $(XDOCK_YAML) logs
+	docker-compose -f $(XDOCK_YAML) -f $(XDOCK_JAEGER_YAML) logs
 
 .PHONY: install_docker_ci
 install_docker_ci:
@@ -39,3 +41,7 @@ install_docker_ci:
 	chmod +x docker-compose
 	sudo mv docker-compose /usr/local/bin
 	docker-compose version
+
+.PHONY: crossdock-download-jaeger
+crossdock-download-jaeger:
+	curl -o $(XDOCK_JAEGER_YAML) $(JAEGER_COMPOSE_URL)

crossdock/server/endtoend.py

@@ -14,6 +14,7 @@
 
 import tornado.web
 import json
+import os
 
 from jaeger_client.local_agent_net import LocalAgentSender
 from jaeger_client.config import (
@@ -101,7 +102,7 @@ def tracers(self, tracers):
     @property
     def local_agent_sender(self):
         return LocalAgentSender(
-            host='test_driver',
+            host=os.getenv('AGENT_HOST', 'jaeger-agent'),
             sampling_port=DEFAULT_SAMPLING_PORT,
             reporting_port=DEFAULT_REPORTING_PORT,
         )