This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-samples.git
The following commit(s) were added to refs/heads/master by this push:
new fe64185 performance logs configuration (#131)
fe64185 is described below
commit fe641850bbced094fdb7a39b1cf8c1b8aab8f9bb
Author: liubao68 <[email protected]>
AuthorDate: Thu Nov 23 09:19:38 2023 +0800
performance logs configuration (#131)
---
.../consumer/src/main/resources/application.yml | 16 +++++++++++++++-
.../gateway/src/main/resources/application.yml | 15 ++++++++++++++-
.../provider/src/main/resources/application.yml | 16 +++++++++++++++-
.../consumer/src/main/resources/application.yml | 15 ++++++++++++++-
.../basic-3.0.x/consumer/src/main/resources/log4j2.xml | 12 ++++++------
.../gateway/src/main/resources/application.yml | 15 ++++++++++++++-
.../basic-3.0.x/gateway/src/main/resources/log4j2.xml | 12 ++++++------
java-chassis-benchmark/basic-3.0.x/pom.xml | 5 +++++
.../provider/src/main/resources/application.yml | 15 ++++++++++++++-
.../basic-3.0.x/provider/src/main/resources/log4j2.xml | 12 ++++++------
.../org/apache/servicecomb/samples/TestCaseService.java | 1 -
11 files changed, 109 insertions(+), 25 deletions(-)
diff --git
a/java-chassis-benchmark/basic-2.8.x/consumer/src/main/resources/application.yml
b/java-chassis-benchmark/basic-2.8.x/consumer/src/main/resources/application.yml
index 301f2c0..d607197 100644
---
a/java-chassis-benchmark/basic-2.8.x/consumer/src/main/resources/application.yml
+++
b/java-chassis-benchmark/basic-2.8.x/consumer/src/main/resources/application.yml
@@ -28,4 +28,18 @@ servicecomb:
address: http://localhost:30100
accesslog:
- enabled: false
+ enabled: true
+ metrics:
+ window_time: 60000
+ invocation:
+ latencyDistribution: 0,10,50,100,1000
+ Consumer.invocation.slow:
+ enabled: true
+ msTime: 300
+ Provider.invocation.slow:
+ enabled: true
+ msTime: 300
+ publisher.defaultLog:
+ enabled: true
+ endpoints.client.detail.enabled: true
+
diff --git
a/java-chassis-benchmark/basic-2.8.x/gateway/src/main/resources/application.yml
b/java-chassis-benchmark/basic-2.8.x/gateway/src/main/resources/application.yml
index 22b5fd5..f2ea096 100644
---
a/java-chassis-benchmark/basic-2.8.x/gateway/src/main/resources/application.yml
+++
b/java-chassis-benchmark/basic-2.8.x/gateway/src/main/resources/application.yml
@@ -28,7 +28,20 @@ servicecomb:
address: http://localhost:30100
accesslog:
- enabled: false
+ enabled: true
+ metrics:
+ window_time: 60000
+ invocation:
+ latencyDistribution: 0,10,50,100,1000
+ Consumer.invocation.slow:
+ enabled: true
+ msTime: 300
+ Provider.invocation.slow:
+ enabled: true
+ msTime: 300
+ publisher.defaultLog:
+ enabled: true
+ endpoints.client.detail.enabled: true
http:
dispatcher:
diff --git
a/java-chassis-benchmark/basic-2.8.x/provider/src/main/resources/application.yml
b/java-chassis-benchmark/basic-2.8.x/provider/src/main/resources/application.yml
index e9ad3ad..ffdc6b2 100644
---
a/java-chassis-benchmark/basic-2.8.x/provider/src/main/resources/application.yml
+++
b/java-chassis-benchmark/basic-2.8.x/provider/src/main/resources/application.yml
@@ -24,5 +24,19 @@ servicecomb:
address: 0.0.0.0:9093
registry:
address: http://localhost:30100
+
accesslog:
- enabled: false
+ enabled: true
+ metrics:
+ window_time: 60000
+ invocation:
+ latencyDistribution: 0,10,50,100,1000
+ Consumer.invocation.slow:
+ enabled: true
+ msTime: 300
+ Provider.invocation.slow:
+ enabled: true
+ msTime: 300
+ publisher.defaultLog:
+ enabled: true
+ endpoints.client.detail.enabled: true
diff --git
a/java-chassis-benchmark/basic-3.0.x/consumer/src/main/resources/application.yml
b/java-chassis-benchmark/basic-3.0.x/consumer/src/main/resources/application.yml
index 2883bd8..8a5fbf8 100644
---
a/java-chassis-benchmark/basic-3.0.x/consumer/src/main/resources/application.yml
+++
b/java-chassis-benchmark/basic-3.0.x/consumer/src/main/resources/application.yml
@@ -25,7 +25,20 @@ servicecomb:
address: 0.0.0.0:9092
accesslog:
- enabled: false
+ enabled: true
+ metrics:
+ window_time: 60000
+ invocation:
+ latencyDistribution: 0,10,50,100,1000
+ Consumer.invocation.slow:
+ enabled: true
+ msTime: 50
+ Provider.invocation.slow:
+ enabled: true
+ msTime: 50
+ publisher.defaultLog:
+ enabled: true
+ endpoints.client.detail.enabled: true
spring:
profiles:
diff --git
a/java-chassis-benchmark/basic-3.0.x/consumer/src/main/resources/log4j2.xml
b/java-chassis-benchmark/basic-3.0.x/consumer/src/main/resources/log4j2.xml
index 2c557a8..a2cf3b3 100644
--- a/java-chassis-benchmark/basic-3.0.x/consumer/src/main/resources/log4j2.xml
+++ b/java-chassis-benchmark/basic-3.0.x/consumer/src/main/resources/log4j2.xml
@@ -54,15 +54,15 @@
</Appenders>
<Loggers>
- <Logger name="scb-access" level="INFO" additivity="false">
+ <AsyncLogger name="scb-access" level="INFO" additivity="false">
<AppenderRef ref="AccessLog"/>
- </Logger>
- <Logger name="scb-metrics" level="INFO" additivity="false">
+ </AsyncLogger>
+ <AsyncLogger name="scb-metrics" level="INFO" additivity="false">
<AppenderRef ref="MetricsLog"/>
- </Logger>
- <Logger name="scb-slow" level="INFO" additivity="false">
+ </AsyncLogger>
+ <AsyncLogger name="scb-slow" level="INFO" additivity="false">
<AppenderRef ref="SlowLog"/>
- </Logger>
+ </AsyncLogger>
<Root level="INFO">
<AppenderRef ref="Console"/>
diff --git
a/java-chassis-benchmark/basic-3.0.x/gateway/src/main/resources/application.yml
b/java-chassis-benchmark/basic-3.0.x/gateway/src/main/resources/application.yml
index 65c9633..eec9039 100644
---
a/java-chassis-benchmark/basic-3.0.x/gateway/src/main/resources/application.yml
+++
b/java-chassis-benchmark/basic-3.0.x/gateway/src/main/resources/application.yml
@@ -25,7 +25,20 @@ servicecomb:
address: 0.0.0.0:9090?sslEnabled=false
accesslog:
- enabled: false
+ enabled: true
+ metrics:
+ window_time: 60000
+ invocation:
+ latencyDistribution: 0,10,50,100,1000
+ Consumer.invocation.slow:
+ enabled: true
+ msTime: 50
+ Provider.invocation.slow:
+ enabled: true
+ msTime: 50
+ publisher.defaultLog:
+ enabled: true
+ endpoints.client.detail.enabled: true
http:
dispatcher:
diff --git
a/java-chassis-benchmark/basic-3.0.x/gateway/src/main/resources/log4j2.xml
b/java-chassis-benchmark/basic-3.0.x/gateway/src/main/resources/log4j2.xml
index b24f8c5..f84453a 100644
--- a/java-chassis-benchmark/basic-3.0.x/gateway/src/main/resources/log4j2.xml
+++ b/java-chassis-benchmark/basic-3.0.x/gateway/src/main/resources/log4j2.xml
@@ -54,15 +54,15 @@
</Appenders>
<Loggers>
- <Logger name="scb-access" level="INFO" additivity="false">
+ <AsyncLogger name="scb-access" level="INFO" additivity="false">
<AppenderRef ref="AccessLog"/>
- </Logger>
- <Logger name="scb-metrics" level="INFO" additivity="false">
+ </AsyncLogger>
+ <AsyncLogger name="scb-metrics" level="INFO" additivity="false">
<AppenderRef ref="MetricsLog"/>
- </Logger>
- <Logger name="scb-slow" level="INFO" additivity="false">
+ </AsyncLogger>
+ <AsyncLogger name="scb-slow" level="INFO" additivity="false">
<AppenderRef ref="SlowLog"/>
- </Logger>
+ </AsyncLogger>
<Root level="INFO">
<AppenderRef ref="Console"/>
diff --git a/java-chassis-benchmark/basic-3.0.x/pom.xml
b/java-chassis-benchmark/basic-3.0.x/pom.xml
index cae0b82..245779b 100644
--- a/java-chassis-benchmark/basic-3.0.x/pom.xml
+++ b/java-chassis-benchmark/basic-3.0.x/pom.xml
@@ -69,6 +69,11 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.lmax</groupId>
+ <artifactId>disruptor</artifactId>
+ <version>3.4.4</version>
+ </dependency>
</dependencies>
<profiles>
diff --git
a/java-chassis-benchmark/basic-3.0.x/provider/src/main/resources/application.yml
b/java-chassis-benchmark/basic-3.0.x/provider/src/main/resources/application.yml
index cd8b9d4..5290995 100644
---
a/java-chassis-benchmark/basic-3.0.x/provider/src/main/resources/application.yml
+++
b/java-chassis-benchmark/basic-3.0.x/provider/src/main/resources/application.yml
@@ -24,7 +24,20 @@ servicecomb:
address: 0.0.0.0:9093
accesslog:
- enabled: false
+ enabled: true
+ metrics:
+ window_time: 60000
+ invocation:
+ latencyDistribution: 0,10,50,100,1000
+ Consumer.invocation.slow:
+ enabled: true
+ msTime: 50
+ Provider.invocation.slow:
+ enabled: true
+ msTime: 50
+ publisher.defaultLog:
+ enabled: true
+ endpoints.client.detail.enabled: true
spring:
profiles:
diff --git
a/java-chassis-benchmark/basic-3.0.x/provider/src/main/resources/log4j2.xml
b/java-chassis-benchmark/basic-3.0.x/provider/src/main/resources/log4j2.xml
index 3348204..b7e442a 100644
--- a/java-chassis-benchmark/basic-3.0.x/provider/src/main/resources/log4j2.xml
+++ b/java-chassis-benchmark/basic-3.0.x/provider/src/main/resources/log4j2.xml
@@ -54,15 +54,15 @@
</Appenders>
<Loggers>
- <Logger name="scb-access" level="INFO" additivity="false">
+ <AsyncLogger name="scb-access" level="INFO" additivity="false">
<AppenderRef ref="AccessLog"/>
- </Logger>
- <Logger name="scb-metrics" level="INFO" additivity="false">
+ </AsyncLogger>
+ <AsyncLogger name="scb-metrics" level="INFO" additivity="false">
<AppenderRef ref="MetricsLog"/>
- </Logger>
- <Logger name="scb-slow" level="INFO" additivity="false">
+ </AsyncLogger>
+ <AsyncLogger name="scb-slow" level="INFO" additivity="false">
<AppenderRef ref="SlowLog"/>
- </Logger>
+ </AsyncLogger>
<Root level="INFO">
<AppenderRef ref="Console"/>
diff --git
a/java-chassis-benchmark/test-tool/src/main/java/org/apache/servicecomb/samples/TestCaseService.java
b/java-chassis-benchmark/test-tool/src/main/java/org/apache/servicecomb/samples/TestCaseService.java
index 4ff9055..45f6b7d 100644
---
a/java-chassis-benchmark/test-tool/src/main/java/org/apache/servicecomb/samples/TestCaseService.java
+++
b/java-chassis-benchmark/test-tool/src/main/java/org/apache/servicecomb/samples/TestCaseService.java
@@ -88,7 +88,6 @@ public class TestCaseService {
CountDownLatch initLatch = new CountDownLatch(threadCount);
for (int i = 0; i < threadCount; i++) {
executor.submit(() -> {
- providerService.sayHello(wait, dataModel);
initLatch.countDown();
});
}
