From ac69f196bc55078c0da0d3b1223e630309f55fc9 Mon Sep 17 00:00:00 2001 From: chickenlj Date: Sat, 8 Jun 2024 23:39:08 +0800 Subject: [PATCH 1/7] skip test --- 11-quickstart/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/11-quickstart/Dockerfile b/11-quickstart/Dockerfile index d68a30d8e3..f167e0a07e 100644 --- a/11-quickstart/Dockerfile +++ b/11-quickstart/Dockerfile @@ -7,7 +7,7 @@ WORKDIR /build COPY . /build RUN chmod +x ./mvnw -RUN ./mvnw clean package -U +RUN ./mvnw clean package -U -skipTests # JAR file will be specified by passing in a build time argument to docker build ARG APP_FILE From e4f7a7603c5f927b80c77a2f50ccd59db4b78c3b Mon Sep 17 00:00:00 2001 From: Ken Liu Date: Sat, 8 Jun 2024 23:41:56 +0800 Subject: [PATCH 2/7] Update Dockerfile --- 11-quickstart/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/11-quickstart/Dockerfile b/11-quickstart/Dockerfile index d68a30d8e3..f167e0a07e 100644 --- a/11-quickstart/Dockerfile +++ b/11-quickstart/Dockerfile @@ -7,7 +7,7 @@ WORKDIR /build COPY . /build RUN chmod +x ./mvnw -RUN ./mvnw clean package -U +RUN ./mvnw clean package -U -skipTests # JAR file will be specified by passing in a build time argument to docker build ARG APP_FILE From 010eaa7c28e639ffcf64da5578a57ef805d13fcd Mon Sep 17 00:00:00 2001 From: Ken Liu Date: Sat, 8 Jun 2024 23:45:39 +0800 Subject: [PATCH 3/7] Update Dockerfile --- 11-quickstart/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/11-quickstart/Dockerfile b/11-quickstart/Dockerfile index f167e0a07e..1149a98de6 100644 --- a/11-quickstart/Dockerfile +++ b/11-quickstart/Dockerfile @@ -7,7 +7,7 @@ WORKDIR /build COPY . /build RUN chmod +x ./mvnw -RUN ./mvnw clean package -U -skipTests +RUN ./mvnw clean package -U -DskipTests # JAR file will be specified by passing in a build time argument to docker build ARG APP_FILE From 6b5bc757429dfda8073b35769c07a7e66ea1ec92 Mon Sep 17 00:00:00 2001 From: Ken Liu Date: Sun, 9 Jun 2024 00:02:40 +0800 Subject: [PATCH 4/7] Update Dockerfile --- 11-quickstart/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/11-quickstart/Dockerfile b/11-quickstart/Dockerfile index 1149a98de6..0bdf435008 100644 --- a/11-quickstart/Dockerfile +++ b/11-quickstart/Dockerfile @@ -1,5 +1,5 @@ # This is the demo Dockerfile for the generated template project, please change accordingly before building image from it. -# Run the following command to build image: docker build -f ./Dockerfile --build-arg APP_FILE=demo-0.0.1-SNAPSHOT.jar -t demo:latest . +# Run the following command to build image: docker build -f ./Dockerfile --build-arg APP_FILE=quickstart-service--0.0.1-SNAPSHOT.jar -t demo:latest . FROM openjdk:17-jdk-alpine # Set the working directory to /build @@ -16,7 +16,7 @@ ARG APP_FILE EXPOSE 50051 # copy the JAR file into the root and rename -RUN cp ./target/${APP_FILE} app.jar +RUN cp ./quickstart-service/target/${APP_FILE} app.jar # Run java with the jar file when the container starts up CMD ["java","-jar","app.jar"] From b1bdde29f404e85ae6cacfd04dc13b6bd4093ab3 Mon Sep 17 00:00:00 2001 From: xiaozhigang <32813378+xiaozhigang@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:29:11 +0800 Subject: [PATCH 5/7] ObservationConfiguration add fix code (#1160) --- .../skywalking/consumer/ObservationConfiguration.java | 5 ++++- .../skywalking/demo/provider/ObservationConfiguration.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/4-governance/dubbo-samples-spring-boot-tracing-skywalking/dubbo-samples-spring-boot-tracing-skwalking-consumer/src/main/java/org/apache/dubbo/springboot/skywalking/consumer/ObservationConfiguration.java b/4-governance/dubbo-samples-spring-boot-tracing-skywalking/dubbo-samples-spring-boot-tracing-skwalking-consumer/src/main/java/org/apache/dubbo/springboot/skywalking/consumer/ObservationConfiguration.java index f3ce46ca71..e39bb7eede 100644 --- a/4-governance/dubbo-samples-spring-boot-tracing-skywalking/dubbo-samples-spring-boot-tracing-skwalking-consumer/src/main/java/org/apache/dubbo/springboot/skywalking/consumer/ObservationConfiguration.java +++ b/4-governance/dubbo-samples-spring-boot-tracing-skywalking/dubbo-samples-spring-boot-tracing-skwalking-consumer/src/main/java/org/apache/dubbo/springboot/skywalking/consumer/ObservationConfiguration.java @@ -25,14 +25,17 @@ import org.apache.skywalking.apm.toolkit.micrometer.observation.SkywalkingDefaultTracingHandler; import org.apache.skywalking.apm.toolkit.micrometer.observation.SkywalkingReceiverTracingHandler; import org.apache.skywalking.apm.toolkit.micrometer.observation.SkywalkingSenderTracingHandler; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration public class ObservationConfiguration { + @ConditionalOnBean(ObservationRegistry.class) @Bean - ApplicationModel applicationModel(ObservationRegistry observationRegistry) { + ApplicationModel applicationModel(@Autowired ObservationRegistry observationRegistry) { ApplicationModel applicationModel = ApplicationModel.defaultModel(); observationRegistry.observationConfig() .observationHandler(new ObservationHandler.FirstMatchingCompositeObservationHandler( diff --git a/4-governance/dubbo-samples-spring-boot-tracing-skywalking/dubbo-samples-spring-boot-tracing-skwalking-provider/src/main/java/org/apache/dubbo/springboot/skywalking/demo/provider/ObservationConfiguration.java b/4-governance/dubbo-samples-spring-boot-tracing-skywalking/dubbo-samples-spring-boot-tracing-skwalking-provider/src/main/java/org/apache/dubbo/springboot/skywalking/demo/provider/ObservationConfiguration.java index ef81645fc8..d7cd9b1f43 100644 --- a/4-governance/dubbo-samples-spring-boot-tracing-skywalking/dubbo-samples-spring-boot-tracing-skwalking-provider/src/main/java/org/apache/dubbo/springboot/skywalking/demo/provider/ObservationConfiguration.java +++ b/4-governance/dubbo-samples-spring-boot-tracing-skywalking/dubbo-samples-spring-boot-tracing-skwalking-provider/src/main/java/org/apache/dubbo/springboot/skywalking/demo/provider/ObservationConfiguration.java @@ -25,13 +25,16 @@ import org.apache.skywalking.apm.toolkit.micrometer.observation.SkywalkingDefaultTracingHandler; import org.apache.skywalking.apm.toolkit.micrometer.observation.SkywalkingReceiverTracingHandler; import org.apache.skywalking.apm.toolkit.micrometer.observation.SkywalkingSenderTracingHandler; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration public class ObservationConfiguration { + @ConditionalOnBean(ObservationRegistry.class) @Bean - ApplicationModel applicationModel(ObservationRegistry observationRegistry) { + ApplicationModel applicationModel(@Autowired ObservationRegistry observationRegistry) { ApplicationModel applicationModel = ApplicationModel.defaultModel(); observationRegistry.observationConfig() .observationHandler(new ObservationHandler.FirstMatchingCompositeObservationHandler( From 681c7a8ba3e38861bc8ca86f7a5681bf19c8e8d4 Mon Sep 17 00:00:00 2001 From: TomlongTK <1120170646@qq.com> Date: Tue, 11 Jun 2024 19:08:21 +0800 Subject: [PATCH 6/7] Reduce the size of the Response body, compatible with versions 3.2 and 3.3 (#1159) Co-authored-by: earthchen --- .../java/org/apache/dubbo/sample/tri/BaseTriPojoClientTest.java | 2 +- .../java/org/apache/dubbo/sample/tri/TriPojoClientTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/BaseTriPojoClientTest.java b/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/BaseTriPojoClientTest.java index f3404b0422..3539e83447 100644 --- a/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/BaseTriPojoClientTest.java +++ b/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/BaseTriPojoClientTest.java @@ -162,7 +162,7 @@ public void onNext(String data) { @Test public void greetLong() { - int power = 25; + int power = 23; for (int i = 0; i < power; i++) { final int len = (1 << i); final String response = longDelegate.greetLong(len); diff --git a/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/TriPojoClientTest.java b/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/TriPojoClientTest.java index ba2ce2844d..8f6227cba6 100644 --- a/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/TriPojoClientTest.java +++ b/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/TriPojoClientTest.java @@ -182,7 +182,7 @@ public void onNext(String data) { @Test public void greetLong() { - int power = 25; + int power = 23; for (int i = 0; i < power; i++) { final int len = (1 << i); final String response = longDelegate.greetLong(len); From 3374ffcfbc3b0659b40b133bec9f1781c24e6183 Mon Sep 17 00:00:00 2001 From: Sean Yang Date: Thu, 20 Jun 2024 09:31:46 +0800 Subject: [PATCH 7/7] Update jacoco version to 0.8.12 (#1161) --- test/dubbo-test-jacoco-merger/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/dubbo-test-jacoco-merger/pom.xml b/test/dubbo-test-jacoco-merger/pom.xml index 21c6996c8b..0574ad675a 100644 --- a/test/dubbo-test-jacoco-merger/pom.xml +++ b/test/dubbo-test-jacoco-merger/pom.xml @@ -32,7 +32,7 @@ org.jacoco org.jacoco.cli - 0.8.8 + 0.8.12 - \ No newline at end of file +