Skip to content

Commit

Permalink
chore: [VUMM-1514] Fix NPEs from Reconcilers during local int test ru…
Browse files Browse the repository at this point in the history
…ns (#3918)

* chore: [VUMM-1514] Fix NPEs from Reconcilers during local int test runs
And, some cleanup done while looking for the issue

* add a comment in the logging test config
  • Loading branch information
jkwatson-verta authored Jul 5, 2023
1 parent 1173488 commit 5ed0806
Show file tree
Hide file tree
Showing 7 changed files with 241 additions and 784 deletions.
36 changes: 21 additions & 15 deletions backend/server/itconfig/log4j2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,20 @@ Configuration:
Console:
name: STDOUT
target: SYSTEM_OUT
JsonTemplateLayout:
eventTemplateUri: "classpath:log-template.json"
locationInfoEnabled: true
EventTemplateAdditionalField:
key: "hostName"
value: "${env:hostName:-}"
# PatternLayout:
# pattern: "[%-5level] traceId=%X{trace_id} %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %c{1} - %msg%n"
# swap out this JsonTemplateLayout for the PatternLayout below it if you want to see json logs like they are in production.
# JsonTemplateLayout:
# eventTemplateUri: "classpath:log-template.json"
# locationInfoEnabled: true
# EventTemplateAdditionalField:
# key: "hostName"
# value: "${env:hostName:-}"
PatternLayout:
pattern: "[%-5level] traceId=%X{trace_id} %d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %c{1} - %msg%n"
Loggers:
Root:
level: debug
AppenderRef:
ref: STDOUT
logger:
- name: io.grpc.netty
level: warn
Expand Down Expand Up @@ -46,6 +51,11 @@ Configuration:
additivity: false
AppenderRef:
ref: STDOUT
- name: org.hibernate
level: warn
additivity: false
AppenderRef:
ref: STDOUT
- name: com.zaxxer.hikari
level: warn
additivity: false
Expand All @@ -56,12 +66,8 @@ Configuration:
additivity: false
AppenderRef:
ref: STDOUT
- name: ai.verta.registry
level: debug
- name: ai.verta.modeldb.common.CommonDBUtil
level: warn
additivity: false
AppenderRef:
ref: STDOUT
Root:
level: debug
AppenderRef:
ref: STDOUT
ref: STDOUT
3 changes: 2 additions & 1 deletion backend/server/itconfig/test-env-h2.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"VERTA_MODELDB_TEST_CONFIG": "itconfig/config-test-h2.yaml",
"LIQUIBASE_MIGRATION": "true",
"RUN_LIQUIBASE_SEPARATE": "false"
"RUN_LIQUIBASE_SEPARATE": "false",
"LOG4J_CONFIGURATION_FILE": "itconfig/log4j2.yaml"
}
4 changes: 4 additions & 0 deletions backend/server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
Expand Down
Loading

2 comments on commit 5ed0806

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docker Tag: main-2023-07-05T22-23-02--5ed0806

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Total coverage (common): 15.05
Total coverage (server): 61.53

Changed Files coverage (common): coverage 100
Changed Files coverage (server): 28.25

Please sign in to comment.