Skip to content

Commit 9ebdb76

Browse files
lake-of-dreamslake-of-dreams
authored
Merge pull request #1041 from oracle/observability-changes
observability changes to application configs
2 parents e6c5fab + e4c57e4 commit 9ebdb76

File tree

31 files changed

+690
-403
lines changed

31 files changed

+690
-403
lines changed

‎cloudbank-v4/account/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@
4848
<artifactId>datasource-micrometer-spring-boot</artifactId>
4949
<version>${datasource-micrometer-spring-boot.version}</version>
5050
</dependency>
51+
<dependency>
52+
<groupId>com.example</groupId>
53+
<artifactId>common</artifactId>
54+
<version>${project.version}</version>
55+
</dependency>
5156
</dependencies>
5257

5358
<build>

‎cloudbank-v4/account/src/main/java/com/example/accounts/AccountsApplication.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33

44
package com.example.accounts;
55

6+
import com.example.common.filter.LoggingFilterConfig;
67
import org.springframework.boot.SpringApplication;
78
import org.springframework.boot.autoconfigure.SpringBootApplication;
89
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
10+
import org.springframework.context.annotation.Import;
911

1012
@EnableDiscoveryClient
1113
@SpringBootApplication
14+
@Import(LoggingFilterConfig.class)
1215
public class AccountsApplication {
1316

1417
public static void main(String[] args) {

‎cloudbank-v4/account/src/main/java/com/example/accounts/controller/AccountController.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ public List<Journal> getJournalEntriesForAccount(@PathVariable("accountId") long
186186
@PostMapping("/account/journal/{journalId}/clear")
187187
public ResponseEntity<Journal> clearJournalEntry(@PathVariable long journalId) {
188188
try {
189-
boolean exists = journalRepository.existsById(journalId);
190189
Optional<Journal> data = journalRepository.findById(journalId);
191190
if (data.isPresent()) {
192191
Journal newJournalEntry = data.get();

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

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
spring:
55
application:
66
name: account
7-
threads:
8-
virtual:
9-
enabled: true
107
jpa:
118
hibernate:
129
ddl-auto: validate
@@ -19,7 +16,9 @@ spring:
1916
lra:
2017
coordinator-url: ${MP_LRA_COORDINATOR_URL}
2118
propagation-active: true
22-
headers-propagation-prefix: "{x-b3-, oracle-tmm-, authorization, refresh-}"
19+
headers-propagation-prefix: "{x-b3-, oracle-tmm-, authorization, refresh-}"
20+
config:
21+
import: classpath:common.yaml
2322

2423
liquibase:
2524
change-log: classpath:db/changelog/controller.yaml
@@ -41,45 +40,4 @@ spring:
4140
min-pool-size: 10
4241
max-pool-size: 30
4342

44-
eureka:
45-
instance:
46-
hostname: ${spring.application.name}
47-
preferIpAddress: true
48-
client:
49-
service-url:
50-
defaultZone: ${eureka.service-url}
51-
fetch-registry: true
52-
register-with-eureka: true
53-
enabled: true
54-
55-
management:
56-
endpoint:
57-
health:
58-
show-details: always
59-
endpoints:
60-
web:
61-
exposure:
62-
include: "*"
63-
metrics:
64-
tags:
65-
application: ${spring.application.name}
66-
tracing:
67-
sampling:
68-
probability: 1.0
69-
info:
70-
os:
71-
enabled: true
72-
env:
73-
enabled: true
74-
java:
75-
enabled: true
76-
otlp:
77-
tracing:
78-
endpoint: ${otel.exporter.otlp.endpoint}
79-
80-
logging:
81-
level:
82-
root: INFO
83-
com.example: INFO
84-
8543

‎cloudbank-v4/chatbot/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ https://oss.oracle.com/licenses/upl/ -->
2323
<groupId>org.springframework.ai</groupId>
2424
<artifactId>spring-ai-ollama-spring-boot-starter</artifactId>
2525
</dependency>
26+
<dependency>
27+
<groupId>com.example</groupId>
28+
<artifactId>common</artifactId>
29+
<version>${project.version}</version>
30+
</dependency>
2631
</dependencies>
2732

2833
<repositories>

‎cloudbank-v4/chatbot/src/main/java/com/example/chatbot/ChatbotApplication.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33

44
package com.example.chatbot;
55

6+
import com.example.common.filter.LoggingFilterConfig;
67
import org.springframework.boot.SpringApplication;
78
import org.springframework.boot.autoconfigure.SpringBootApplication;
9+
import org.springframework.context.annotation.Import;
810

911
@SpringBootApplication
12+
@Import(LoggingFilterConfig.class)
1013
public class ChatbotApplication {
1114

1215
public static void main(String[] args) {

‎cloudbank-v4/chatbot/src/main/resources/application.yaml‎

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,12 @@
11
spring:
22
application:
33
name: chatbot
4-
threads:
5-
virtual:
6-
enabled: true
74
ai:
85
ollama:
96
base-url: http://ollama.ollama.svc.cluster.local:11434
107
chat:
118
enabled: true
129
options:
1310
model: llama3
14-
15-
eureka:
16-
instance:
17-
hostname: ${spring.application.name}
18-
preferIpAddress: true
19-
client:
20-
service-url:
21-
defaultZone: ${eureka.service-url}
22-
fetch-registry: true
23-
register-with-eureka: true
24-
enabled: true
25-
26-
management:
27-
endpoint:
28-
health:
29-
show-details: always
30-
endpoints:
31-
web:
32-
exposure:
33-
include: "*"
34-
metrics:
35-
tags:
36-
application: ${spring.application.name}
37-
tracing:
38-
sampling:
39-
probability: 1.0
40-
info:
41-
os:
42-
enabled: true
43-
env:
44-
enabled: true
45-
java:
46-
enabled: true
47-
otlp:
48-
tracing:
49-
endpoint: ${otel.exporter.otlp.endpoint}
50-
51-
logging:
52-
level:
53-
root: INFO
54-
com.example: INFO
11+
config:
12+
import: classpath:common.yaml

‎cloudbank-v4/checks/pom.xml‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!-- Copyright (c) 2023, 2024, Oracle and/or its affiliates. -->
3-
<!-- Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -->
4-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<!-- Licensed under the Universal Permissive License v 1.0 as shown at
4+
https://oss.oracle.com/licenses/upl. -->
5+
<project xmlns="http://maven.apache.org/POM/4.0.0"
6+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
7+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
68
<modelVersion>4.0.0</modelVersion>
79
<parent>
810
<groupId>com.example</groupId>
@@ -33,10 +35,15 @@
3335
<artifactId>spring-boot-starter-data-jdbc</artifactId>
3436
</dependency>
3537
<dependency>
36-
<groupId>com.oracle.database.spring</groupId>
37-
<artifactId>oracle-spring-boot-starter-ucp</artifactId>
38-
<version>${oracle-springboot-starter.version}</version>
39-
</dependency>
38+
<groupId>com.oracle.database.spring</groupId>
39+
<artifactId>oracle-spring-boot-starter-ucp</artifactId>
40+
<version>${oracle-springboot-starter.version}</version>
41+
</dependency>
42+
<dependency>
43+
<groupId>com.example</groupId>
44+
<artifactId>common</artifactId>
45+
<version>${project.version}</version>
46+
</dependency>
4047
</dependencies>
4148

4249
<build>
@@ -52,4 +59,4 @@
5259
</plugins>
5360
</build>
5461

55-
</project>
62+
</project>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33

44
package com.example.checks;
55

6+
import com.example.common.filter.LoggingFilterConfig;
67
import jakarta.jms.ConnectionFactory;
78
import org.springframework.boot.SpringApplication;
89
import org.springframework.boot.autoconfigure.SpringBootApplication;
910
import org.springframework.boot.autoconfigure.jms.DefaultJmsListenerContainerFactoryConfigurer;
1011
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
1112
import org.springframework.cloud.openfeign.EnableFeignClients;
1213
import org.springframework.context.annotation.Bean;
14+
import org.springframework.context.annotation.Import;
1315
import org.springframework.jms.annotation.EnableJms;
1416
import org.springframework.jms.config.DefaultJmsListenerContainerFactory;
1517
import org.springframework.jms.config.JmsListenerContainerFactory;
@@ -18,10 +20,12 @@
1820
import org.springframework.jms.support.converter.MessageConverter;
1921
import org.springframework.jms.support.converter.MessageType;
2022

23+
2124
@SpringBootApplication
2225
@EnableFeignClients
2326
@EnableJms
2427
@EnableDiscoveryClient
28+
@Import(LoggingFilterConfig.class)
2529
public class ChecksApplication {
2630

2731
public static void main(String[] args) {

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

Lines changed: 2 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
spring:
55
application:
66
name: checks
7-
threads:
8-
virtual:
9-
enabled: true
107
datasource:
118
url: ${spring.datasource.url}
129
username: ${spring.datasource.username}
@@ -18,46 +15,5 @@ spring:
1815
initial-pool-size: 15
1916
min-pool-size: 10
2017
max-pool-size: 30
21-
22-
eureka:
23-
instance:
24-
hostname: ${spring.application.name}
25-
preferIpAddress: true
26-
client:
27-
service-url:
28-
defaultZone: ${eureka.service-url}
29-
fetch-registry: true
30-
register-with-eureka: true
31-
enabled: true
32-
33-
management:
34-
endpoint:
35-
health:
36-
show-details: always
37-
endpoints:
38-
web:
39-
exposure:
40-
include: "*"
41-
metrics:
42-
tags:
43-
application: ${spring.application.name}
44-
tracing:
45-
sampling:
46-
probability: 1.0
47-
info:
48-
os:
49-
enabled: true
50-
env:
51-
enabled: true
52-
java:
53-
enabled: true
54-
otlp:
55-
tracing:
56-
endpoint: ${otel.exporter.otlp.endpoint}
57-
58-
logging:
59-
level:
60-
root: INFO
61-
com.example: INFO
62-
63-
18+
config:
19+
import: classpath:common.yaml

0 commit comments

Comments
 (0)