Skip to content

Commit 942196e

Browse files
jjoyce0510jjoyce0510
authored
feat(logs): add thresholding, misc cleanup (#2773)
1 parent 29be543 commit 942196e

6 files changed

Lines changed: 40 additions & 20 deletions

File tree

‎datahub-frontend/app/react/controllers/GraphQLController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ public Result execute() throws Exception {
105105
executionResult.toSpecification(),
106106
executionResult.getErrors()));
107107
} else {
108-
_logger.debug(String.format("Executed graphQL query: %s, result: %s"),
108+
_logger.debug(String.format("Executed graphQL query: %s, result: %s",
109109
queryJson,
110-
executionResult.toSpecification());
110+
executionResult.toSpecification()));
111111
}
112112

113113

‎datahub-frontend/conf/logback.xml‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<layout class="ch.qos.logback.classic.PatternLayout">
88
<pattern>%d{HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
99
</layout>
10+
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
11+
<level>INFO</level>
12+
</filter>
1013
</appender>
1114

1215
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -20,6 +23,9 @@
2023
<!-- 30 days to keep -->
2124
<maxHistory>30</maxHistory>
2225
</rollingPolicy>
26+
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
27+
<level>INFO</level>
28+
</filter>
2329
<encoder>
2430
<pattern>%d{HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
2531
</encoder>
@@ -38,28 +44,29 @@
3844
</rollingPolicy>
3945
<filter class="ch.qos.logback.classic.filter.LevelFilter">
4046
<level>DEBUG</level>
47+
<onMatch>ACCEPT</onMatch>
48+
<onMismatch>DENY</onMismatch>
4149
</filter>
4250
<encoder>
4351
<pattern>%d{HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
4452
</encoder>
4553
</appender>
4654

4755
<!-- Change this to disable logging debug -->
48-
<logger name="com.linkedin" level="debug">
56+
<logger name="com.linkedin" level="DEBUG">
4957
<appender-ref ref="DEBUG_FILE"/>
5058
</logger>
51-
<logger name="controller" level="debug">
59+
<logger name="controller" level="DEBUG">
5260
<appender-ref ref="DEBUG_FILE"/>
5361
</logger>
54-
<logger name="graphql" level="debug">
62+
<logger name="graphql" level="DEBUG">
5563
<appender-ref ref="DEBUG_FILE"/>
5664
</logger>
57-
<logger name="react" level="debug">
65+
<logger name="react" level="DEBUG">
5866
<appender-ref ref="DEBUG_FILE"/>
5967
</logger>
6068

61-
<!-- Change this to disable logging debug -->
62-
<root level="info">
69+
<root level="INFO">
6370
<appender-ref ref="STDOUT"/>
6471
<appender-ref ref="FILE"/>
6572
</root>

‎datahub-frontend/run/logback.xml‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
<layout class="ch.qos.logback.classic.PatternLayout">
88
<pattern>%d{HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
99
</layout>
10+
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
11+
<level>INFO</level>
12+
</filter>
1013
</appender>
1114

1215
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -20,6 +23,9 @@
2023
<!-- 30 days to keep -->
2124
<maxHistory>30</maxHistory>
2225
</rollingPolicy>
26+
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
27+
<level>INFO</level>
28+
</filter>
2329
<encoder>
2430
<pattern>%d{HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
2531
</encoder>
@@ -38,27 +44,29 @@
3844
</rollingPolicy>
3945
<filter class="ch.qos.logback.classic.filter.LevelFilter">
4046
<level>DEBUG</level>
47+
<onMatch>ACCEPT</onMatch>
48+
<onMismatch>DENY</onMismatch>
4149
</filter>
4250
<encoder>
4351
<pattern>%d{HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
4452
</encoder>
4553
</appender>
4654

4755
<!-- Change this to disable logging debug -->
48-
<logger name="com.linkedin" level="debug">
56+
<logger name="com.linkedin" level="DEBUG">
4957
<appender-ref ref="DEBUG_FILE"/>
5058
</logger>
51-
<logger name="controller" level="debug">
59+
<logger name="controller" level="DEBUG">
5260
<appender-ref ref="DEBUG_FILE"/>
5361
</logger>
54-
<logger name="graphql" level="debug">
62+
<logger name="graphql" level="DEBUG">
5563
<appender-ref ref="DEBUG_FILE"/>
5664
</logger>
57-
<logger name="react" level="debug">
65+
<logger name="react" level="DEBUG">
5866
<appender-ref ref="DEBUG_FILE"/>
5967
</logger>
6068

61-
<root level="info">
69+
<root level="INFO">
6270
<appender-ref ref="STDOUT"/>
6371
<appender-ref ref="FILE"/>
6472
</root>

‎gms/impl/src/main/java/com/linkedin/metadata/filter/LoggingFilter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ private void logResponse(
5252
String method = requestContext.getMethod().getName();
5353
String uri = requestContext.getRequestURI().toString();
5454

55-
String logStr = String.format("%s %s - %s - %s - %sms", httpMethod, uri, method, status, duration);
55+
String logStr = String.format("%s %s - %s - %s - %sms", httpMethod, uri, method, status.getCode(), duration);
5656
log.info(logStr);
5757
}
5858

‎gms/impl/src/main/java/com/linkedin/metadata/resources/lineage/Relationships.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.Arrays;
2626
import java.util.List;
2727
import java.util.stream.Collectors;
28-
import lombok.extern.slf4j.Slf4j;
2928

3029
import static com.linkedin.metadata.dao.Neo4jUtil.*;
3130
import static com.linkedin.metadata.dao.utils.QueryUtils.newFilter;
@@ -34,7 +33,6 @@
3433
/**
3534
* Rest.li entry point: /relationships?type={entityType}&direction={direction}&types={types}
3635
*/
37-
@Slf4j
3836
@RestLiSimpleResource(name = "relationships", namespace = "com.linkedin.lineage")
3937
public final class Relationships extends SimpleResourceTemplate<EntityRelationships> {
4038

‎gms/war/src/main/resources/logback.xml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
<encoder>
66
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
77
</encoder>
8+
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
9+
<level>INFO</level>
10+
</filter>
811
</appender>
912

1013
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -18,7 +21,9 @@
1821
<!-- 30 days to keep -->
1922
<maxHistory>30</maxHistory>
2023
</rollingPolicy>
21-
24+
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
25+
<level>INFO</level>
26+
</filter>
2227
<encoder>
2328
<pattern>%d{HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
2429
</encoder>
@@ -37,22 +42,24 @@
3742
</rollingPolicy>
3843
<filter class="ch.qos.logback.classic.filter.LevelFilter">
3944
<level>DEBUG</level>
45+
<onMatch>ACCEPT</onMatch>
46+
<onMismatch>DENY</onMismatch>
4047
</filter>
4148
<encoder>
4249
<pattern>%d{HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
4350
</encoder>
4451
</appender>
4552

4653
<!-- Remove this to disable logging debug -->
47-
<logger name="com.linkedin" level="debug">
54+
<logger name="com.linkedin" level="DEBUG">
4855
<appender-ref ref="DEBUG_FILE"/>
4956
</logger>
5057

51-
<logger name="org.apache.kafka.clients" level="info">
58+
<logger name="org.apache.kafka.clients" level="INFO">
5259
<appender-ref ref="STDOUT" />
5360
</logger>
5461

55-
<root level="info">
62+
<root level="INFO">
5663
<appender-ref ref="STDOUT" />
5764
<appender-ref ref="FILE"/>
5865
</root>

0 commit comments

Comments
 (0)