This is an automated email from the ASF dual-hosted git repository. albumenj pushed a commit to branch dependabot/maven/fabric8_kubernetes_version-6.7.2 in repository https://gitbox.apache.org/repos/asf/dubbo.git
commit ba22019d28aef8b838c825b4c734882aa35782c8 Merge: 6084fcaa3d 2c82cf7dfc Author: Albumen Kevin <[email protected]> AuthorDate: Sun Jun 25 09:18:35 2023 +0800 Merge branch '3.2' into dependabot/maven/fabric8_kubernetes_version-6.7.2 .artifacts | 1 - dubbo-cluster/pom.xml | 5 + .../rpc/cluster/directory/AbstractDirectory.java | 10 +- .../rpc/cluster/directory/StaticDirectory.java | 4 +- .../filter/support}/ObservationSenderFilter.java | 23 +- ...g.apache.dubbo.rpc.cluster.filter.ClusterFilter | 1 + .../filter/AbstractObservationFilterTest.java | 8 +- .../filter/ObservationSenderFilterTest.java | 7 +- .../com/alibaba/dubbo/rpc/service/EchoService.java | 0 .../dubbo/rpc/service/GenericException.java | 34 +- .../alibaba/dubbo/rpc/service/GenericService.java | 2 +- .../common/constants/LoggerCodeConstants.java | 2 - .../dubbo/common/constants/RegisterTypeEnum.java | 31 +- .../dubbo/common/extension/ExtensionLoader.java | 5 +- .../dubbo/config/AbstractReferenceConfig.java | 3 + .../java/org/apache/dubbo/config/ModuleConfig.java | 3 + .../apache/dubbo/config/ReferenceConfigBase.java | 3 +- .../org/apache/dubbo/config/ServiceConfigBase.java | 25 +- .../apache/dubbo/config/nested/BaggageConfig.java | 25 - .../apache/dubbo/config/nested/ExporterConfig.java | 37 +- .../dubbo/config/nested/PropagationConfig.java | 7 - .../apache/dubbo/config/nested/SamplingConfig.java | 7 - .../apache/dubbo/rpc/service/GenericException.java | 141 +----- .../common/extension/ExtensionLoaderTest.java | 29 +- .../java/com/alibaba/dubbo/common/Constants.java | 541 ++++++++++++++++++++- .../java/com/alibaba/dubbo/rpc/Invocation.java | 6 +- .../java/com/alibaba/dubbo/rpc/RpcContext.java | 20 + .../java/com/alibaba/dubbo/rpc/RpcInvocation.java | 9 +- dubbo-config/dubbo-config-api/pom.xml | 6 - .../org/apache/dubbo/config/ServiceConfig.java | 97 ++-- .../config/deploy/DefaultApplicationDeployer.java | 117 ++--- .../dubbo/config/deploy/DefaultModuleDeployer.java | 5 +- .../dubbo/config/utils/ConfigValidationUtils.java | 3 +- .../apache/dubbo/config/AbstractConfigTest.java | 19 +- .../deploy/DefaultApplicationDeployerTest.java | 6 +- ...egistryCenterExportProviderIntegrationTest.java | 2 +- ...egistryCenterExportProviderIntegrationTest.java | 2 +- .../dubbo-demo-native-consumer/pom.xml | 2 +- .../dubbo-demo-native-provider/pom.xml | 2 +- dubbo-demo/dubbo-demo-spring-boot/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 27 +- dubbo-distribution/dubbo-all/pom.xml | 10 - dubbo-distribution/dubbo-bom/pom.xml | 7 - dubbo-distribution/dubbo-core-spi/pom.xml | 1 - .../report/identifier/MetadataIdentifier.java | 4 + .../report/support/AbstractMetadataReport.java | 2 +- dubbo-metrics/dubbo-metrics-api/pom.xml | 5 + .../org/apache/dubbo/metrics/aggregate/Pane.java | 0 .../dubbo/metrics/aggregate/SlidingWindow.java | 0 .../AbstractDefaultDubboObservationConvention.java | 16 +- .../DefaultDubboClientObservationConvention.java | 7 +- .../DefaultDubboServerObservationConvention.java | 4 +- .../metrics/observation}/DubboClientContext.java | 9 +- .../DubboClientObservationConvention.java | 4 +- .../DubboObservationDocumentation.java | 2 +- .../metrics/observation}/DubboServerContext.java | 5 +- .../DubboServerObservationConvention.java | 4 +- .../dubbo/metrics/utils/MetricsSupportUtil.java | 38 -- .../aggregate/TimeWindowAggregatorTest.java | 3 +- ...efaultDubboClientObservationConventionTest.java | 5 +- ...efaultDubboServerObservationConventionTest.java | 6 +- .../utils/ObservationConventionUtils.java | 2 +- dubbo-metrics/dubbo-metrics-default/pom.xml | 5 + .../observation}/ObservationReceiverFilter.java | 19 +- .../dubbo/internal/org.apache.dubbo.rpc.Filter | 2 + .../AbstractObservationFilterTest.java | 5 +- .../dubbo/metrics/observation}/MockInvocation.java | 6 +- .../ObservationReceiverFilterTest.java | 12 +- dubbo-metrics/dubbo-tracing/pom.xml | 111 ----- .../dubbo/tracing/DubboObservationRegistry.java | 90 ---- .../tracing/exporter/TraceExporterFactory.java | 66 --- .../dubbo/tracing/exporter/otlp/OTlpExporter.java | 66 --- .../tracing/exporter/zipkin/ZipkinExporter.java | 60 --- .../dubbo/tracing/tracer/PropagatorProvider.java | 29 -- .../tracing/tracer/PropagatorProviderFactory.java | 37 -- .../dubbo/tracing/tracer/TracerProvider.java | 30 -- .../tracing/tracer/TracerProviderFactory.java | 39 -- .../tracer/brave/BravePropagatorProvider.java | 31 -- .../dubbo/tracing/tracer/brave/BraveProvider.java | 41 -- .../tracer/otel/OTelPropagatorProvider.java | 38 -- .../tracing/tracer/otel/OpenTelemetryProvider.java | 212 -------- .../tracing/utils/ObservationSupportUtil.java | 49 -- .../dubbo/internal/org.apache.dubbo.rpc.Filter | 1 - ...g.apache.dubbo.rpc.cluster.filter.ClusterFilter | 1 - .../tracer/PropagatorProviderFactoryTest.java | 34 -- .../tracer/otel/OTelPropagatorProviderTest.java | 39 -- .../tracer/otel/OpenTelemetryProviderTest.java | 53 -- .../tracing/utils/ObservationSupportUtilTest.java | 49 -- dubbo-metrics/pom.xml | 1 - .../AuthenticationExceptionTranslatorFilter.java | 6 +- .../ContextHolderAuthenticationPrepareFilter.java | 8 +- .../ContextHolderAuthenticationResolverFilter.java | 6 +- .../model/SecurityScopeModelInitializer.java | 6 +- .../dubbo/spring/security/utils/SecurityNames.java | 2 + .../registry/RegistryScopeModelInitializer.java | 4 +- .../dubbo/registry/client/ServiceInstance.java | 1 + .../registry/integration/ExporterFactory.java | 42 ++ .../integration/ReferenceCountExporter.java | 62 +++ .../registry/integration/RegistryProtocol.java | 13 +- .../dubbo/registry/support/AbstractRegistry.java | 6 +- .../java/com/alibaba/dubbo/rpc/RpcException.java | 6 +- .../java/org/apache/dubbo/rpc/AppResponse.java | 7 + .../main/java/org/apache/dubbo/rpc/Invocation.java | 12 +- .../java/org/apache/dubbo/rpc/PathResolver.java | 4 +- .../org/apache/dubbo/rpc/filter/GenericFilter.java | 4 +- .../dubbo/rpc/protocol/injvm/InjvmInvoker.java | 31 +- .../dubbo/rpc/protocol/injvm/DemoService.java | 4 + .../dubbo/rpc/protocol/injvm/DemoServiceImpl.java | 9 + .../rpc/protocol/injvm/InjvmProtocolTest.java | 40 +- .../dubbo/rpc/protocol/tri/TriplePathResolver.java | 9 +- .../dubbo/rpc/protocol/tri/TripleProtocol.java | 28 +- .../observability/autoconfigure/pom.xml | 6 - .../DubboObservationAutoConfiguration.java | 19 +- .../brave/BraveAutoConfiguration.java | 18 +- .../otel/OpenTelemetryAutoConfiguration.java | 17 +- .../observability/pom.xml | 4 +- dubbo-test/dubbo-dependencies-all/pom.xml | 6 +- 117 files changed, 1204 insertions(+), 1715 deletions(-)
