f me

- remove zipkin-service
MichiBaum · Feb 18, 2024 · 73c71da · 73c71da
1 parent 4a6fdba
commit 73c71da
Show file tree

Hide file tree

Showing 26 changed files with 43 additions and 907 deletions.
diff --git a/admin-service/pom.xml b/admin-service/pom.xml
@@ -32,6 +32,12 @@
 			<groupId>de.codecentric</groupId>
 			<artifactId>spring-boot-admin-starter-server</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-registry-prometheus</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<!-- Tracing and Latency reports -->
 		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-tracing-bridge-brave</artifactId>
@@ -40,10 +46,6 @@
 			<groupId>io.zipkin.reporter2</groupId>
 			<artifactId>zipkin-reporter-brave</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-tracing</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>

diff --git a/admin-service/src/main/resources/application.yml b/admin-service/src/main/resources/application.yml
@@ -65,6 +65,7 @@ management:
       span-joining-supported: true
     sampling:
       probability: 1.0
+    enabled: true
   zipkin:
     tracing:
       endpoint: http://zipkin:9411/api/v2/spans
diff --git a/authentication-service/pom.xml b/authentication-service/pom.xml
@@ -49,6 +49,12 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <!-- Tracing and Latency reports -->
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-tracing-bridge-brave</artifactId>
@@ -57,10 +63,6 @@
             <groupId>io.zipkin.reporter2</groupId>
             <artifactId>zipkin-reporter-brave</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-tracing</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/authentication-service/src/main/resources/application.yml b/authentication-service/src/main/resources/application.yml
@@ -64,6 +64,7 @@ management:
       span-joining-supported: true
     sampling:
       probability: 1.0
+    enabled: true
   zipkin:
     tracing:
       endpoint: http://zipkin:9411/api/v2/spans
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -134,21 +134,6 @@ services:
     networks:
       - microservice-network
 
-#  zipkin-service:
-#    image: 70131370/zipkin-service:1.0.0-TEST-8
-#    env_file:
-#      - .env
-#      - .env.override
-#    restart: always
-#    depends_on:
-#      - registry-service
-#    environment:
-#      spring_profiles_active: ${SPRING_ACTIVE_PROFILES}
-#    expose:
-#      - "80"
-#    networks:
-#      - microservice-network
-
   zipkin-db:
     image: openzipkin/zipkin-mysql
     container_name: zipkin-db

diff --git a/docker-up.sh b/docker-up.sh
@@ -1 +1 @@
-docker compose up --build -d registry-service authentication-db usermanagement-db gateway-service zipkin-db zipkin zipkin-dependencies
+docker compose up --build -d
diff --git a/gateway-service/pom.xml b/gateway-service/pom.xml
@@ -52,6 +52,12 @@
 			<optional>true</optional>
 		</dependency>
 
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-registry-prometheus</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<!-- Tracing and Latency reports -->
 		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-tracing-bridge-brave</artifactId>
@@ -60,10 +66,6 @@
 			<groupId>io.zipkin.reporter2</groupId>
 			<artifactId>zipkin-reporter-brave</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-tracing</artifactId>
-		</dependency>
 
 		<dependency>
 			<groupId>com.michibaum</groupId>

diff --git a/gateway-service/src/main/resources/application.yml b/gateway-service/src/main/resources/application.yml
@@ -66,6 +66,7 @@ management:
       span-joining-supported: true
     sampling:
       probability: 1.0
+    enabled: true
   zipkin:
     tracing:
       endpoint: http://zipkin:9411/api/v2/spans

diff --git a/javadoc-service/pom.xml b/javadoc-service/pom.xml
@@ -28,6 +28,12 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-registry-prometheus</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<!-- Tracing and Latency reports -->
 		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-tracing-bridge-brave</artifactId>
@@ -36,10 +42,6 @@
 			<groupId>io.zipkin.reporter2</groupId>
 			<artifactId>zipkin-reporter-brave</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-tracing</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>de.codecentric</groupId>
 			<artifactId>spring-boot-admin-starter-client</artifactId>

diff --git a/javadoc-service/src/main/resources/application.yml b/javadoc-service/src/main/resources/application.yml
@@ -54,6 +54,7 @@ management:
       span-joining-supported: true
     sampling:
       probability: 1.0
+    enabled: true
   zipkin:
     tracing:
       endpoint: http://zipkin:9411/api/v2/spans
diff --git a/registry-service/pom.xml b/registry-service/pom.xml
@@ -27,6 +27,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <!-- Tracing and Latency reports -->
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-tracing-bridge-brave</artifactId>
@@ -35,10 +41,6 @@
             <groupId>io.zipkin.reporter2</groupId>
             <artifactId>zipkin-reporter-brave</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-tracing</artifactId>
-        </dependency>
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>

diff --git a/registry-service/src/main/resources/application.yml b/registry-service/src/main/resources/application.yml
@@ -49,6 +49,7 @@ management:
       span-joining-supported: true
     sampling:
       probability: 1.0
+    enabled: true
   zipkin:
     tracing:
       endpoint: http://zipkin:9411/api/v2/spans
diff --git a/usermanagement-service/pom.xml b/usermanagement-service/pom.xml
@@ -38,6 +38,12 @@
             <artifactId>spring-boot-admin-starter-client</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <!-- Tracing and Latency reports -->
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-tracing-bridge-brave</artifactId>
@@ -46,10 +52,6 @@
             <groupId>io.zipkin.reporter2</groupId>
             <artifactId>zipkin-reporter-brave</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-tracing</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/usermanagement-service/src/main/resources/application.yml b/usermanagement-service/src/main/resources/application.yml
@@ -64,6 +64,7 @@ management:
       span-joining-supported: true
     sampling:
       probability: 1.0
+    enabled: true
   zipkin:
     tracing:
       endpoint: http://zipkin:9411/api/v2/spans
diff --git a/zipkin-service/.mvn/wrapper/MavenWrapperDownloader.java b/zipkin-service/.mvn/wrapper/MavenWrapperDownloader.java
diff --git a/zipkin-service/.mvn/wrapper/maven-wrapper.jar b/zipkin-service/.mvn/wrapper/maven-wrapper.jar
diff --git a/zipkin-service/.mvn/wrapper/maven-wrapper.properties b/zipkin-service/.mvn/wrapper/maven-wrapper.properties
diff --git a/zipkin-service/README.md b/zipkin-service/README.md
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		docker compose up --build -d registry-service authentication-db usermanagement-db gateway-service zipkin-db zipkin zipkin-dependencies
		docker compose up --build -d