You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by gi...@apache.org on 2023/04/18 02:48:28 UTC
[dubbo] branch dependabot/maven/com.alibaba.nacos-nacos-client-2.2.2 updated (b3760cd85c -> 75561ed8e9)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch dependabot/maven/com.alibaba.nacos-nacos-client-2.2.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
discard b3760cd85c Bump nacos-client from 2.1.2 to 2.2.2
add 9e228013c1 Bump micrometer-bom from 1.10.5 to 1.10.6 (#12062)
add 3656697203 Bump micrometer-core from 1.10.5 to 1.10.6 (#12063)
add 6df3b9742d ✏️ request metrics type to counter (#11989)
add 718bdc1a65 feat: triple exception self (#12039)
add f0f01c36c3 Fix serializable check & Add test cases (#12054)
add 6b1de07b91 remove unused code (#11459)
add bc34399771 Merge branch 'apache-3.1' into apache-3.2
add 7e3064f9b6 Deny allow (#12068)
add ff4c1e8672 Fixed the observable collection thread pool indicator (#12087)
add 302f57c7ee bug fix (#12088)
add b81c141486 Refactor Metrics Key&Collector (#12083)
add 5cbd95b5d9 Prepare 3.2.0 release
add a7833d3096 Merge branch '3.2.0-release' into apache-3.2
add 07f0ff8688 Bump to 3.2.1-SNAPSHOT
add 5308cc81bf Fix tri headerfilter 3.1 (#12070)
add d73aca8847 Upgrade jprotoc and grpc version (#12086)
add 129b4fa2fd fix tri stub exception (#12093)
add 318614005d Prepare 3.0.15 release
add 65c6fff2f3 Merge branch '3.1.9-release' into apache-3.1
add d6e32f201b Bump to 3.1.10-SNAPSHOT
add 736d9965db Merge branch 'apache-3.1' into apache-3.2
add 559b13ae2e feat: add tracing starters && add zipkin auto configuration (#12013)
add 092cb55744 Bump jprotoc from 1.2.1 to 1.2.2 (#12100)
add f618016656 Bump protobuf-java from 3.22.2 to 3.22.3 (#12102)
add 6e787b0bcd Bump protobuf-java.version from 3.22.2 to 3.22.3 (#12101)
add 43bbf9f727 Refactor pb version (#12109)
add 2a86ae7d97 Bump grpc.version from 1.54.0 to 1.54.1 (#12108)
add 75561ed8e9 Bump nacos-client from 2.1.2 to 2.2.2
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (b3760cd85c)
\
N -- N -- N refs/heads/dependabot/maven/com.alibaba.nacos-nacos-client-2.2.2 (75561ed8e9)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.artifacts | 3 +
.../rpc/cluster/directory/AbstractDirectory.java | 14 +-
.../dubbo/common/constants/CommonConstants.java | 2 +
.../org/apache/dubbo/common/utils/ClassUtils.java | 100 ++--
.../utils/SerializeSecurityConfigurator.java | 2 +-
.../org/apache/dubbo/config/TracingConfig.java | 16 +
.../apache/dubbo/config/nested/ExporterConfig.java | 79 +++
.../org/apache/dubbo/rpc/model/PackableMethod.java | 22 +-
.../main/resources/security/serialize.allowlist | 6 +-
.../test/resources/security/serialize.allowlist | 2 +
.../config/deploy/DefaultApplicationDeployer.java | 8 +-
.../src/main/resources/META-INF/dubbo.xsd | 42 ++
.../dubbo-demo-spring-boot-consumer/pom.xml | 2 +-
.../dubbo-demo-spring-boot-provider/pom.xml | 2 +-
dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +-
dubbo-demo/dubbo-demo-triple/pom.xml | 8 +-
dubbo-dependencies-bom/pom.xml | 16 +-
.../dubbo-dependencies-zookeeper-curator5/pom.xml | 2 +-
.../dubbo-dependencies-zookeeper/pom.xml | 2 +-
dubbo-distribution/dubbo-bom/pom.xml | 15 +
.../org/apache/dubbo/metrics/MetricsConstants.java | 2 +
.../collector/ApplicationMetricsCollector.java | 10 +-
.../metrics/collector/CombMetricsCollector.java | 89 +++
.../dubbo/metrics/collector/MetricsCollector.java | 4 +-
.../collector/ServiceMetricsCollector.java} | 34 +-
.../apache/dubbo/metrics/event/MetricsEvent.java | 25 +-
.../dubbo/metrics/event/MetricsEventBus.java | 12 +-
.../metrics/event/MetricsEventMulticaster.java | 4 +-
.../event/SimpleMetricsEventMulticaster.java | 4 +-
.../metrics/listener/AbstractMetricsListener.java | 70 +++
.../listener/MetricsApplicationListener.java | 54 ++
.../metrics/listener/MetricsLifeListener.java | 4 +-
.../metrics/listener/MetricsServiceListener.java | 56 ++
.../dubbo/metrics/model/key/CategoryOverall.java} | 41 +-
.../apache/dubbo/metrics/model/key/MetricsCat.java | 54 ++
.../dubbo/metrics/model/key/MetricsKeyWrapper.java | 4 -
.../dubbo/metrics/model/key/TypeWrapper.java | 10 +-
.../event/SimpleMetricsEventMulticasterTest.java | 12 +-
.../metrics/filter/MethodMetricsInterceptor.java | 6 +-
.../metrics/metadata/MetadataMetricsConstants.java | 20 +-
.../collector/MetadataMetricsCollector.java | 55 +-
.../metrics/metadata/event/MetadataEvent.java | 53 +-
.../metrics/metadata/event/MetadataListener.java | 67 ---
.../event/MetadataMetricsEventMulticaster.java | 87 ++-
.../metrics/metadata/type/ApplicationType.java | 52 --
.../metadata/MetadataStatCompositeTest.java | 14 +-
.../metrics/registry/RegistryMetricsConstants.java | 34 +-
.../collector/RegistryMetricsCollector.java | 63 +--
.../metrics/registry/event/RegistryEvent.java | 82 +--
.../metrics/registry/event/RegistryListener.java | 67 ---
.../event/RegistryMetricsEventMulticaster.java | 141 +++--
.../metrics/registry/event/type/ServiceType.java | 50 --
.../collector/RegistryMetricsSampleTest.java | 7 +-
.../collector/RegistryStatCompositeTest.java | 12 +-
.../test/resources/security/serialize.allowlist | 3 +-
dubbo-plugin/dubbo-security/pom.xml | 2 +-
.../remoting/exchange/codec/ExchangeCodec.java | 2 +-
.../dubbo/remoting/codec/ExchangeCodecTest.java | 4 +
.../test/resources/security/serialize.allowlist | 3 +-
.../test/resources/security/serialize.allowlist | 3 +-
.../test/resources/security/serialize.allowlist | 3 +-
.../dubbo/rpc/stub/UnaryStubMethodHandler.java | 6 +-
.../test/resources/security/serialize.allowlist | 3 +-
.../test/resources/security/serialize.allowlist | 3 +-
dubbo-rpc/dubbo-rpc-triple/pom.xml | 14 +-
.../rpc/protocol/tri/ReflectionPackableMethod.java | 15 +-
.../dubbo/rpc/protocol/tri/TripleHeaderEnum.java | 2 +
.../rpc/protocol/tri/call/AbstractServerCall.java | 30 +-
.../dubbo/rpc/protocol/tri/call/ClientCall.java | 2 +-
.../call/ObserverToClientCallListenerAdapter.java | 2 +-
.../rpc/protocol/tri/call/TripleClientCall.java | 14 +-
.../protocol/tri/call/UnaryClientCallListener.java | 4 +-
.../protocol/tri/call/UnaryServerCallListener.java | 15 +-
.../tri/observer/ServerCallToObserverAdapter.java | 25 +
.../rpc/protocol/tri/stream/ClientStream.java | 2 +-
.../rpc/protocol/tri/stream/ServerStream.java | 2 +-
.../dubbo/rpc/protocol/tri/stream/Stream.java | 2 +-
.../protocol/tri/stream/TripleClientStream.java | 24 +-
.../protocol/tri/stream/TripleServerStream.java | 9 +-
.../TripleHttp2ClientResponseHandler.java | 1 -
.../dubbo/rpc/protocol/tri/ExceptionUtilsTest.java | 9 +-
.../dubbo/rpc/protocol/tri/PbUnpackTest.java | 10 +-
.../tri/call/ReflectionServerCallTest.java | 2 +-
.../rpc/protocol/tri/call/StubServerCallTest.java | 2 +-
.../tri/stream/MockClientStreamListener.java | 2 +-
.../dubbo/rpc/protocol/tri/support/IGreeter2.java | 2 +
.../rpc/protocol/tri/support/IGreeter2Impl.java | 5 +
.../test/resources/security/serialize.allowlist | 3 +-
.../apache/dubbo/common/serialize/ObjectInput.java | 4 +-
.../dubbo/common/serialize/ObjectOutput.java | 4 +-
.../dubbo-serialization-fastjson2/pom.xml | 1 -
.../serialize/fastjson2/FastJson2ObjectInput.java | 32 +-
.../src/test/java/com/example/test/TestPojo.java | 36 +-
.../fastjson2/FastJson2SerializationTest.java | 583 +++++++++++++++++++
.../fastjson2/TrustedNotSerializable.java | 25 +-
.../common/serialize/fastjson2/TrustedPojo.java | 26 +-
.../common/serialize/fastjson2/TrustedPojo2.java | 26 +-
.../common/serialize/fastjson2/TypeMatchTest.java | 159 ++++++
.../test/resources/security/serialize.allowlist | 3 +-
.../serialize/hessian2/Hessian2FactoryManager.java | 7 +
.../hessian2/Hessian2ScopeModelInitializer.java | 2 +
.../hessian2/Hessian2SerializerFactory.java | 2 +-
.../src/test/java/com/example/test/TestPojo.java | 36 +-
.../hessian2/Hessian2SerializationTest.java | 615 +++++++++++++++++++++
.../serialize/hessian2/TrustedNotSerializable.java | 25 +-
.../common/serialize/hessian2/TrustedPojo.java | 26 +-
.../common/serialize/hessian2/TrustedPojo2.java | 26 +-
.../common/serialize/hessian2/TypeMatchTest.java | 162 ++++++
.../test/resources/security/serialize.allowlist | 3 +-
.../pom.xml | 92 ++-
.../DubboMicrometerTracingAutoConfiguration.java | 9 +-
.../DubboObservationAutoConfiguration.java | 12 +-
.../autoconfigure/ObservabilityUtils.java | 6 +-
.../autoconfigure/ObservationHandlerGrouping.java | 0
.../ObservationRegistryPostProcessor.java | 11 +-
.../ConditionalOnDubboTracingEnable.java | 15 +-
.../brave/BraveAutoConfiguration.java | 27 +-
.../autoconfigure/exporter/zipkin/HttpSender.java | 145 +++++
.../exporter/zipkin/ZipkinAutoConfiguration.java | 60 ++
.../exporter/zipkin/ZipkinConfigurations.java | 171 ++++++
.../exporter/zipkin/ZipkinRestTemplateSender.java | 76 +++
.../exporter/zipkin/ZipkinWebClientSender.java | 84 +++
.../ZipkinRestTemplateBuilderCustomizer.java | 31 +-
.../ZipkinWebClientBuilderCustomizer.java | 23 +-
.../otel/OpenTelemetryAutoConfiguration.java | 3 +-
.../src/main/resources/META-INF/spring.factories | 3 +-
...rk.boot.autoconfigure.AutoConfiguration.imports | 1 +
...bboMicrometerTracingAutoConfigurationTests.java | 165 ++++++
.../pom.xml | 49 ++
.../pom.xml | 49 ++
.../pom.xml | 87 ++-
dubbo-test/dubbo-dependencies-all/pom.xml | 10 +-
dubbo-xds/pom.xml | 15 +-
pom.xml | 8 +-
134 files changed, 3795 insertions(+), 1034 deletions(-)
create mode 100644 dubbo-common/src/main/java/org/apache/dubbo/config/nested/ExporterConfig.java
create mode 100644 dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/collector/CombMetricsCollector.java
rename dubbo-metrics/{dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/event/type/ApplicationType.java => dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/collector/ServiceMetricsCollector.java} (56%)
create mode 100644 dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/listener/AbstractMetricsListener.java
create mode 100644 dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/listener/MetricsApplicationListener.java
create mode 100644 dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/listener/MetricsServiceListener.java
rename dubbo-metrics/{dubbo-metrics-metadata/src/main/java/org/apache/dubbo/metrics/metadata/type/ServiceType.java => dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/key/CategoryOverall.java} (52%)
create mode 100644 dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/model/key/MetricsCat.java
delete mode 100644 dubbo-metrics/dubbo-metrics-metadata/src/main/java/org/apache/dubbo/metrics/metadata/event/MetadataListener.java
delete mode 100644 dubbo-metrics/dubbo-metrics-metadata/src/main/java/org/apache/dubbo/metrics/metadata/type/ApplicationType.java
delete mode 100644 dubbo-metrics/dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/event/RegistryListener.java
delete mode 100644 dubbo-metrics/dubbo-metrics-registry/src/main/java/org/apache/dubbo/metrics/registry/event/type/ServiceType.java
copy {dubbo-common => dubbo-plugin/dubbo-qos}/src/test/resources/security/serialize.allowlist (94%)
copy {dubbo-common => dubbo-remoting/dubbo-remoting-api}/src/test/resources/security/serialize.allowlist (94%)
copy {dubbo-common => dubbo-remoting/dubbo-remoting-netty}/src/test/resources/security/serialize.allowlist (94%)
copy {dubbo-common => dubbo-remoting/dubbo-remoting-netty4}/src/test/resources/security/serialize.allowlist (94%)
copy {dubbo-common => dubbo-rpc/dubbo-rpc-api}/src/test/resources/security/serialize.allowlist (94%)
copy {dubbo-common => dubbo-rpc/dubbo-rpc-dubbo}/src/test/resources/security/serialize.allowlist (94%)
copy {dubbo-common => dubbo-rpc/dubbo-rpc-triple}/src/test/resources/security/serialize.allowlist (94%)
copy dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/stream/MockClientStreamListener.java => dubbo-serialization/dubbo-serialization-fastjson2/src/test/java/com/example/test/TestPojo.java (59%)
create mode 100644 dubbo-serialization/dubbo-serialization-fastjson2/src/test/java/org/apache/dubbo/common/serialize/fastjson2/FastJson2SerializationTest.java
copy dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/support/IGreeter2Impl.java => dubbo-serialization/dubbo-serialization-fastjson2/src/test/java/org/apache/dubbo/common/serialize/fastjson2/TrustedNotSerializable.java (59%)
copy dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/support/IGreeter2Impl.java => dubbo-serialization/dubbo-serialization-fastjson2/src/test/java/org/apache/dubbo/common/serialize/fastjson2/TrustedPojo.java (58%)
copy dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/support/IGreeter2Impl.java => dubbo-serialization/dubbo-serialization-fastjson2/src/test/java/org/apache/dubbo/common/serialize/fastjson2/TrustedPojo2.java (58%)
create mode 100644 dubbo-serialization/dubbo-serialization-fastjson2/src/test/java/org/apache/dubbo/common/serialize/fastjson2/TypeMatchTest.java
copy {dubbo-common => dubbo-serialization/dubbo-serialization-fastjson2}/src/test/resources/security/serialize.allowlist (94%)
copy dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/stream/MockClientStreamListener.java => dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/example/test/TestPojo.java (59%)
create mode 100644 dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/serialize/hessian2/Hessian2SerializationTest.java
copy dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/support/IGreeter2Impl.java => dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/serialize/hessian2/TrustedNotSerializable.java (59%)
copy dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/support/IGreeter2Impl.java => dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/serialize/hessian2/TrustedPojo.java (58%)
copy dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/support/IGreeter2Impl.java => dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/serialize/hessian2/TrustedPojo2.java (58%)
create mode 100644 dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/serialize/hessian2/TypeMatchTest.java
copy {dubbo-common => dubbo-serialization/dubbo-serialization-hessian2}/src/test/resources/security/serialize.allowlist (94%)
copy dubbo-spring-boot/dubbo-spring-boot-observability-starter/{ => dubbo-spring-boot-observability-autoconfigure}/pom.xml (60%)
rename dubbo-spring-boot/dubbo-spring-boot-observability-starter/{ => dubbo-spring-boot-observability-autoconfigure}/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboMicrometerTracingAutoConfiguration.java (94%)
rename dubbo-spring-boot/dubbo-spring-boot-observability-starter/{ => dubbo-spring-boot-observability-autoconfigure}/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/DubboObservationAutoConfiguration.java (95%)
rename dubbo-spring-boot/dubbo-spring-boot-observability-starter/{ => dubbo-spring-boot-observability-autoconfigure}/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservabilityUtils.java (91%)
rename dubbo-spring-boot/dubbo-spring-boot-observability-starter/{ => dubbo-spring-boot-observability-autoconfigure}/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservationHandlerGrouping.java (100%)
rename dubbo-spring-boot/dubbo-spring-boot-observability-starter/{ => dubbo-spring-boot-observability-autoconfigure}/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/ObservationRegistryPostProcessor.java (87%)
rename dubbo-spring-boot/dubbo-spring-boot-observability-starter/{src/main/java/org/apache/dubbo/spring/boot/observability => dubbo-spring-boot-observability-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure}/annotation/ConditionalOnDubboTracingEnable.java (70%)
rename dubbo-spring-boot/dubbo-spring-boot-observability-starter/{ => dubbo-spring-boot-observability-autoconfigure}/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/brave/BraveAutoConfiguration.java (88%)
create mode 100644 dubbo-spring-boot/dubbo-spring-boot-observability-starter/dubbo-spring-boot-observability-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java
create mode 100644 dubbo-spring-boot/dubbo-spring-boot-observability-starter/dubbo-spring-boot-observability-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinAutoConfiguration.java
create mode 100644 dubbo-spring-boot/dubbo-spring-boot-observability-starter/dubbo-spring-boot-observability-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java
create mode 100644 dubbo-spring-boot/dubbo-spring-boot-observability-starter/dubbo-spring-boot-observability-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java
create mode 100644 dubbo-spring-boot/dubbo-spring-boot-observability-starter/dubbo-spring-boot-observability-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java
copy dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/collector/MetricsCollector.java => dubbo-spring-boot/dubbo-spring-boot-observability-starter/dubbo-spring-boot-observability-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/customizer/ZipkinRestTemplateBuilderCustomizer.java (55%)
copy dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/support/IGreeter2.java => dubbo-spring-boot/dubbo-spring-boot-observability-starter/dubbo-spring-boot-observability-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/customizer/ZipkinWebClientBuilderCustomizer.java (58%)
rename dubbo-spring-boot/dubbo-spring-boot-observability-starter/{ => dubbo-spring-boot-observability-autoconfigure}/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/otel/OpenTelemetryAutoConfiguration.java (99%)
rename dubbo-spring-boot/dubbo-spring-boot-observability-starter/{ => dubbo-spring-boot-observability-autoconfigure}/src/main/resources/META-INF/spring.factories (77%)
rename dubbo-spring-boot/dubbo-spring-boot-observability-starter/{ => dubbo-spring-boot-observability-autoconfigure}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (79%)
create mode 100644 dubbo-spring-boot/dubbo-spring-boot-observability-starter/dubbo-spring-boot-observability-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/observability/autoconfigure/observability/DubboMicrometerTracingAutoConfigurationTests.java
create mode 100644 dubbo-spring-boot/dubbo-spring-boot-observability-starter/dubbo-spring-boot-tracing-brave-zipkin-starter/pom.xml
create mode 100644 dubbo-spring-boot/dubbo-spring-boot-observability-starter/dubbo-spring-boot-tracing-otel-zipkin-starter/pom.xml