You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2023/06/17 11:54:18 UTC
[dubbo] branch 3.2 updated (5f39404b07 -> a613cae2f3)
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 5f39404b07 Support set actual content length to inv/res attributes (#12521)
add a613cae2f3 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 -
...g.apache.dubbo.rpc.cluster.filter.ClusterFilter | 1 -
.../filter/AbstractObservationFilterTest.java | 83 --------
.../common/constants/LoggerCodeConstants.java | 2 +
.../apache/dubbo/config/nested/BaggageConfig.java | 25 +++
.../apache/dubbo/config/nested/ExporterConfig.java | 41 +++-
.../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 | 9 +-
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
.../MetricsSupportUtil.java} | 32 ++--
.../aggregate/TimeWindowAggregatorTest.java | 3 +-
dubbo-metrics/dubbo-metrics-default/pom.xml | 5 -
.../dubbo/internal/org.apache.dubbo.rpc.Filter | 2 -
.../dubbo-tracing}/pom.xml | 90 +++++----
.../AbstractDefaultDubboObservationConvention.java | 8 +-
.../DefaultDubboClientObservationConvention.java | 7 +-
.../DefaultDubboServerObservationConvention.java | 4 +-
.../tracing}/DubboClientObservationConvention.java | 4 +-
.../tracing}/DubboObservationDocumentation.java | 2 +-
.../dubbo/tracing/DubboObservationRegistry.java | 90 +++++++++
.../tracing}/DubboServerObservationConvention.java | 4 +-
.../dubbo/tracing/context}/DubboClientContext.java | 2 +-
.../dubbo/tracing/context}/DubboServerContext.java | 2 +-
.../dubbo/tracing/exporter/TraceExporter.java | 26 +--
.../tracing/exporter/TraceExporterFactory.java | 66 +++++++
.../dubbo/tracing/exporter/otlp/OTlpExporter.java | 66 +++++++
.../tracing/exporter/zipkin/ZipkinExporter.java | 60 ++++++
.../tracing/filter}/ObservationReceiverFilter.java | 19 +-
.../tracing/filter}/ObservationSenderFilter.java | 23 ++-
.../dubbo/tracing/tracer/PropagatorProvider.java | 20 +-
.../tracing/tracer/PropagatorProviderFactory.java | 31 ++-
.../dubbo/tracing/tracer/TracerProvider.java | 19 +-
.../tracing/tracer/TracerProviderFactory.java | 26 ++-
.../tracer/brave/BravePropagatorProvider.java | 20 +-
.../dubbo/tracing/tracer/brave/BraveProvider.java | 28 ++-
.../tracer/otel/OTelPropagatorProvider.java} | 26 ++-
.../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 +
...efaultDubboClientObservationConventionTest.java | 8 +-
...efaultDubboServerObservationConventionTest.java | 9 +-
.../org/apache/dubbo/tracing}/MockInvocation.java | 6 +-
.../filter}/AbstractObservationFilterTest.java | 8 +-
.../filter}/ObservationReceiverFilterTest.java | 3 +-
.../filter/ObservationSenderFilterTest.java | 14 +-
.../tracer/PropagatorProviderFactoryTest.java | 19 +-
.../tracer/otel/OTelPropagatorProviderTest.java | 24 ++-
.../tracer/otel/OpenTelemetryProviderTest.java | 53 ++++++
.../tracing}/utils/ObservationConventionUtils.java | 7 +-
.../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, 1143 insertions(+), 416 deletions(-)
delete mode 100644 dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/AbstractObservationFilterTest.java
mode change 100755 => 100644 dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/aggregate/Pane.java
mode change 100755 => 100644 dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/aggregate/SlidingWindow.java
copy dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/{observation/DubboServerContext.java => utils/MetricsSupportUtil.java} (51%)
delete mode 100644 dubbo-metrics/dubbo-metrics-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
copy {dubbo-cluster => dubbo-metrics/dubbo-tracing}/pom.xml (57%)
rename dubbo-metrics/{dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/observation => dubbo-tracing/src/main/java/org/apache/dubbo/tracing}/AbstractDefaultDubboObservationConvention.java (87%)
rename dubbo-metrics/{dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/observation => dubbo-tracing/src/main/java/org/apache/dubbo/tracing}/DefaultDubboClientObservationConvention.java (92%)
rename dubbo-metrics/{dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/observation => dubbo-tracing/src/main/java/org/apache/dubbo/tracing}/DefaultDubboServerObservationConvention.java (94%)
copy dubbo-metrics/{dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/observation => dubbo-tracing/src/main/java/org/apache/dubbo/tracing}/DubboClientObservationConvention.java (92%)
rename dubbo-metrics/{dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/observation => dubbo-tracing/src/main/java/org/apache/dubbo/tracing}/DubboObservationDocumentation.java (98%)
create mode 100644 dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/DubboObservationRegistry.java
rename dubbo-metrics/{dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/observation => dubbo-tracing/src/main/java/org/apache/dubbo/tracing}/DubboServerObservationConvention.java (92%)
rename dubbo-metrics/{dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/observation => dubbo-tracing/src/main/java/org/apache/dubbo/tracing/context}/DubboClientContext.java (97%)
rename dubbo-metrics/{dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/observation => dubbo-tracing/src/main/java/org/apache/dubbo/tracing/context}/DubboServerContext.java (97%)
copy dubbo-common/src/main/java/org/apache/dubbo/config/nested/SamplingConfig.java => dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/exporter/TraceExporter.java (66%)
create mode 100644 dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/exporter/TraceExporterFactory.java
create mode 100644 dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/exporter/otlp/OTlpExporter.java
create mode 100644 dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/exporter/zipkin/ZipkinExporter.java
rename dubbo-metrics/{dubbo-metrics-default/src/main/java/org/apache/dubbo/metrics/observation => dubbo-tracing/src/main/java/org/apache/dubbo/tracing/filter}/ObservationReceiverFilter.java (80%)
rename {dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/support => dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/filter}/ObservationSenderFilter.java (78%)
copy dubbo-common/src/main/java/org/apache/dubbo/config/nested/SamplingConfig.java => dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/tracer/PropagatorProvider.java (66%)
copy dubbo-common/src/main/java/org/apache/dubbo/config/nested/PropagationConfig.java => dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/tracer/PropagatorProviderFactory.java (54%)
copy dubbo-common/src/main/java/org/apache/dubbo/config/nested/SamplingConfig.java => dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/tracer/TracerProvider.java (66%)
copy dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployerTest.java => dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/tracer/TracerProviderFactory.java (52%)
copy dubbo-common/src/main/java/org/apache/dubbo/config/nested/SamplingConfig.java => dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/tracer/brave/BravePropagatorProvider.java (65%)
copy dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployerTest.java => dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/tracer/brave/BraveProvider.java (58%)
rename dubbo-metrics/{dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/observation/DubboClientObservationConvention.java => dubbo-tracing/src/main/java/org/apache/dubbo/tracing/tracer/otel/OTelPropagatorProvider.java} (54%)
create mode 100644 dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/tracer/otel/OpenTelemetryProvider.java
create mode 100644 dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/utils/ObservationSupportUtil.java
create mode 100644 dubbo-metrics/dubbo-tracing/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter
create mode 100644 dubbo-metrics/dubbo-tracing/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.filter.ClusterFilter
rename dubbo-metrics/{dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/observation => dubbo-tracing/src/test/java/org/apache/dubbo/tracing}/DefaultDubboClientObservationConventionTest.java (94%)
rename dubbo-metrics/{dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/observation => dubbo-tracing/src/test/java/org/apache/dubbo/tracing}/DefaultDubboServerObservationConventionTest.java (93%)
rename dubbo-metrics/{dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/observation => dubbo-tracing/src/test/java/org/apache/dubbo/tracing}/MockInvocation.java (97%)
rename dubbo-metrics/{dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/observation => dubbo-tracing/src/test/java/org/apache/dubbo/tracing/filter}/AbstractObservationFilterTest.java (94%)
rename dubbo-metrics/{dubbo-metrics-default/src/test/java/org/apache/dubbo/metrics/observation => dubbo-tracing/src/test/java/org/apache/dubbo/tracing/filter}/ObservationReceiverFilterTest.java (99%)
rename {dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster => dubbo-metrics/dubbo-tracing/src/test/java/org/apache/dubbo/tracing}/filter/ObservationSenderFilterTest.java (92%)
copy dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployerTest.java => dubbo-metrics/dubbo-tracing/src/test/java/org/apache/dubbo/tracing/tracer/PropagatorProviderFactoryTest.java (63%)
copy dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployerTest.java => dubbo-metrics/dubbo-tracing/src/test/java/org/apache/dubbo/tracing/tracer/otel/OTelPropagatorProviderTest.java (54%)
create mode 100644 dubbo-metrics/dubbo-tracing/src/test/java/org/apache/dubbo/tracing/tracer/otel/OpenTelemetryProviderTest.java
rename dubbo-metrics/{dubbo-metrics-api/src/test/java/org/apache/dubbo/metrics/observation => dubbo-tracing/src/test/java/org/apache/dubbo/tracing}/utils/ObservationConventionUtils.java (97%)
create mode 100644 dubbo-metrics/dubbo-tracing/src/test/java/org/apache/dubbo/tracing/utils/ObservationSupportUtilTest.java