Skip to content

Commit 6df3df7

Browse files
andytaelandytael
authored
Cloudbank v32 updates (#806)
* minimal changes * Banner updates, pom cleanup and fixes * Banner updates, pom cleanup and fixes * Tested cloudbank - all good * Fixed README.md * pom.xml cleanup and removal of WebConfiguration class * README update and cleanup of code * Cleanup and readme update * Adding tracing * added jaeger to readme * Updated README.md * Updated README.md
1 parent 66fe781 commit 6df3df7

File tree

26 files changed

+481
-660
lines changed

26 files changed

+481
-660
lines changed

‎cloudbank-v32/README.md

Lines changed: 266 additions & 466 deletions
Large diffs are not rendered by default.

‎cloudbank-v32/account/pom.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818

1919
<properties>
2020
<oracle-springboot-starter.version>23.4.0</oracle-springboot-starter.version>
21-
<liquibase.version>4.24.0</liquibase.version>
21+
<oracle-microtx-starter.version>23.4.1</oracle-microtx-starter.version>
22+
<liquibase.version>4.25.1</liquibase.version>
23+
<datasource-micrometer-spring-boot.version>1.0.2</datasource-micrometer-spring-boot.version>
2224
</properties>
2325

2426
<dependencies>
@@ -46,12 +48,12 @@
4648
<dependency>
4749
<groupId>com.oracle.microtx.lra</groupId>
4850
<artifactId>microtx-lra-spring-boot-starter</artifactId>
49-
<version>23.4.1</version>
51+
<version>${oracle-microtx-starter.version}</version>
5052
</dependency>
5153
<dependency>
52-
<groupId>jakarta.inject</groupId>
53-
<artifactId>jakarta.inject-api</artifactId>
54-
<version>2.0.1</version>
54+
<groupId>net.ttddyy.observation</groupId>
55+
<artifactId>datasource-micrometer-spring-boot</artifactId>
56+
<version>${datasource-micrometer-spring-boot.version}</version>
5557
</dependency>
5658
</dependencies>
5759

‎cloudbank-v32/account/src/main/resources/application.yaml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
spring:
55
application:
66
name: account
7-
zipkin:
8-
base-url: ${zipkin.base-url}
97
jersey:
108
type: filter
119
jpa:
@@ -68,3 +66,23 @@ management:
6866
metrics:
6967
tags:
7068
application: ${spring.application.name}
69+
tracing:
70+
sampling:
71+
probability: 1.0
72+
info:
73+
os:
74+
enabled: true
75+
env:
76+
enabled: true
77+
java:
78+
enabled: true
79+
zipkin:
80+
tracing:
81+
endpoint: http://jaegertracing-collector.observability:9411/api/v2/spans
82+
otlp:
83+
tracing:
84+
endpoint: http://open-telemetry-opentelemetry-collector.open-telemetry:4317
85+
logging:
86+
level:
87+
root: INFO
88+
com.example: DEBUG

‎cloudbank-v32/account/src/main/resources/banner.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
_____
2-
______ ______________________ __________ /_
3-
_ __ `/ ___/ ___/ __ \ / / /_ __ \ __/
4-
/ /_/ // /__ / /__ / /_/ / /_/ /_ / / / /_
5-
\__,_/ \___/ \___/ \____/\__,_/ /_/ /_/\__/
1+
_ _
2+
/ \ ___ ___ ___ _ _ _ __ | |_
3+
/ _ \ / __/ __/ _ \| | | | '_ \| __|
4+
/ ___ \ (_| (_| (_) | |_| | | | | |_
5+
/_/ \_\___\___\___/ \__,_|_| |_|\__|
66

77
${application.title} ${application.version}
88
Powered by Spring Boot ${spring-boot.version}

‎cloudbank-v32/checks/pom.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,6 @@
3333
<version>${oracle-springboot-starter.version}</version>
3434
</dependency>
3535
</dependencies>
36-
<dependencyManagement>
37-
<dependencies>
38-
<dependency>
39-
<groupId>org.springframework.cloud</groupId>
40-
<artifactId>spring-cloud-dependencies</artifactId>
41-
<version>${spring-cloud.version}</version>
42-
<type>pom</type>
43-
<scope>import</scope>
44-
</dependency>
45-
</dependencies>
46-
</dependencyManagement>
4736

4837
<build>
4938
<plugins>

‎cloudbank-v32/checks/src/main/java/com/example/checks/ChecksApplication.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
@SpringBootApplication
2323
@EnableFeignClients
2424
@EnableJms
25-
// @EnableEurekaClient
2625
@EnableDiscoveryClient
2726
public class ChecksApplication {
2827

‎cloudbank-v32/checks/src/main/resources/application.yaml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
# Copyright (c) 2023, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
3+
14
spring:
25
application:
36
name: checks
4-
zipkin:
5-
base-url: ${zipkin.base-url}
67

78
datasource:
89
url: ${spring.datasource.url}
@@ -31,3 +32,24 @@ management:
3132
metrics:
3233
tags:
3334
application: ${spring.application.name}
35+
tracing:
36+
sampling:
37+
probability: 1.0
38+
info:
39+
os:
40+
enabled: true
41+
env:
42+
enabled: true
43+
java:
44+
enabled: true
45+
zipkin:
46+
tracing:
47+
endpoint: http://jaegertracing-collector.observability:9411/api/v2/spans
48+
otlp:
49+
tracing:
50+
endpoint: http://open-telemetry-opentelemetry-collector.open-telemetry:4317
51+
52+
logging:
53+
level:
54+
root: INFO
55+
com.example: DEBUG

‎cloudbank-v32/checks/src/main/resources/banner.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
______ ______
2-
_________ /_______________ /_________
3-
_ ___/_ __ \ _ \ ___/_ //_/_ ___/
4-
/ /__ _ / / / __/ /__ _ ,< _(__ )
5-
\___/ /_/ /_/\___/\___/ /_/|_| /____/
1+
____ _ _
2+
/ ___| |__ ___ ___| | _____
3+
| | | '_ \ / _ \/ __| |/ / __|
4+
| |___| | | | __/ (__| <\__ \
5+
\____|_| |_|\___|\___|_|\_\___/
66

77
${application.title} ${application.version}
88
Powered by Spring Boot ${spring-boot.version}

‎cloudbank-v32/creditscore/pom.xml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,13 @@
1515
<version>0.0.1-SNAPSHOT</version>
1616
<name>creditscore</name>
1717
<description>Creditscore Application</description>
18-
19-
<reporting>
20-
<plugins>
21-
<plugin>
22-
<groupId>org.apache.maven.plugins</groupId>
23-
<artifactId>maven-jxr-plugin</artifactId>
24-
<version>3.3.0</version>
25-
</plugin>
26-
</plugins>
27-
</reporting>
2818

2919
<build>
3020
<plugins>
3121
<plugin>
3222
<groupId>org.springframework.boot</groupId>
3323
<artifactId>spring-boot-maven-plugin</artifactId>
3424
</plugin>
35-
<plugin>
36-
<groupId>org.apache.maven.plugins</groupId>
37-
<artifactId>maven-compiler-plugin</artifactId>
38-
<configuration>
39-
<source>17</source>
40-
<target>17</target>
41-
</configuration>
42-
</plugin>
4325
<plugin>
4426
<groupId>org.graalvm.buildtools</groupId>
4527
<artifactId>native-maven-plugin</artifactId>

‎cloudbank-v32/creditscore/src/main/java/com/example/creditscore/controller/CreditScoreController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class CreditScoreController {
2323
*/
2424
@GetMapping("/creditscore")
2525
public Map<String, String> getCreditScore() {
26-
log.info("CREDITSCORE: getCreditScore");
26+
log.debug("CREDITSCORE: getCreditScore");
2727
int max = 900;
2828
int min = 500;
2929
SecureRandom secureRandom = new SecureRandom();

0 commit comments

Comments
 (0)