This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
from 8ad792c287 Add transient to some overrided field (#12570)
add ea35f7ed5c Revert "refactor: migrate tracing core from boot-start to
dubbo deployer (#12453)"
No new revisions were added by this update.
Summary of changes:
.artifacts | 1 -
dubbo-cluster/pom.xml | 5 +
.../filter/support}/ObservationSenderFilter.java | 23 +--
...g.apache.dubbo.rpc.cluster.filter.ClusterFilter | 1 +
.../filter/AbstractObservationFilterTest.java | 8 +-
.../filter/ObservationSenderFilterTest.java | 7 +-
.../common/constants/LoggerCodeConstants.java | 2 -
.../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 -
dubbo-config/dubbo-config-api/pom.xml | 6 -
.../config/deploy/DefaultApplicationDeployer.java | 117 +++++-------
.../deploy/DefaultApplicationDeployerTest.java | 6 +-
dubbo-dependencies-bom/pom.xml | 17 +-
dubbo-distribution/dubbo-all/pom.xml | 10 -
dubbo-distribution/dubbo-bom/pom.xml | 7 -
dubbo-distribution/dubbo-core-spi/pom.xml | 1 -
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 ---------
.../dubbo/tracing/exporter/TraceExporter.java | 37 ----
.../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 -
.../observability/autoconfigure/pom.xml | 6 -
.../DubboObservationAutoConfiguration.java | 19 +-
.../brave/BraveAutoConfiguration.java | 18 +-
.../otel/OpenTelemetryAutoConfiguration.java | 17 +-
dubbo-test/dubbo-dependencies-all/pom.xml | 6 +-
67 files changed, 169 insertions(+), 1457 deletions(-)
rename
{dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/filter =>
dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/support}/ObservationSenderFilter.java
(78%)
copy {dubbo-metrics/dubbo-tracing/src/test/java/org/apache/dubbo/tracing =>
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster}/filter/AbstractObservationFilterTest.java
(93%)
rename {dubbo-metrics/dubbo-tracing/src/test/java/org/apache/dubbo/tracing =>
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster}/filter/ObservationSenderFilterTest.java
(92%)
mode change 100644 => 100755
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/aggregate/Pane.java
mode change 100644 => 100755
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/aggregate/SlidingWindow.java
rename dubbo-metrics/{dubbo-tracing/src/main/java/org/apache/dubbo/tracing =>
dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/observation}/AbstractDefaultDubboObservationConvention.java
(87%)
rename dubbo-metrics/{dubbo-tracing/src/main/java/org/apache/dubbo/tracing =>
dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/observation}/DefaultDubboClientObservationConvention.java
(92%)
rename dubbo-metrics/{dubbo-tracing/src/main/java/org/apache/dubbo/tracing =>
dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/observation}/DefaultDubboServerObservationConvention.java
(94%)
rename
dubbo-metrics/{dubbo-tracing/src/main/java/org/apache/dubbo/tracing/context =>
dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/observation}/DubboClientContext.java
(97%)
rename dubbo-metrics/{dubbo-tracing/src/main/java/org/apache/dubbo/tracing =>
dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/observation}/DubboClientObservationConvention.java
(92%)
rename dubbo-metrics/{dubbo-tracing/src/main/java/org/apache/dubbo/tracing =>
dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/observation}/DubboObservationDocumentation.java
(98%)
rename
dubbo-metrics/{dubbo-tracing/src/main/java/org/apache/dubbo/tracing/context =>
dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/observation}/DubboServerContext.java
(97%)
rename dubbo-metrics/{dubbo-tracing/src/main/java/org/apache/dubbo/tracing =>
dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/observation}/DubboServerObservationConvention.java
(92%)
delete mode 100644
dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/utils/MetricsSupportUtil.java
rename dubbo-metrics/{dubbo-tracing/src/test/java/org/apache/dubbo/tracing =>
dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/observation}/DefaultDubboClientObservationConventionTest.java
(94%)
rename dubbo-metrics/{dubbo-tracing/src/test/java/org/apache/dubbo/tracing =>
dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/observation}/DefaultDubboServerObservationConventionTest.java
(93%)
rename dubbo-metrics/{dubbo-tracing/src/test/java/org/apache/dubbo/tracing =>
dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/observation}/utils/ObservationConventionUtils.java
(97%)
rename
dubbo-metrics/{dubbo-tracing/src/main/java/org/apache/dubbo/tracing/filter =>
dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/observation}/ObservationReceiverFilter.java
(80%)
create mode 100644
dubbo-metrics/dubbo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
rename
dubbo-metrics/{dubbo-tracing/src/test/java/org/apache/dubbo/tracing/filter =>
dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/observation}/AbstractObservationFilterTest.java
(94%)
rename dubbo-metrics/{dubbo-tracing/src/test/java/org/apache/dubbo/tracing =>
dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/observation}/MockInvocation.java
(97%)
rename
dubbo-metrics/{dubbo-tracing/src/test/java/org/apache/dubbo/tracing/filter =>
dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/observation}/ObservationReceiverFilterTest.java
(99%)
delete mode 100644 dubbo-metrics/dubbo-tracing/pom.xml
delete mode 100644
dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/DubboObservationRegistry.java
delete mode 100644
dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/exporter/TraceExporter.java
delete mode 100644
dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/exporter/TraceExporterFactory.java
delete mode 100644
dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/exporter/otlp/OTlpExporter.java
delete mode 100644
dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/exporter/zipkin/ZipkinExporter.java
delete mode 100644
dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/tracer/PropagatorProvider.java
delete mode 100644
dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/tracer/PropagatorProviderFactory.java
delete mode 100644
dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/tracer/TracerProvider.java
delete mode 100644
dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/tracer/TracerProviderFactory.java
delete mode 100644
dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/tracer/brave/BravePropagatorProvider.java
delete mode 100644
dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/tracer/brave/BraveProvider.java
delete mode 100644
dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/tracer/otel/OTelPropagatorProvider.java
delete mode 100644
dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/tracer/otel/OpenTelemetryProvider.java
delete mode 100644
dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/utils/ObservationSupportUtil.java
delete mode 100644
dubbo-metrics/dubbo-tracing/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
delete mode 100644
dubbo-metrics/dubbo-tracing/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.filter.ClusterFilter
delete mode 100644
dubbo-metrics/dubbo-tracing/src/test/java/org/apache/dubbo/tracing/tracer/PropagatorProviderFactoryTest.java
delete mode 100644
dubbo-metrics/dubbo-tracing/src/test/java/org/apache/dubbo/tracing/tracer/otel/OTelPropagatorProviderTest.java
delete mode 100644
dubbo-metrics/dubbo-tracing/src/test/java/org/apache/dubbo/tracing/tracer/otel/OpenTelemetryProviderTest.java
delete mode 100644
dubbo-metrics/dubbo-tracing/src/test/java/org/apache/dubbo/tracing/utils/ObservationSupportUtilTest.java