Skip to content
This repository was archived by the owner on Feb 18, 2024. It is now read-only.

Commit a08be10

Browse files
lvjing2lvjing2
authored
Merge pull request #436 from sofastack/youji-dev
using ark plugin for adapters
2 parents 0d47fc2 + 0941ca9 commit a08be10

File tree

94 files changed

+1506
-1360
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+1506
-1360
lines changed

‎samples/dubbo-samples/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<packaging>pom</packaging>
1111

1212
<properties>
13-
1413
</properties>
1514

1615
<modules>
@@ -49,4 +48,4 @@
4948
</profile>
5049
</profiles>
5150

52-
</project>
51+
</project>

‎samples/dubbo-samples/rpc/dubbo26/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ base/com.alipay.sofa.rpc.dubbo26.model.DemoService
3535
<plugin>
3636
<groupId>com.alipay.sofa</groupId>
3737
<artifactId>sofa-ark-maven-plugin</artifactId>
38-
<version>2.2.3</version>
38+
<version>${sofa.ark.version}</version>
3939
<executions>
4040
<execution>
4141
<id>default-cli</id>

‎samples/dubbo-samples/rpc/dubbo26/dubbo26base/pom.xml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,11 @@
1818
</properties>
1919
<dependencies>
2020
<!--覆盖dubbo 2.6同名类-->
21-
<dependency>
22-
<groupId>com.alipay.sofa.serverless</groupId>
23-
<artifactId>sofa-serverless-adapter-dubbo2.6</artifactId>
24-
<version>0.5.3</version>
25-
</dependency>
2621
<dependency>
2722
<groupId>com.alipay.sofa.serverless</groupId>
2823
<artifactId>sofa-serverless-base-starter</artifactId>
2924
<version>${sofa.serverless.runtime.version}</version>
25+
<type>pom</type>
3026
</dependency>
3127
<dependency>
3228
<groupId>org.springframework.boot</groupId>
@@ -135,4 +131,4 @@
135131
</plugins>
136132
</build>
137133

138-
</project>
134+
</project>

‎samples/dubbo-samples/rpc/dubbo26/dubbo26biz/pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@
2828
<artifactId>spring-boot-starter-log4j2</artifactId>
2929
<scope>provided</scope>
3030
</dependency>
31-
<dependency>
32-
<groupId>com.alipay.sofa.serverless</groupId>
33-
<artifactId>sofa-serverless-adapter-log4j2</artifactId>
34-
<version>${sofa.serverless.runtime.version}</version>
35-
<scope>provided</scope>
36-
</dependency>
3731
<dependency>
3832
<groupId>org.projectlombok</groupId>
3933
<artifactId>lombok</artifactId>
@@ -53,7 +47,7 @@
5347
<plugin>
5448
<groupId>com.alipay.sofa</groupId>
5549
<artifactId>sofa-ark-maven-plugin</artifactId>
56-
<version>2.2.3</version>
50+
<version>${sofa.ark.version}</version>
5751
<executions>
5852
<execution>
5953
<id>default-cli</id>
@@ -74,4 +68,4 @@
7468
</build>
7569

7670

77-
</project>
71+
</project>

‎samples/dubbo-samples/rpc/dubbo26/dubbo26biz/src/main/resources/log4j2-spring.xml‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Configuration>
3+
<Appenders>
4+
<Console name="STDOUT-APPENDER" target="SYSTEM_OUT">
5+
<PatternLayout pattern="%-5p %c{2} - %m%n%throwable" charset="UTF-8"/>
6+
</Console>
7+
8+
<Console name="STDERR-APPENDER" target="SYSTEM_ERR">
9+
<PatternLayout pattern="%-5p %c{2} - %m%n%throwable" charset="UTF-8"/>
10+
</Console>
11+
12+
<RollingFile name="ERROR-APPENDER"
13+
fileName="${ctx:logging.file.path}/${ctx:spring.application.name}/common-error.log"
14+
filePattern="${ctx:logging.file.path}/${ctx:spring.application.name}/common-error.log.%d{yyyy-MM-dd}"
15+
append="true">
16+
<PatternLayout
17+
pattern="%d [%X{traceId} %X{rpcId} - %X{loginUserEmail}/%X{loginUserID}/%X{remoteAddr}/%X{clientId} - %X{requestURIWithQueryString}] %-5p %c{2} - %m%n%throwable"
18+
charset="UTF-8"/>
19+
<TimeBasedTriggeringPolicy/>
20+
<DefaultRolloverStrategy/>
21+
<ThresholdFilter level="ERROR"/>
22+
</RollingFile>
23+
24+
<RollingFile name="WARN-APPENDER"
25+
fileName="${ctx:logging.file.path}/${ctx:spring.application.name}/common-warn.log"
26+
filePattern="${ctx:logging.file.path}/${ctx:spring.application.name}/common-warn.log.%d{yyyy-MM-dd}"
27+
append="true">
28+
<PatternLayout
29+
pattern="%d [%X{traceId} %X{rpcId} - %X{loginUserEmail}/%X{loginUserID}/%X{remoteAddr}/%X{clientId} - %X{requestURIWithQueryString}] %-5p %c{2} - %m%n%throwable"
30+
charset="UTF-8"/>
31+
<TimeBasedTriggeringPolicy/>
32+
<DefaultRolloverStrategy/>
33+
<Filters>
34+
<ThresholdFilter level="ERROR" onMatch="DENY" onMismatch="NEUTRAL"/>
35+
<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
36+
</Filters>
37+
</RollingFile>
38+
39+
<RollingFile name="APP-DEFAULT-APPENDER"
40+
fileName="${ctx:logging.file.path}/${ctx:spring.application.name}/app-default.log"
41+
filePattern="${ctx:logging.file.path}/${ctx:spring.application.name}/app-default.log.%d{yyyy-MM-dd-HH}"
42+
append="true">
43+
<PatternLayout
44+
pattern="%d [%X{traceId} %X{rpcId} - %X{loginUserEmail}/%X{loginUserID}/%X{remoteAddr}/%X{clientId} - %X{requestURIWithQueryString}] %-5p %c{2} - %m%n%throwable"
45+
charset="UTF-8"/>
46+
<TimeBasedTriggeringPolicy/>
47+
<DefaultRolloverStrategy/>
48+
</RollingFile>
49+
50+
<RollingFile name="SPRING-APPENDER" fileName="${ctx:logging.file.path}/spring/spring.log"
51+
filePattern="${ctx:logging.file.path}/spring/spring.log.%d{yyyy-MM-dd}"
52+
append="true">
53+
<PatternLayout
54+
pattern="%d [%X{traceId} %X{rpcId} - %X{loginUserEmail}/%X{loginUserID}/%X{remoteAddr}/%X{clientId} - %X{requestURIWithQueryString}] %-5p %c{2} - %m%n%throwable"
55+
charset="UTF-8"/>
56+
<TimeBasedTriggeringPolicy/>
57+
<DefaultRolloverStrategy/>
58+
</RollingFile>
59+
60+
<RollingFile name="NO-USAGE-APPENDER" fileName="${ctx:logging.file.path}/no-usage/no-usage.log"
61+
filePattern="${ctx:logging.file.path}/no-usage/no-usage.log.%d{yyyy-MM-dd}"
62+
append="true">
63+
<PatternLayout
64+
pattern="%d [%X{traceId} %X{rpcId} - %X{loginUserEmail}/%X{loginUserID}/%X{remoteAddr}/%X{clientId} - %X{requestURIWithQueryString}] %-5p %c{2} - %m%n%throwable"
65+
charset="UTF-8"/>
66+
<TimeBasedTriggeringPolicy/>
67+
<DefaultRolloverStrategy/>
68+
</RollingFile>
69+
</Appenders>
70+
71+
<Loggers>
72+
<AsyncLogger name="STDOUT" additivity="false" level="info">
73+
<AppenderRef ref="STDOUT-APPENDER"/>
74+
</AsyncLogger>
75+
76+
<AsyncLogger name="STDERR" additivity="false" level="${ctx:logging.level.com.alipay.sofa.rpc.dubbo26}">
77+
<AppenderRef ref="STDERR-APPENDER"/>
78+
</AsyncLogger>
79+
80+
<AsyncLogger name="com.alipay.sofa.rpc.dubbo26" additivity="false" level="${ctx:logging.level.com.alipay.sofa.rpc.dubbo26}">
81+
<AppenderRef ref="APP-DEFAULT-APPENDER"/>
82+
<AppenderRef ref="WARN-APPENDER"/>
83+
<AppenderRef ref="ERROR-APPENDER"/>
84+
<AppenderRef ref="STDOUT-APPENDER"/>
85+
</AsyncLogger>
86+
87+
<AsyncLogger name="org.springframework" additivity="false"
88+
level="${ctx:logging.level.com.alipay.sofa.rpc.dubbo26}">
89+
<AppenderRef ref="ERROR-APPENDER"/>
90+
<AppenderRef ref="WARN-APPENDER"/>
91+
<AppenderRef ref="SPRING-APPENDER"/>
92+
<AppenderRef ref="STDOUT-APPENDER"/>
93+
</AsyncLogger>
94+
95+
<AsyncRoot level="${ctx:logging.level.com.alipay.sofa.rpc.dubbo26}">
96+
<AppenderRef ref="APP-DEFAULT-APPENDER"/>
97+
<AppenderRef ref="WARN-APPENDER"/>
98+
<AppenderRef ref="ERROR-APPENDER"/>
99+
<AppenderRef ref="STDOUT-APPENDER"/>
100+
</AsyncRoot>
101+
</Loggers>
102+
</Configuration>

‎samples/dubbo-samples/rpc/dubbo26/dubbo26biz2/pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,6 @@
3535
<artifactId>spring-boot-starter-test</artifactId>
3636
<scope>test</scope>
3737
</dependency>
38-
<dependency>
39-
<groupId>com.alipay.sofa.serverless</groupId>
40-
<artifactId>sofa-serverless-adapter-log4j2</artifactId>
41-
<version>${sofa.serverless.runtime.version}</version>
42-
<scope>provided</scope>
43-
</dependency>
4438
<dependency>
4539
<groupId>org.projectlombok</groupId>
4640
<artifactId>lombok</artifactId>
@@ -57,7 +51,7 @@
5751
<plugin>
5852
<groupId>com.alipay.sofa</groupId>
5953
<artifactId>sofa-ark-maven-plugin</artifactId>
60-
<version>2.2.3</version>
54+
<version>${sofa.ark.version}</version>
6155
<executions>
6256
<execution>
6357
<id>default-cli</id>
@@ -78,4 +72,4 @@
7872
</build>
7973

8074

81-
</project>
75+
</project>

‎samples/dubbo-samples/rpc/dubbo26/dubbo26biz2/src/main/resources/application.properties‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
spring.application.name=biz2
2+
logging.file.path=./samples/dubbo-samples/rpc/dubbo26/logs/
3+
logging.level.com.alipay.sofa.rpc.grpc=DEBUG
4+
logging.level.root=INFO
5+
logging.level.com.alipay.sofa.arklet=INFO
6+
#logging.config=classpath:log4j2-spring.xml
7+
8+
dubbo.application.logger=slf4j
9+
dubbo.application.name=biz2
10+
dubbo.consumer.serialization=java
11+
dubbo.provider.serialization=java

‎samples/dubbo-samples/rpc/dubbo26/dubbo26biz2/src/main/resources/log4j2-spring.xml‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Configuration>
3+
<Appenders>
4+
<Console name="STDOUT-APPENDER" target="SYSTEM_OUT">
5+
<PatternLayout pattern="%-5p %c{2} - %m%n%throwable" charset="UTF-8"/>
6+
</Console>
7+
8+
<Console name="STDERR-APPENDER" target="SYSTEM_ERR">
9+
<PatternLayout pattern="%-5p %c{2} - %m%n%throwable" charset="UTF-8"/>
10+
</Console>
11+
12+
<RollingFile name="ERROR-APPENDER"
13+
fileName="${ctx:logging.file.path}/${ctx:spring.application.name}/common-error.log"
14+
filePattern="${ctx:logging.file.path}/${ctx:spring.application.name}/common-error.log.%d{yyyy-MM-dd}"
15+
append="true">
16+
<PatternLayout
17+
pattern="%d [%X{traceId} %X{rpcId} - %X{loginUserEmail}/%X{loginUserID}/%X{remoteAddr}/%X{clientId} - %X{requestURIWithQueryString}] %-5p %c{2} - %m%n%throwable"
18+
charset="UTF-8"/>
19+
<TimeBasedTriggeringPolicy/>
20+
<DefaultRolloverStrategy/>
21+
<ThresholdFilter level="ERROR"/>
22+
</RollingFile>
23+
24+
<RollingFile name="WARN-APPENDER"
25+
fileName="${ctx:logging.file.path}/${ctx:spring.application.name}/common-warn.log"
26+
filePattern="${ctx:logging.file.path}/${ctx:spring.application.name}/common-warn.log.%d{yyyy-MM-dd}"
27+
append="true">
28+
<PatternLayout
29+
pattern="%d [%X{traceId} %X{rpcId} - %X{loginUserEmail}/%X{loginUserID}/%X{remoteAddr}/%X{clientId} - %X{requestURIWithQueryString}] %-5p %c{2} - %m%n%throwable"
30+
charset="UTF-8"/>
31+
<TimeBasedTriggeringPolicy/>
32+
<DefaultRolloverStrategy/>
33+
<Filters>
34+
<ThresholdFilter level="ERROR" onMatch="DENY" onMismatch="NEUTRAL"/>
35+
<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
36+
</Filters>
37+
</RollingFile>
38+
39+
<RollingFile name="APP-DEFAULT-APPENDER"
40+
fileName="${ctx:logging.file.path}/${ctx:spring.application.name}/app-default.log"
41+
filePattern="${ctx:logging.file.path}/${ctx:spring.application.name}/app-default.log.%d{yyyy-MM-dd-HH}"
42+
append="true">
43+
<PatternLayout
44+
pattern="%d [%X{traceId} %X{rpcId} - %X{loginUserEmail}/%X{loginUserID}/%X{remoteAddr}/%X{clientId} - %X{requestURIWithQueryString}] %-5p %c{2} - %m%n%throwable"
45+
charset="UTF-8"/>
46+
<TimeBasedTriggeringPolicy/>
47+
<DefaultRolloverStrategy/>
48+
</RollingFile>
49+
50+
<RollingFile name="SPRING-APPENDER" fileName="${ctx:logging.file.path}/spring/spring.log"
51+
filePattern="${ctx:logging.file.path}/spring/spring.log.%d{yyyy-MM-dd}"
52+
append="true">
53+
<PatternLayout
54+
pattern="%d [%X{traceId} %X{rpcId} - %X{loginUserEmail}/%X{loginUserID}/%X{remoteAddr}/%X{clientId} - %X{requestURIWithQueryString}] %-5p %c{2} - %m%n%throwable"
55+
charset="UTF-8"/>
56+
<TimeBasedTriggeringPolicy/>
57+
<DefaultRolloverStrategy/>
58+
</RollingFile>
59+
60+
<RollingFile name="NO-USAGE-APPENDER" fileName="${ctx:logging.file.path}/no-usage/no-usage.log"
61+
filePattern="${ctx:logging.file.path}/no-usage/no-usage.log.%d{yyyy-MM-dd}"
62+
append="true">
63+
<PatternLayout
64+
pattern="%d [%X{traceId} %X{rpcId} - %X{loginUserEmail}/%X{loginUserID}/%X{remoteAddr}/%X{clientId} - %X{requestURIWithQueryString}] %-5p %c{2} - %m%n%throwable"
65+
charset="UTF-8"/>
66+
<TimeBasedTriggeringPolicy/>
67+
<DefaultRolloverStrategy/>
68+
</RollingFile>
69+
</Appenders>
70+
71+
<Loggers>
72+
<AsyncLogger name="STDOUT" additivity="false" level="info">
73+
<AppenderRef ref="STDOUT-APPENDER"/>
74+
</AsyncLogger>
75+
76+
<AsyncLogger name="STDERR" additivity="false" level="${ctx:logging.level.com.alipay.sofa.rpc.dubbo26}">
77+
<AppenderRef ref="STDERR-APPENDER"/>
78+
</AsyncLogger>
79+
80+
<AsyncLogger name="com.alipay.sofa.rpc.dubbo26" additivity="false" level="${ctx:logging.level.com.alipay.sofa.rpc.dubbo26}">
81+
<AppenderRef ref="APP-DEFAULT-APPENDER"/>
82+
<AppenderRef ref="WARN-APPENDER"/>
83+
<AppenderRef ref="ERROR-APPENDER"/>
84+
<AppenderRef ref="STDOUT-APPENDER"/>
85+
</AsyncLogger>
86+
87+
<AsyncLogger name="org.springframework" additivity="false"
88+
level="${ctx:logging.level.com.alipay.sofa.rpc.dubbo26}">
89+
<AppenderRef ref="ERROR-APPENDER"/>
90+
<AppenderRef ref="WARN-APPENDER"/>
91+
<AppenderRef ref="SPRING-APPENDER"/>
92+
<AppenderRef ref="STDOUT-APPENDER"/>
93+
</AsyncLogger>
94+
95+
<AsyncRoot level="${ctx:logging.level.com.alipay.sofa.rpc.dubbo26}">
96+
<AppenderRef ref="APP-DEFAULT-APPENDER"/>
97+
<AppenderRef ref="WARN-APPENDER"/>
98+
<AppenderRef ref="ERROR-APPENDER"/>
99+
<AppenderRef ref="STDOUT-APPENDER"/>
100+
</AsyncRoot>
101+
</Loggers>
102+
</Configuration>

‎samples/dubbo-samples/rpc/dubbo26/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<maven.compiler.target>8</maven.compiler.target>
2020
<dubbo.version>2.6.12</dubbo.version>
2121
<spring.boot.version>2.7.16</spring.boot.version>
22-
<sofa.ark.version>2.2.5</sofa.ark.version>
23-
<sofa.serverless.runtime.version>0.5.3</sofa.serverless.runtime.version>
22+
<sofa.ark.version>2.2.6-SNAPSHOT</sofa.ark.version>
23+
<sofa.serverless.runtime.version>0.5.6-SNAPSHOT</sofa.serverless.runtime.version>
2424
<disruptor.version>3.4.2</disruptor.version>
2525
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
2626
</properties>
@@ -144,4 +144,4 @@
144144
</profile>
145145
</profiles>
146146

147-
</project>
147+
</project>

‎samples/dubbo-samples/rpc/dubbo27/dubbo27base/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>com.alipay.sofa.serverless</groupId>
5757
<artifactId>sofa-serverless-adapter-dubbo27</artifactId>
58-
<version>0.5.1</version>
58+
<version>0.5.5</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>org.apache.dubbo</groupId>
@@ -120,4 +120,4 @@
120120
</plugins>
121121
</build>
122122

123-
</project>
123+
</project>

0 commit comments

Comments
 (0)