Skip to content

Commit b930cea

Browse files
chinthaka-dinadasachinthaka-dinadasa
authored
Merge pull request #60 from JavatoDev-com/57-zipkin-setup-for-distrbuted-tracing
57 zipkin setup for distrbuted tracing
2 parents b45b726 + 06c716d commit b930cea

File tree

9 files changed

+129
-6
lines changed

9 files changed

+129
-6
lines changed

‎core-banking-service/build.gradle

+7-1
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,17 @@ ext {
2626
}
2727

2828
dependencies {
29-
implementation 'org.springframework.boot:spring-boot-starter-actuator'
3029
implementation 'org.springframework.boot:spring-boot-starter-web'
3130
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
3231
implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
3332

33+
//SPRING BOOT - TRACING
34+
implementation 'org.springframework.boot:spring-boot-starter-actuator'
35+
implementation 'io.micrometer:micrometer-tracing-bridge-brave'
36+
implementation 'io.zipkin.reporter2:zipkin-reporter-brave'
37+
implementation 'io.github.openfeign:feign-micrometer'
38+
39+
3440
//SPRING CLOUD CONFIG
3541
implementation 'org.springframework.cloud:spring-cloud-starter-config'
3642
implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'

‎docker-compose/docker-compose-support-apps.yml

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
version: '3.6'
2+
3+
services:
4+
5+
zipkin:
6+
image: openzipkin/zipkin:3
7+
ports:
8+
- 9411:9411
9+
networks:
10+
javatodev_ib_network:
11+
ipv4_address: 172.25.0.12
12+
13+
keycloak_web:
14+
image: quay.io/keycloak/keycloak:23.0.7
15+
container_name: keycloak_web
16+
environment:
17+
KC_DB: postgres
18+
KC_DB_URL: jdbc:postgresql://keycloakdb:5432/keycloak
19+
KC_DB_USERNAME: keycloak
20+
KC_DB_PASSWORD: password
21+
KEYCLOAK_ADMIN: admin
22+
KEYCLOAK_ADMIN_PASSWORD: password
23+
command: ["start-dev", "--import-realm"]
24+
depends_on:
25+
- keycloakdb
26+
ports:
27+
- 8080:8080
28+
volumes:
29+
- ./keycloak:/opt/keycloak/data/import
30+
networks:
31+
javatodev_ib_network:
32+
ipv4_address: 172.25.0.11
33+
34+
keycloakdb:
35+
image: postgres:15
36+
volumes:
37+
- postgres_data:/var/lib/postgresql/data
38+
environment:
39+
POSTGRES_DB: keycloak
40+
POSTGRES_USER: keycloak
41+
POSTGRES_PASSWORD: password
42+
networks:
43+
javatodev_ib_network:
44+
ipv4_address: 172.25.0.10
45+
46+
mysql_core_db:
47+
build: mysql
48+
container_name: mysql_javatodev_app
49+
environment:
50+
MYSQL_ROOT_PASSWORD: woVERANKliGharym
51+
ports:
52+
- 3306:3306
53+
volumes:
54+
- mysqldata:/var/lib/mysql
55+
networks:
56+
javatodev_ib_network:
57+
ipv4_address: 172.25.0.9
58+
59+
internet-banking-config-server:
60+
image: javatodev/internet-banking-config-server
61+
ports:
62+
- 8090:8090
63+
networks:
64+
javatodev_ib_network:
65+
ipv4_address: 172.25.0.8
66+
67+
internet-banking-service-registry:
68+
image: javatodev/internet-banking-service-registry
69+
ports:
70+
- 8081:8081
71+
networks:
72+
javatodev_ib_network:
73+
ipv4_address: 172.25.0.7
74+
75+
volumes:
76+
postgres_data:
77+
mysqldata:
78+
79+
networks:
80+
javatodev_ib_network:
81+
driver: bridge
82+
ipam:
83+
driver: default
84+
config:
85+
- subnet: 172.25.0.0/16
86+
gateway: 172.25.0.1

‎docker-compose/docker-compose.yml

+9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
version: '3.6'
22

33
services:
4+
5+
zipkin:
6+
image: openzipkin/zipkin:3
7+
ports:
8+
- 9411:9411
9+
networks:
10+
javatodev_ib_network:
11+
ipv4_address: 172.25.0.12
12+
413
keycloak_web:
514
image: quay.io/keycloak/keycloak:23.0.7
615
container_name: keycloak_web

‎internet-banking-api-gateway/build.gradle

+6-1
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,15 @@ ext {
2626
}
2727

2828
dependencies {
29-
implementation 'org.springframework.boot:spring-boot-starter-actuator'
3029
implementation 'org.springframework.cloud:spring-cloud-starter-gateway'
3130
implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
3231

32+
//SPRING BOOT - TRACING
33+
implementation 'org.springframework.boot:spring-boot-starter-actuator'
34+
implementation 'io.micrometer:micrometer-tracing-bridge-brave'
35+
implementation 'io.zipkin.reporter2:zipkin-reporter-brave'
36+
implementation 'io.github.openfeign:feign-micrometer'
37+
3338
//SPRING CLOUD CONFIG
3439
implementation 'org.springframework.cloud:spring-cloud-starter-config'
3540
implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'

‎internet-banking-fund-transfer-service/build.gradle

+6-1
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,17 @@ ext {
2626
}
2727

2828
dependencies {
29-
implementation 'org.springframework.boot:spring-boot-starter-actuator'
3029
implementation 'org.springframework.boot:spring-boot-starter-web'
3130
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
3231
implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
3332
implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
3433

34+
//SPRING BOOT - TRACING
35+
implementation 'org.springframework.boot:spring-boot-starter-actuator'
36+
implementation 'io.micrometer:micrometer-tracing-bridge-brave'
37+
implementation 'io.zipkin.reporter2:zipkin-reporter-brave'
38+
implementation 'io.github.openfeign:feign-micrometer'
39+
3540
//SPRING CLOUD CONFIG
3641
implementation 'org.springframework.cloud:spring-cloud-starter-config'
3742
implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'

‎internet-banking-user-service/build.gradle

+6-1
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,16 @@ ext {
2626
}
2727

2828
dependencies {
29-
implementation 'org.springframework.boot:spring-boot-starter-actuator'
3029
implementation 'org.springframework.boot:spring-boot-starter-web'
3130
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
3231
implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
3332

33+
//SPRING BOOT - TRACING
34+
implementation 'org.springframework.boot:spring-boot-starter-actuator'
35+
implementation 'io.micrometer:micrometer-tracing-bridge-brave'
36+
implementation 'io.zipkin.reporter2:zipkin-reporter-brave'
37+
implementation 'io.github.openfeign:feign-micrometer'
38+
3439
//Open feign
3540
implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
3641
implementation 'io.github.openfeign:feign-okhttp:13.2.1'

‎internet-banking-user-service/src/main/java/com/javatodev/finance/model/dto/User.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package com.javatodev.finance.model.dto;
22

33
import lombok.Data;
4+
import lombok.EqualsAndHashCode;
45

56
@Data
7+
@EqualsAndHashCode(callSuper = false)
68
public class User extends AuditAware {
79
private Long id;
810

‎internet-banking-user-service/src/main/java/com/javatodev/finance/service/KeycloakUserService.java

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
@RequiredArgsConstructor
2121
public class KeycloakUserService {
2222

23-
private static final Logger log = LoggerFactory.getLogger(KeycloakUserService.class);
2423
private final KeycloakManager keyCloakManager;
2524

2625
public Integer createUser(UserRepresentation userRepresentation) {

‎internet-banking-utility-payment-service/build.gradle

+7-1
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,17 @@ ext {
3232
}
3333

3434
dependencies {
35-
implementation 'org.springframework.boot:spring-boot-starter-actuator'
3635
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
3736
implementation 'org.springframework.boot:spring-boot-starter-web'
3837
implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
3938
implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
39+
40+
//SPRING BOOT - TRACING
41+
implementation 'org.springframework.boot:spring-boot-starter-actuator'
42+
implementation 'io.micrometer:micrometer-tracing-bridge-brave'
43+
implementation 'io.zipkin.reporter2:zipkin-reporter-brave'
44+
implementation 'io.github.openfeign:feign-micrometer'
45+
4046
//SPRING CLOUD CONFIG
4147
implementation 'org.springframework.cloud:spring-cloud-starter-config'
4248
implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'

0 commit comments

Comments
 (0)