diff --git a/README.md b/README.md index c2f26af0f7a9e727b5607faf83cb5cac68c69041..a9cb873e981a156998e2f9fcf42ec42ae92727c4 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ If everything goes well, you can access the following services at given location * Config Server - http://localhost:8888 * AngularJS frontend (API Gateway) - http://localhost:8080 * Customers, Vets and Visits Services - random port, check Eureka Dashboard -* Tracing Server (Zipkin) - http://localhost:9411/zipkin/ +* Tracing Server (Zipkin) - http://localhost:9411/zipkin (we use [openzipkin](https://github.com/openzipkin/zipkin/tree/master/zipkin-server)) * Admin Server (Spring Boot Admin) - http://localhost:9090 You can tell Config Server to use your local Git repository by using `local` Spring profile and setting diff --git a/docker-compose.yml b/docker-compose.yml index a0b1f3d1296befc1117d1b2ff38d7e6182afea31..2c2e9fefdc99bec87988b2164146a5c7dfa0b3fb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -83,16 +83,9 @@ services: - 8080:8080 tracing-server: - image: mszarlinski/spring-petclinic-tracing-server + image: openzipkin/zipkin container_name: tracing-server mem_limit: 256M - links: - - config-server - - discovery-server - depends_on: - - config-server - - discovery-server - entrypoint: ["./wait-for-it.sh","discovery-server:8761","--timeout=60","--","java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] ports: - 9411:9411 diff --git a/pom.xml b/pom.xml index 995571c10873d3504dea82ea035db089960a0fb5..75224611fc9e682b5d610627d1ab5c7c92f56c8e 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,6 @@ <module>spring-petclinic-config-server</module> <module>spring-petclinic-discovery-server</module> <module>spring-petclinic-api-gateway</module> - <module>spring-petclinic-tracing-server</module> </modules> <properties> diff --git a/spring-petclinic-tracing-server/pom.xml b/spring-petclinic-tracing-server/pom.xml deleted file mode 100644 index 4ac91329e86be354744cf6c03e7bb7dcea9374bd..0000000000000000000000000000000000000000 --- a/spring-petclinic-tracing-server/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.springframework.samples.petclinic.tracing</groupId> - <artifactId>spring-petclinic-tracing-server</artifactId> - <packaging>jar</packaging> - <description>Zipkin server with UI</description> - - <parent> - <groupId>org.springframework.samples</groupId> - <artifactId>spring-petclinic-microservices</artifactId> - <version>2.0.5</version> - </parent> - - <properties> - <zipkin.version>2.8.4</zipkin.version> - <docker.image.exposed.port>8081</docker.image.exposed.port> - <docker.image.dockerfile.dir>${basedir}/../docker</docker.image.dockerfile.dir> - </properties> - - <dependencies> - <!-- Spring Boot --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-starter-config</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> - - <!-- Spring Cloud --> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId> - </dependency> - - <!-- Third-parties --> - <dependency> - <groupId>io.zipkin.java</groupId> - <artifactId>zipkin-server</artifactId> - <version>${zipkin.version}</version> - </dependency> - <dependency> - <groupId>io.zipkin.java</groupId> - <artifactId>zipkin-autoconfigure-ui</artifactId> - <version>${zipkin.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.jolokia</groupId> - <artifactId>jolokia-core</artifactId> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>buildDocker</id> - <build> - <plugins> - <plugin> - <groupId>com.spotify</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>${docker.plugin.version}</version> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> diff --git a/spring-petclinic-tracing-server/src/main/java/org/springframework/samples/petclinic/tracing/ZipkinServer.java b/spring-petclinic-tracing-server/src/main/java/org/springframework/samples/petclinic/tracing/ZipkinServer.java deleted file mode 100644 index ea9c9bd826b1c820476f5d32438e44dc8f83a71a..0000000000000000000000000000000000000000 --- a/spring-petclinic-tracing-server/src/main/java/org/springframework/samples/petclinic/tracing/ZipkinServer.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.samples.petclinic.tracing; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import zipkin.server.EnableZipkinServer; - -/** - * @author Antoine Rey - */ -@EnableDiscoveryClient -@SpringBootApplication -@EnableZipkinServer -public class ZipkinServer { - - public static void main(String[] args) { - SpringApplication.run(ZipkinServer.class, args); - } -} diff --git a/spring-petclinic-tracing-server/src/main/resources/bootstrap.yml b/spring-petclinic-tracing-server/src/main/resources/bootstrap.yml deleted file mode 100644 index e0ae840e42c09a6748943517370d4d270f55c648..0000000000000000000000000000000000000000 --- a/spring-petclinic-tracing-server/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,12 +0,0 @@ -spring: - cloud: - config: - uri: http://localhost:8888 - application: - name: tracing-server ---- -spring: - profiles: docker - cloud: - config: - uri: http://config-server:8888