Skip to content

Commit 22bf85d

Browse files
authored
fix(java): add native image configurations for logging-logback (#1075)
* fix(java): add native image configurations for logging-logback * add exclusion to build script
1 parent ff1ed3d commit 22bf85d

File tree

3 files changed

+56
-3
lines changed

3 files changed

+56
-3
lines changed

.kokoro/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ integration)
7070
RETURN_CODE=$?
7171
;;
7272
graalvm)
73-
# Run Unit and Integration Tests with Native Image
74-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
73+
# Run Unit and Integration Tests with Native Image. Skip tests that use mocking libs
74+
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test "-Dtest=!LoggingAppenderTest"
7575
RETURN_CODE=$?
7676
;;
7777
graalvm17)
7878
# Run Unit and Integration Tests with Native Image
79-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
79+
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test "-Dtest=!LoggingAppenderTest"
8080
RETURN_CODE=$?
8181
;;
8282
samples)

owlbot.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
'CONTRIBUTING.md',
2626
'.github/auto-label.yaml',
2727
".github/release-please.yml",
28+
".kokoro/build.sh"
2829
])
2930

3031
# --------------------------------------------------------------------------
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
[
2+
{
3+
"name":"ch.qos.logback.classic.Level",
4+
"methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
5+
},
6+
{
7+
"name":"ch.qos.logback.classic.filter.ThresholdFilter",
8+
"queryAllPublicMethods":true,
9+
"methods":[
10+
{"name":"<init>","parameterTypes":[] },
11+
{"name":"setLevel","parameterTypes":["java.lang.String"] }
12+
]
13+
},
14+
{
15+
"name":"ch.qos.logback.core.UnsynchronizedAppenderBase",
16+
"methods":[{"name":"addFilter","parameterTypes":["ch.qos.logback.core.filter.Filter"] }]
17+
},
18+
{
19+
"name":"com.google.cloud.logging.logback.LogbackBatchingSettings",
20+
"queryAllPublicMethods":true,
21+
"methods":[
22+
{"name":"<init>","parameterTypes":[] },
23+
{"name":"setDelayThreshold","parameterTypes":["java.lang.Long"] },
24+
{"name":"setElementCountThreshold","parameterTypes":["java.lang.Long"] },
25+
{"name":"setLimitExceededBehavior","parameterTypes":["com.google.api.gax.batching.FlowController$LimitExceededBehavior"] },
26+
{"name":"setMaxOutstandingElementCount","parameterTypes":["java.lang.Long"] },
27+
{"name":"setMaxOutstandingRequestBytes","parameterTypes":["java.lang.Long"] },
28+
{"name":"setRequestByteThreshold","parameterTypes":["java.lang.Long"] }
29+
]
30+
},
31+
{
32+
"name":"com.google.cloud.logging.logback.LoggingAppender",
33+
"queryAllPublicMethods":true,
34+
"methods":[
35+
{"name":"<init>","parameterTypes":[] },
36+
{"name":"setAutoPopulateMetadata","parameterTypes":["boolean"] },
37+
{"name":"setCredentialsFile","parameterTypes":["java.lang.String"] },
38+
{"name":"setFlushLevel","parameterTypes":["ch.qos.logback.classic.Level"] },
39+
{"name":"setLog","parameterTypes":["java.lang.String"] },
40+
{"name":"setLogDestinationProjectId","parameterTypes":["java.lang.String"] },
41+
{"name":"setLogbackBatchingSettings","parameterTypes":["com.google.cloud.logging.logback.LogbackBatchingSettings"] },
42+
{"name":"setPartialSuccess","parameterTypes":["boolean"] },
43+
{"name":"setRedirectToStdout","parameterTypes":["boolean"] },
44+
{"name":"setResourceType","parameterTypes":["java.lang.String"] },
45+
{"name":"setWriteSynchronicity","parameterTypes":["com.google.cloud.logging.Synchronicity"] }
46+
]
47+
},
48+
{
49+
"name":"java.lang.Long",
50+
"methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
51+
}
52+
]

0 commit comments

Comments
 (0)