From cf5f9db7855e4b18c716b52a7fd59fd764efa119 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Nov 2023 10:21:23 +0800 Subject: [PATCH 01/18] Bump protobuf-java_version from 3.25.0 to 3.25.1 (#13394) Bumps `protobuf-java_version` from 3.25.0 to 3.25.1. Updates `com.google.protobuf:protobuf-java` from 3.25.0 to 3.25.1 - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.25.0...v3.25.1) Updates `com.google.protobuf:protobuf-java-util` from 3.25.0 to 3.25.1 --- updated-dependencies: - dependency-name: com.google.protobuf:protobuf-java dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.google.protobuf:protobuf-java-util dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 3708f90e3f..962426c898 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -113,7 +113,7 @@ 3.5.5 0.19.0 4.0.66 - 3.25.0 + 3.25.1 1.3.2 3.1.0 9.4.53.v20231009 From dae5b1cf46a9bb1b5cbed72afee945e2a7f83dcd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Nov 2023 10:21:39 +0800 Subject: [PATCH 02/18] Bump io.projectreactor:reactor-core from 3.5.11 to 3.6.0 (#13391) Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.5.11 to 3.6.0. - [Release notes](https://github.com/reactor/reactor-core/releases) - [Commits](https://github.com/reactor/reactor-core/compare/v3.5.11...v3.6.0) --- updated-dependencies: - dependency-name: io.projectreactor:reactor-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 962426c898..1670b489d6 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -138,7 +138,7 @@ 3.3 0.16.0 1.0.4 - 3.5.11 + 3.6.0 2.2.21 3.14.9 From aff714e5bb7e1e8dafaea63657c7ea80354a0687 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Nov 2023 10:21:47 +0800 Subject: [PATCH 03/18] Bump jackson_version from 2.15.3 to 2.16.0 (#13388) Bumps `jackson_version` from 2.15.3 to 2.16.0. Updates `com.fasterxml.jackson.core:jackson-core` from 2.15.3 to 2.16.0 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.15.3...jackson-core-2.16.0) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.15.3 to 2.16.0 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.15.3 to 2.16.0 Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.15.3 to 2.16.0 - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 1670b489d6..ca53ed41fc 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -183,7 +183,7 @@ 2.0.6 5.4.3 2.10.1 - 2.15.3 + 2.16.0 6.1.26 2.0 1.5.0 From 77bf43d40c808a9d80c58f17f669a185a4fcd513 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Nov 2023 10:22:00 +0800 Subject: [PATCH 04/18] Bump org.testcontainers:testcontainers from 1.19.1 to 1.19.2 (#13389) Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.19.1 to 1.19.2. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.1...1.19.2) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-config/dubbo-config-api/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dubbo-config/dubbo-config-api/pom.xml b/dubbo-config/dubbo-config-api/pom.xml index 55643e4f8f..55d9a7cb7e 100644 --- a/dubbo-config/dubbo-config-api/pom.xml +++ b/dubbo-config/dubbo-config-api/pom.xml @@ -229,7 +229,7 @@ org.testcontainers testcontainers - 1.19.1 + 1.19.2 test diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index ca53ed41fc..2fdb331da6 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -173,7 +173,7 @@ 2.2.7 1.2.0 - 1.19.1 + 1.19.2 0.7.6 3.2.13 1.6.12 From 6378c144f8ddf0888b00d03308f225a1053f33c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Nov 2023 10:22:08 +0800 Subject: [PATCH 05/18] Bump io.opentelemetry:opentelemetry-bom from 1.31.0 to 1.32.0 (#13392) Bumps [io.opentelemetry:opentelemetry-bom](https://github.com/open-telemetry/opentelemetry-java) from 1.31.0 to 1.32.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.31.0...v1.32.0) --- updated-dependencies: - dependency-name: io.opentelemetry:opentelemetry-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../dubbo-spring-boot-starters/observability/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml index e26ad13a49..10b3e2746f 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml @@ -38,7 +38,7 @@ 1.11.5 1.1.6 - 1.31.0 + 1.32.0 2.16.4 0.16.0 From 883195aeb9c92fb7e7566846e8403906f9ae027e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Nov 2023 10:22:21 +0800 Subject: [PATCH 06/18] Bump io.micrometer:micrometer-bom from 1.11.5 to 1.12.0 (#13395) Bumps [io.micrometer:micrometer-bom](https://github.com/micrometer-metrics/micrometer) from 1.11.5 to 1.12.0. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.11.5...v1.12.0) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-dependencies-bom/pom.xml | 2 +- .../dubbo-spring-boot-starters/observability/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 2fdb331da6..f36b781520 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -132,7 +132,7 @@ 3.12.0 1.8.0 0.1.35 - 1.11.5 + 1.12.0 1.1.6 3.3 diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml index 10b3e2746f..be7d48a152 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml @@ -36,7 +36,7 @@ - 1.11.5 + 1.12.0 1.1.6 1.32.0 2.16.4 From 4d5d9d8afc5d6d05010b8915ec72bdf9418ef02b Mon Sep 17 00:00:00 2001 From: earthchen Date: Thu, 23 Nov 2023 12:49:16 +0800 Subject: [PATCH 07/18] fix tri stub unary method overload (#13385) * fix tri stub unary method overload * fix tri stub unary method overload * fix * fix * format * format --- .../resources/Dubbo3InterfaceStub.mustache | 14 +++---- .../Dubbo3TripleInterfaceStub.mustache | 29 ++++----------- .../main/resources/Dubbo3TripleStub.mustache | 37 +++++++++++++++---- 3 files changed, 44 insertions(+), 36 deletions(-) diff --git a/dubbo-compiler/src/main/resources/Dubbo3InterfaceStub.mustache b/dubbo-compiler/src/main/resources/Dubbo3InterfaceStub.mustache index ebbaad9f7d..d0d6684cdf 100644 --- a/dubbo-compiler/src/main/resources/Dubbo3InterfaceStub.mustache +++ b/dubbo-compiler/src/main/resources/Dubbo3InterfaceStub.mustache @@ -23,7 +23,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; {{#deprecated}} - @java.lang.Deprecated +@java.lang.Deprecated {{/deprecated}} public interface {{interfaceClassName}} extends org.apache.dubbo.rpc.model.DubboStub { @@ -35,10 +35,10 @@ public interface {{interfaceClassName}} extends org.apache.dubbo.rpc.model.Dubbo {{#unaryMethods}} {{#javaDoc}} - {{{javaDoc}}} + {{{javaDoc}}} {{/javaDoc}} {{#deprecated}} - @java.lang.Deprecated + @java.lang.Deprecated {{/deprecated}} {{outputType}} {{methodName}}({{inputType}} request); @@ -50,20 +50,20 @@ public interface {{interfaceClassName}} extends org.apache.dubbo.rpc.model.Dubbo {{#serverStreamingMethods}} {{#javaDoc}} - {{{javaDoc}}} + {{{javaDoc}}} {{/javaDoc}} {{#deprecated}} - @java.lang.Deprecated + @java.lang.Deprecated {{/deprecated}} void {{methodName}}({{inputType}} request, org.apache.dubbo.common.stream.StreamObserver<{{outputType}}> responseObserver); {{/serverStreamingMethods}} {{#biStreamingMethods}} {{#javaDoc}} - {{{javaDoc}}} + {{{javaDoc}}} {{/javaDoc}} {{#deprecated}} - @java.lang.Deprecated + @java.lang.Deprecated {{/deprecated}} org.apache.dubbo.common.stream.StreamObserver<{{inputType}}> {{methodName}}(org.apache.dubbo.common.stream.StreamObserver<{{outputType}}> responseObserver); {{/biStreamingMethods}} diff --git a/dubbo-compiler/src/main/resources/Dubbo3TripleInterfaceStub.mustache b/dubbo-compiler/src/main/resources/Dubbo3TripleInterfaceStub.mustache index 72b68c3d67..5c06c04d8f 100644 --- a/dubbo-compiler/src/main/resources/Dubbo3TripleInterfaceStub.mustache +++ b/dubbo-compiler/src/main/resources/Dubbo3TripleInterfaceStub.mustache @@ -16,7 +16,7 @@ */ {{#packageName}} - package {{packageName}}; +package {{packageName}}; {{/packageName}} import org.apache.dubbo.common.stream.StreamObserver; @@ -34,41 +34,26 @@ public interface {{interfaceClassName}} extends org.apache.dubbo.rpc.model.Dubbo {{#unaryMethods}} {{#javaDoc}} - {{{javaDoc}}} + {{{javaDoc}}} {{/javaDoc}} {{outputType}} {{methodName}}({{inputType}} request); - default CompletableFuture<{{outputType}}> {{methodName}}Async({{inputType}} request){ - return CompletableFuture.completedFuture({{methodName}}(request)); - } + CompletableFuture<{{outputType}}> {{methodName}}Async({{inputType}} request); + - /** - * This server stream type unary method is only used for generated stub to support async unary method. - * It will not be called if you are NOT using Dubbo3 generated triple stub and DO NOT implement this method. - */ - default void {{methodName}}({{inputType}} request, StreamObserver<{{outputType}}> responseObserver){ - {{methodName}}Async(request).whenComplete((r, t) -> { - if (t != null) { - responseObserver.onError(t); - } else { - responseObserver.onNext(r); - responseObserver.onCompleted(); - } - }); - } {{/unaryMethods}} {{#serverStreamingMethods}} {{#javaDoc}} - {{{javaDoc}}} + {{{javaDoc}}} {{/javaDoc}} void {{methodName}}({{inputType}} request, StreamObserver<{{outputType}}> responseObserver); {{/serverStreamingMethods}} {{#biStreamingWithoutClientStreamMethods}} {{#javaDoc}} - {{{javaDoc}}} + {{{javaDoc}}} {{/javaDoc}} StreamObserver<{{inputType}}> {{methodName}}(StreamObserver<{{outputType}}> responseObserver); {{/biStreamingWithoutClientStreamMethods}} @@ -76,7 +61,7 @@ public interface {{interfaceClassName}} extends org.apache.dubbo.rpc.model.Dubbo {{#clientStreamingMethods}} {{#javaDoc}} - {{{javaDoc}}} + {{{javaDoc}}} {{/javaDoc}} StreamObserver<{{inputType}}> {{methodName}}(StreamObserver<{{outputType}}> responseObserver); {{/clientStreamingMethods}} diff --git a/dubbo-compiler/src/main/resources/Dubbo3TripleStub.mustache b/dubbo-compiler/src/main/resources/Dubbo3TripleStub.mustache index af383bdcbc..4ecef4c333 100644 --- a/dubbo-compiler/src/main/resources/Dubbo3TripleStub.mustache +++ b/dubbo-compiler/src/main/resources/Dubbo3TripleStub.mustache @@ -16,7 +16,7 @@ */ {{#packageName}} - package {{packageName}}; +package {{packageName}}; {{/packageName}} import org.apache.dubbo.common.stream.StreamObserver; @@ -125,7 +125,7 @@ public final class {{className}} { {{#unaryMethods}} {{#javaDoc}} - {{{javaDoc}}} + {{{javaDoc}}} {{/javaDoc}} @Override public {{outputType}} {{methodName}}({{inputType}} request){ @@ -137,9 +137,8 @@ public final class {{className}} { } {{#javaDoc}} - {{{javaDoc}}} + {{{javaDoc}}} {{/javaDoc}} - @Override public void {{methodName}}({{inputType}} request, StreamObserver<{{outputType}}> responseObserver){ StubInvocationUtil.unaryCall(invoker, {{methodName}}Method , request, responseObserver); } @@ -147,7 +146,7 @@ public final class {{className}} { {{#serverStreamingMethods}} {{#javaDoc}} - {{{javaDoc}}} + {{{javaDoc}}} {{/javaDoc}} @Override public void {{methodName}}({{inputType}} request, StreamObserver<{{outputType}}> responseObserver){ @@ -157,7 +156,7 @@ public final class {{className}} { {{#biStreamingWithoutClientStreamMethods}} {{#javaDoc}} - {{{javaDoc}}} + {{{javaDoc}}} {{/javaDoc}} @Override public StreamObserver<{{inputType}}> {{methodName}}(StreamObserver<{{outputType}}> responseObserver){ @@ -167,7 +166,7 @@ public final class {{className}} { {{#clientStreamingMethods}} {{#javaDoc}} - {{{javaDoc}}} + {{{javaDoc}}} {{/javaDoc}} @Override public StreamObserver<{{inputType}}> {{methodName}}(StreamObserver<{{outputType}}> responseObserver){ @@ -193,6 +192,30 @@ public final class {{className}} { }; } + {{#unaryMethods}} + @Override + public CompletableFuture<{{outputType}}> {{methodName}}Async({{inputType}} request){ + return CompletableFuture.completedFuture({{methodName}}(request)); + } + {{/unaryMethods}} + + /** + * This server stream type unary method is only used for generated stub to support async unary method. + * It will not be called if you are NOT using Dubbo3 generated triple stub and DO NOT implement this method. + */ + {{#unaryMethods}} + public void {{methodName}}({{inputType}} request, StreamObserver<{{outputType}}> responseObserver){ + {{methodName}}Async(request).whenComplete((r, t) -> { + if (t != null) { + responseObserver.onError(t); + } else { + responseObserver.onNext(r); + responseObserver.onCompleted(); + } + }); + } + {{/unaryMethods}} + @Override public final Invoker<{{interfaceClassName}}> getInvoker(URL url) { PathResolver pathResolver = url.getOrDefaultFrameworkModel() From e63d275eb61db8eaac00f7474e6e76e19ac805d0 Mon Sep 17 00:00:00 2001 From: conghuhu <56248584+conghuhu@users.noreply.github.com> Date: Sat, 25 Nov 2023 01:53:00 -0600 Subject: [PATCH 08/18] Bump io.micrometer:micrometer-tracing-bom from 1.1.6 to 1.2.0 (#13397) chore: compatibility between two versions through the existence of classes --- dubbo-dependencies-bom/pom.xml | 2 +- .../otel/OpenTelemetryAutoConfiguration.java | 24 ++++++++++++++++--- .../observability/pom.xml | 2 +- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index f36b781520..0c5b2cc94d 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -134,7 +134,7 @@ 0.1.35 1.12.0 - 1.1.6 + 1.2.0 3.3 0.16.0 1.0.4 diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/otel/OpenTelemetryAutoConfiguration.java b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/otel/OpenTelemetryAutoConfiguration.java index de77636e39..4eba4950dc 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/otel/OpenTelemetryAutoConfiguration.java +++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/otel/OpenTelemetryAutoConfiguration.java @@ -17,6 +17,7 @@ package org.apache.dubbo.spring.boot.observability.autoconfigure.otel; import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.utils.ClassUtils; import org.apache.dubbo.config.ApplicationConfig; import org.apache.dubbo.rpc.model.ModuleModel; import org.apache.dubbo.spring.boot.autoconfigure.DubboConfigurationProperties; @@ -28,6 +29,7 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; +import io.opentelemetry.api.common.AttributeKey; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -93,13 +95,29 @@ public class OpenTelemetryAutoConfiguration { .getApplication() .map(ApplicationConfig::getName) .orElse(DEFAULT_APPLICATION_NAME); + // Due to https://github.com/micrometer-metrics/tracing/issues/343 + String RESOURCE_ATTRIBUTES_CLASS_NAME = "io.opentelemetry.semconv.ResourceAttributes"; + boolean isLowVersion = !ClassUtils.isPresent( + RESOURCE_ATTRIBUTES_CLASS_NAME, Thread.currentThread().getContextClassLoader()); + AttributeKey serviceNameAttributeKey = AttributeKey.stringKey("service.name"); + String SERVICE_NAME = "SERVICE_NAME"; + + if (isLowVersion) { + RESOURCE_ATTRIBUTES_CLASS_NAME = "io.opentelemetry.semconv.resource.attributes.ResourceAttributes"; + } + try { + serviceNameAttributeKey = (AttributeKey) ClassUtils.resolveClass( + RESOURCE_ATTRIBUTES_CLASS_NAME, + Thread.currentThread().getContextClassLoader()) + .getDeclaredField(SERVICE_NAME) + .get(null); + } catch (Throwable ignored) { + } io.opentelemetry.sdk.trace.SdkTracerProviderBuilder builder = io.opentelemetry.sdk.trace.SdkTracerProvider.builder() .setSampler(sampler) .setResource(io.opentelemetry.sdk.resources.Resource.create( - io.opentelemetry.api.common.Attributes.of( - io.opentelemetry.semconv.resource.attributes.ResourceAttributes.SERVICE_NAME, - applicationName))); + io.opentelemetry.api.common.Attributes.of(serviceNameAttributeKey, applicationName))); spanProcessors.orderedStream().forEach(builder::addSpanProcessor); return builder.build(); } diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml index be7d48a152..d37f4ca1f0 100644 --- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml +++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml @@ -37,7 +37,7 @@ 1.12.0 - 1.1.6 + 1.2.0 1.32.0 2.16.4 0.16.0 From d69ae9861befd520e10ccc43bb712343abe7c2c6 Mon Sep 17 00:00:00 2001 From: "Owen.Cai" <89424516@qq.com> Date: Wed, 29 Nov 2023 21:04:42 +0800 Subject: [PATCH 09/18] fix listener hash code error (#13408) Co-authored-by: caizhenqiu --- .../org/apache/dubbo/registry/nacos/NacosAggregateListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosAggregateListener.java b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosAggregateListener.java index e3e3a90c10..dbabcdc46c 100644 --- a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosAggregateListener.java +++ b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosAggregateListener.java @@ -98,6 +98,6 @@ public class NacosAggregateListener { @Override public int hashCode() { - return Objects.hash(notifyListener, serviceNames, serviceInstances); + return Objects.hash(notifyListener); } } From face8ae7f1bd5346ef822cfbeffc0553a9e82d8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 21:09:28 +0800 Subject: [PATCH 10/18] Bump org.springframework.boot:spring-boot-dependencies (#13418) Bumps [org.springframework.boot:spring-boot-dependencies](https://github.com/spring-projects/spring-boot) from 2.7.17 to 2.7.18. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.17...v2.7.18) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +- dubbo-spring-boot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dubbo-demo/dubbo-demo-spring-boot/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/pom.xml index 9e271e88d2..5ae0e10248 100644 --- a/dubbo-demo/dubbo-demo-spring-boot/pom.xml +++ b/dubbo-demo/dubbo-demo-spring-boot/pom.xml @@ -35,7 +35,7 @@ 8 8 true - 2.7.17 + 2.7.18 2.7.17 1.11.5 diff --git a/dubbo-spring-boot/pom.xml b/dubbo-spring-boot/pom.xml index b8a058b751..323c8e6db6 100644 --- a/dubbo-spring-boot/pom.xml +++ b/dubbo-spring-boot/pom.xml @@ -38,7 +38,7 @@ - 2.7.17 + 2.7.18 ${revision} 2.20.0 From 5b610f96bae7404a637c6c2881b21d4a20bfdc01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 21:09:41 +0800 Subject: [PATCH 11/18] Bump org.springframework.boot:spring-boot-starter-test (#13420) Bumps [org.springframework.boot:spring-boot-starter-test](https://github.com/spring-projects/spring-boot) from 2.7.17 to 2.7.18. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.17...v2.7.18) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter-test dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-config/dubbo-config-spring/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-config/dubbo-config-spring/pom.xml b/dubbo-config/dubbo-config-spring/pom.xml index ae060f846d..f158d7afcf 100644 --- a/dubbo-config/dubbo-config-spring/pom.xml +++ b/dubbo-config/dubbo-config-spring/pom.xml @@ -28,7 +28,7 @@ The spring config module of dubbo project false - 2.7.17 + 2.7.18 From 0cb30fe02d1fd3f17e447b2bc44b911c7615a74b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 21:09:58 +0800 Subject: [PATCH 12/18] Bump spring-boot.version from 2.7.17 to 2.7.18 (#13417) Bumps `spring-boot.version` from 2.7.17 to 2.7.18. Updates `org.springframework.boot:spring-boot-starter` from 2.7.17 to 2.7.18 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.17...v2.7.18) Updates `org.springframework.boot:spring-boot-autoconfigure` from 2.7.17 to 2.7.18 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.17...v2.7.18) Updates `org.springframework.boot:spring-boot-starter-logging` from 2.7.17 to 2.7.18 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.17...v2.7.18) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-starter dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-autoconfigure dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-starter-logging dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../dubbo-demo-spring-boot-consumer/pom.xml | 2 +- .../dubbo-demo-spring-boot-provider/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml index 996190443a..68bac8e175 100644 --- a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml @@ -30,7 +30,7 @@ 8 8 1.7.33 - 2.7.17 + 2.7.18 true diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml index 93d24ea333..43512cf660 100644 --- a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml @@ -30,7 +30,7 @@ 8 8 1.7.33 - 2.7.17 + 2.7.18 true From 2b06ac6838dcee9e075f6b8ecba3f253f3c96207 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 21:17:26 +0800 Subject: [PATCH 13/18] Bump net.bytebuddy:byte-buddy from 1.14.9 to 1.14.10 (#13424) Bumps [net.bytebuddy:byte-buddy](https://github.com/raphw/byte-buddy) from 1.14.9 to 1.14.10. - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.14.9...byte-buddy-1.14.10) --- updated-dependencies: - dependency-name: net.bytebuddy:byte-buddy dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 0c5b2cc94d..dd91de12ff 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -93,7 +93,7 @@ 5.3.25 5.8.8 3.29.2-GA - 1.14.9 + 1.14.10 3.2.10.Final 4.1.101.Final 2.2.1 From 01961a0e6ffe8411a417a7c96bf388660d9741a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 21:17:37 +0800 Subject: [PATCH 14/18] Bump org.testcontainers:testcontainers from 1.19.2 to 1.19.3 (#13422) Bumps [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) from 1.19.2 to 1.19.3. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.2...1.19.3) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-config/dubbo-config-api/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dubbo-config/dubbo-config-api/pom.xml b/dubbo-config/dubbo-config-api/pom.xml index 55d9a7cb7e..e0be936386 100644 --- a/dubbo-config/dubbo-config-api/pom.xml +++ b/dubbo-config/dubbo-config-api/pom.xml @@ -229,7 +229,7 @@ org.testcontainers testcontainers - 1.19.2 + 1.19.3 test diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index dd91de12ff..fd7fa4e541 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -173,7 +173,7 @@ 2.2.7 1.2.0 - 1.19.2 + 1.19.3 0.7.6 3.2.13 1.6.12 From 23044cee5aebd077888c8791bb5dda7c41130b10 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 21:18:07 +0800 Subject: [PATCH 15/18] Bump org.codehaus.mojo:build-helper-maven-plugin from 3.4.0 to 3.5.0 (#13423) Bumps [org.codehaus.mojo:build-helper-maven-plugin](https://github.com/mojohaus/build-helper-maven-plugin) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/mojohaus/build-helper-maven-plugin/releases) - [Commits](https://github.com/mojohaus/build-helper-maven-plugin/compare/3.4.0...3.5.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:build-helper-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0dfba65b80..6ea32aa8db 100644 --- a/pom.xml +++ b/pom.xml @@ -302,7 +302,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.4.0 + 3.5.0 org.fusesource.hawtjni From d38721f3e315149a8f8b9806aca9c56a793888b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 21:19:20 +0800 Subject: [PATCH 16/18] Bump org.springframework.boot:spring-boot-maven-plugin (#13419) Bumps [org.springframework.boot:spring-boot-maven-plugin](https://github.com/spring-projects/spring-boot) from 2.7.17 to 2.7.18. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.17...v2.7.18) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-demo/dubbo-demo-annotation/pom.xml | 2 +- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +- dubbo-demo/dubbo-demo-xml/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dubbo-demo/dubbo-demo-annotation/pom.xml b/dubbo-demo/dubbo-demo-annotation/pom.xml index 891cfabbf8..d881d55fdc 100644 --- a/dubbo-demo/dubbo-demo-annotation/pom.xml +++ b/dubbo-demo/dubbo-demo-annotation/pom.xml @@ -34,7 +34,7 @@ true - 2.7.17 + 2.7.18 diff --git a/dubbo-demo/dubbo-demo-api/pom.xml b/dubbo-demo/dubbo-demo-api/pom.xml index c469ffdef5..deaf2b0dbd 100644 --- a/dubbo-demo/dubbo-demo-api/pom.xml +++ b/dubbo-demo/dubbo-demo-api/pom.xml @@ -36,7 +36,7 @@ true - 2.7.17 + 2.7.18 diff --git a/dubbo-demo/dubbo-demo-spring-boot/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/pom.xml index 5ae0e10248..8bae0435f9 100644 --- a/dubbo-demo/dubbo-demo-spring-boot/pom.xml +++ b/dubbo-demo/dubbo-demo-spring-boot/pom.xml @@ -36,7 +36,7 @@ 8 true 2.7.18 - 2.7.17 + 2.7.18 1.11.5 diff --git a/dubbo-demo/dubbo-demo-xml/pom.xml b/dubbo-demo/dubbo-demo-xml/pom.xml index f24ac41aa6..4a061ac4e8 100644 --- a/dubbo-demo/dubbo-demo-xml/pom.xml +++ b/dubbo-demo/dubbo-demo-xml/pom.xml @@ -40,7 +40,7 @@ true - 2.7.17 + 2.7.18 From 5dd3861aacc67261553632b32a87daca010175af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 21:20:22 +0800 Subject: [PATCH 17/18] Bump bytebuddy.version from 1.14.9 to 1.14.10 (#13421) Bumps `bytebuddy.version` from 1.14.9 to 1.14.10. Updates `net.bytebuddy:byte-buddy` from 1.14.9 to 1.14.10 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.14.9...byte-buddy-1.14.10) Updates `net.bytebuddy:byte-buddy-agent` from 1.14.9 to 1.14.10 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.14.9...byte-buddy-1.14.10) --- updated-dependencies: - dependency-name: net.bytebuddy:byte-buddy dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: net.bytebuddy:byte-buddy-agent dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-spring-boot/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-spring-boot/pom.xml b/dubbo-spring-boot/pom.xml index 323c8e6db6..06e68f168f 100644 --- a/dubbo-spring-boot/pom.xml +++ b/dubbo-spring-boot/pom.xml @@ -43,7 +43,7 @@ 2.20.0 - 1.14.9 + 1.14.10 From 8ac2eaa326577b550f0559575e74f099f9288d8f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 10:01:33 +0800 Subject: [PATCH 18/18] Bump io.micrometer:micrometer-core from 1.11.5 to 1.12.0 (#13390) Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.11.5 to 1.12.0. - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.11.5...v1.12.0) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-demo/dubbo-demo-spring-boot/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/pom.xml index 8bae0435f9..109112302b 100644 --- a/dubbo-demo/dubbo-demo-spring-boot/pom.xml +++ b/dubbo-demo/dubbo-demo-spring-boot/pom.xml @@ -37,7 +37,7 @@ true 2.7.18 2.7.18 - 1.11.5 + 1.12.0