Tolldemo slueth (#891)

Author: andytael

tolldemo/queue-reader/pom.xml

@@ -17,8 +17,8 @@
         <java.version>11</java.version>
         <spring-cloud.version>2021.0.8</spring-cloud.version>
         <oracle-springboot-starter.version>2.7.12</oracle-springboot-starter.version>
-        <!-- <micrometer-core.version>1.12.5</micrometer-core.version>
-        <datasource-micrometer-spring-boot.version>1.0.3</datasource-micrometer-spring-boot.version> -->
+        <micrometer-core.version>1.12.5</micrometer-core.version>
+        <datasource-micrometer-spring-boot.version>1.0.3</datasource-micrometer-spring-boot.version>
     </properties>
     <dependencies>
         <dependency>
@@ -57,17 +57,28 @@
             <artifactId>jackson-core</artifactId>
             <version>2.17.0</version>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-sleuth-zipkin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zipkin</artifactId>
+  			<version>2.2.8.RELEASE</version>
+		</dependency>
+
          <!-- Core module of Micrometer -->
         <!-- <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-core</artifactId>
             <version>${micrometer-core.version}</version>
         </dependency> -->
-        <!-- Prometheues-->
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-registry-prometheus</artifactId>
-        </dependency>
+
         <!-- Adds the Tracer Implementation -->
         <!-- <dependency>
             <groupId>io.micrometer</groupId>

tolldemo/queue-reader/src/main/resources/application.yaml

@@ -1,6 +1,8 @@
 spring:
   application:
     name: queue-reader
+  zipkin:
+    base-url: http://jaegertracing-collector.observability.svc.cluster.local:9411/api/v2/spans
 
   datasource:
     url: ${spring.datasource.url}
@@ -31,7 +33,32 @@ management:
         include: "*"
   metrics:
     tags:
-      application: ${spring.application.name}    
+      application: ${spring.application.name}
+  tracing:
+    sampling:
+      probability: 1.0
+  info:
+    os:
+      enabled: true
+    env:
+      enabled: true
+    java:
+      enabled: true
+  otlp:
+    tracing:
+      endpoint: ${otel.exporter.otlp.endpoint}
+ 
+
+# eureka:
+#   instance:
+#     hostname: ${spring.application.name}
+#     preferIpAddress: true
+#   client:
+#     service-url:
+#       defaultZone: ${eureka.service-url}
+#     fetch-registry: true
+#     register-with-eureka: true
+#     enabled: true
 
 # server:
 #   tomcat:

tolldemo/toll-reader/pom.xml

@@ -17,6 +17,7 @@
 		<java.version>21</java.version>
 		<spring-cloud.version>2023.0.1</spring-cloud.version>
         <micrometer-core.version>1.12.4</micrometer-core.version>
+		<!-- <datasource-micrometer-spring-boot.version>1.0.3</datasource-micrometer-spring-boot.version> -->
 	</properties>
 	<dependencies>
 		<dependency>
@@ -92,6 +93,16 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
+		<!-- <dependency> Collides with AQ
+			<groupId>net.ttddyy.observation</groupId>
+			<artifactId>datasource-micrometer-spring-boot</artifactId>
+			<version>${datasource-micrometer-spring-boot.version}</version>
+		</dependency> -->
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
     </dependencies>
 
     <dependencyManagement>