update to release (#136)

apache · Dec 14, 2023 · a3f4b2e · a3f4b2e
1 parent 6206085
commit a3f4b2e
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 This project is samples for java-chassis 3.x.x. You can switch to other branches to see different samples.
 
 ## basic
-A sample shows a provider, a consumer and a gateway using java chassis. This sample uses service-center and kie. 
+A sample shows a provider, a consumer and a gateway using java chassis. 
 
 ## porter_lightweight
 A sample shows an application with basic login, download file, delete file functions. Read this [document](https://servicecomb.apache.org/references/java-chassis/zh_CN/featured-topics/application-porter.html) for details.

diff --git a/java-chassis-benchmark/README.md b/java-chassis-benchmark/README.md
@@ -1,3 +1,38 @@
+* 2023-12-5
+
+>>> Access Log enabled
+
+| 3.0.0 | 1    | 0    | 100  | 1000 | 20921   | 20    |
+|(0, 10)543|(10,20)69933||(20,50)27999||(50,100)527||(100,200)998||(200,500)0||(500,1000)0||(1000,1000000)0|
+|(0, 10)575|(10,20)73849||(20,50)23787||(50,100)769||(100,200)1020||(200,500)0||(500,1000)0||(1000,1000000)0|
+
+| 2022.0.x | 1    | 0    | 100  | 1000 | 29559   | 28    |
+|(0, 10)128|(10,20)7335||(20,50)89874||(50,100)1780||(100,200)803||(200,500)80||(500,1000)0||(1000,1000000)0|
+
+| 版本 | 数据单位 | 等待时间 | 线程数 | 执行次数 | 执行时间   | 平均时延 |
+|--|------|------|-----|------|--------|------|
+| 3.0.0 | 1    | 0    | 100  | 1000 | 20921   | 20    |
+| 3.0.0 | 1    | 0    | 10  | 1000 | 6086   | 6    |
+| 3.0.0 | 100  | 0    | 10  | 1000 | 24967  | 24   |
+| 3.0.0 | 1000 | 0    | 10  | 1000 | 270934  | 259   |
+| 3.0.0 | 1    | 10   | 10  | 1000 | 29154  | 28   |
+| 3.0.0 | 100  | 10   | 10  | 1000 | 37336  | 37   |
+| 3.0.0 | 1000 | 10   | 10  | 1000 | 284871  | 268   |
+| 3.0.0 | 1    | 100  | 10  | 1000 | 111200 | 111  |
+| 3.0.0 | 100  | 100  | 10  | 1000 | 126222 | 126  |
+| 3.0.0 | 1000 | 100  | 10  | 1000 | 237440 | 235  |
+| 2022.0.x | 1    | 0    | 100  | 1000 | 29722   | 28    |
+| 2022.0.x | 1    | 0    | 10  | 1000 | 7295   | 7    |
+| 2022.0.x | 100  | 0    | 10  | 1000 | 28654  | 28   |
+| 2022.0.x | 1000 | 0    | 10  | 1000 | 239507  | 233   |
+| 2022.0.x | 1    | 10   | 10  | 1000 | 31993  | 31   |
+| 2022.0.x | 100  | 10   | 10  | 1000 | 35729  | 34   |
+| 2022.0.x | 1000 | 10   | 10  | 1000 | 260272  | 248   |
+| 2022.0.x | 1    | 100  | 10  | 1000 | 111650 | 111  |
+| 2022.0.x | 100  | 100  | 10  | 1000 | 128651 | 128  |
+| 2022.0.x | 1000 | 100  | 10  | 1000 | 239977 | 237  |
+
+
 * 2023-11-16
 
 >>> Access Log not enabled

diff --git a/java-chassis-benchmark/basic-3.0.x/pom.xml b/java-chassis-benchmark/basic-3.0.x/pom.xml
@@ -31,7 +31,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <servicecomb.version>3.0.0-SNAPSHOT</servicecomb.version>
+    <servicecomb.version>3.0.0</servicecomb.version>
   </properties>
 
   <dependencyManagement>

diff --git a/java-chassis-benchmark/spring-cloud-2022.0.x/consumer/src/main/resources/bootstrap.yml b/java-chassis-benchmark/spring-cloud-2022.0.x/consumer/src/main/resources/bootstrap.yml
@@ -59,4 +59,6 @@ spring:
           customLabelValue: ${INSTANCE_TAG:default}
       metrics:
         logsEnabled: true
-        logsInterval: PT1M # Duration表达式，打印周期
+        logsInterval: PT1M # Duration表达式，打印周期
+      context:
+        enableTraceInfo: true
diff --git a/java-chassis-benchmark/spring-cloud-2022.0.x/gateway/src/main/resources/bootstrap.yml b/java-chassis-benchmark/spring-cloud-2022.0.x/gateway/src/main/resources/bootstrap.yml
@@ -59,4 +59,6 @@ spring:
           customLabelValue: ${INSTANCE_TAG:default}
       metrics:
         logsEnabled: true
-        logsInterval: PT1M # Duration表达式，打印周期
+        logsInterval: PT1M # Duration表达式，打印周期
+      context:
+        enableTraceInfo: true
diff --git a/java-chassis-benchmark/spring-cloud-2022.0.x/provider/src/main/resources/bootstrap.yml b/java-chassis-benchmark/spring-cloud-2022.0.x/provider/src/main/resources/bootstrap.yml
@@ -60,3 +60,5 @@ spring:
       metrics:
         logsEnabled: true
         logsInterval: PT1M # Duration表达式，打印周期
+      context:
+        enableTraceInfo: true
diff --git a/...sis-benchmark/test-tool/src/main/java/org/apache/servicecomb/samples/TestCaseService.java b/...sis-benchmark/test-tool/src/main/java/org/apache/servicecomb/samples/TestCaseService.java
@@ -73,7 +73,7 @@ private void registerMetrics() {
   }
 
   public void run(int threadCount, int countPerThread, int wait, int dataSize) throws Exception {
-    System.out.println(String.format("Preparing run ====%s/%s/%s/%s====", threadCount,
+    System.out.println(String.format("Preparing run ==== thread-count:%s threads:/%s wait:/%s size:/%s====", threadCount,
         countPerThread, wait, dataSize));
     DataModel dataModel = DataModel.create("test-case", dataSize);