Merge branch '3.2' into 3.2-copy-tag

Author: songxiaosheng

.artifacts

@@ -115,5 +115,4 @@ dubbo-nacos-spring-boot-starter
 dubbo-zookeeper-spring-boot-starter
 dubbo-zookeeper-curator5-spring-boot-starter
 dubbo-spring-security
-dubbo-tracing
 dubbo-xds

dubbo-cluster/pom.xml

@@ -86,5 +86,10 @@
             <version>${project.parent.version}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing-integration-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java

@@ -476,15 +476,21 @@ protected void destroyInvokers() {
     }
 
     private boolean addValidInvoker(Invoker<T> invoker) {
+        boolean result;
         synchronized (this.validInvokers) {
-            return this.validInvokers.add(invoker);
+            result = this.validInvokers.add(invoker);
         }
+        MetricsEventBus.publish(RegistryEvent.refreshDirectoryEvent(applicationModel, getSummary()));
+        return result;
     }
 
     private boolean removeValidInvoker(Invoker<T> invoker) {
+        boolean result;
         synchronized (this.validInvokers) {
-            return this.validInvokers.remove(invoker);
+            result = this.validInvokers.remove(invoker);
         }
+        MetricsEventBus.publish(RegistryEvent.refreshDirectoryEvent(applicationModel, getSummary()));
+        return result;
     }
 
     protected abstract List<Invoker<T>> doList(SingleRouterChain<T> singleRouterChain,

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectory.java

@@ -36,6 +36,7 @@
  */
 public class StaticDirectory<T> extends AbstractDirectory<T> {
     private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(StaticDirectory.class);
+    private final Class<T> interfaceClass;
 
     public StaticDirectory(List<Invoker<T>> invokers) {
         this(null, invokers, null);
@@ -55,11 +56,12 @@ public StaticDirectory(URL url, List<Invoker<T>> invokers, RouterChain<T> router
             throw new IllegalArgumentException("invokers == null");
         }
         this.setInvokers(new BitList<>(invokers));
+        this.interfaceClass = invokers.get(0).getInterface();
     }
 
     @Override
     public Class<T> getInterface() {
-        return getInvokers().get(0).getInterface();
+        return interfaceClass;
     }
 
     @Override

dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/filter/ObservationSenderFilter.java renamed to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/filter/support/ObservationSenderFilter.java

@@ -14,9 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.dubbo.tracing.filter;
+package org.apache.dubbo.rpc.cluster.filter.support;
 
 import org.apache.dubbo.common.extension.Activate;
+import org.apache.dubbo.metrics.observation.DefaultDubboClientObservationConvention;
+import org.apache.dubbo.metrics.observation.DubboClientContext;
+import org.apache.dubbo.metrics.observation.DubboClientObservationConvention;
+import org.apache.dubbo.metrics.observation.DubboObservationDocumentation;
 import org.apache.dubbo.rpc.BaseFilter;
 import org.apache.dubbo.rpc.Filter;
 import org.apache.dubbo.rpc.Invocation;
@@ -26,10 +30,6 @@
 import org.apache.dubbo.rpc.cluster.filter.ClusterFilter;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 import org.apache.dubbo.rpc.model.ScopeModelAware;
-import org.apache.dubbo.tracing.DefaultDubboClientObservationConvention;
-import org.apache.dubbo.tracing.DubboClientObservationConvention;
-import org.apache.dubbo.tracing.DubboObservationDocumentation;
-import org.apache.dubbo.tracing.context.DubboClientContext;
 
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationRegistry;
@@ -39,16 +39,20 @@
 /**
  * A {@link Filter} that creates an {@link Observation} around the outgoing message.
  */
-@Activate(group = CONSUMER, order = Integer.MIN_VALUE + 50, onClass = "io.micrometer.observation.NoopObservationRegistry")
+@Activate(group = CONSUMER, order = -1, onClass = "io.micrometer.observation.NoopObservationRegistry")
 public class ObservationSenderFilter implements ClusterFilter, BaseFilter.Listener, ScopeModelAware {
 
     private ObservationRegistry observationRegistry;
 
     private DubboClientObservationConvention clientObservationConvention;
 
     public ObservationSenderFilter(ApplicationModel applicationModel) {
-        observationRegistry = applicationModel.getBeanFactory().getBean(ObservationRegistry.class);
-        clientObservationConvention = applicationModel.getBeanFactory().getBean(DubboClientObservationConvention.class);
+        applicationModel.getApplicationConfigManager().getTracing().ifPresent(cfg -> {
+            if (Boolean.TRUE.equals(cfg.getEnabled())) {
+                observationRegistry = applicationModel.getBeanFactory().getBean(ObservationRegistry.class);
+                clientObservationConvention = applicationModel.getBeanFactory().getBean(DubboClientObservationConvention.class);
+            }
+        });
     }
 
     @Override
@@ -71,9 +75,6 @@ public void onResponse(Result appResponse, Invoker<?> invoker, Invocation invoca
         if (observation == null) {
             return;
         }
-        if (appResponse != null && appResponse.hasException()) {
-            observation.error(appResponse.getException());
-        }
         observation.stop();
     }
 

dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.filter.ClusterFilter

@@ -1,4 +1,5 @@
 consumercontext=org.apache.dubbo.rpc.cluster.filter.support.ConsumerContextFilter
 consumer-classloader=org.apache.dubbo.rpc.cluster.filter.support.ConsumerClassLoaderFilter
 router-snapshot=org.apache.dubbo.rpc.cluster.router.RouterSnapshotFilter
+observationsender=org.apache.dubbo.rpc.cluster.filter.support.ObservationSenderFilter
 metricsClusterFilter=org.apache.dubbo.rpc.cluster.filter.support.MetricsClusterFilter

dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/AbstractObservationFilterTest.java

@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.rpc.cluster.filter;
+
+import org.apache.dubbo.config.ApplicationConfig;
+import org.apache.dubbo.config.TracingConfig;
+import org.apache.dubbo.rpc.AppResponse;
+import org.apache.dubbo.rpc.BaseFilter;
+import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.RpcInvocation;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+
+import io.micrometer.tracing.test.SampleTestRunner;
+import org.junit.jupiter.api.AfterEach;
+
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
+abstract class AbstractObservationFilterTest extends SampleTestRunner {
+
+    ApplicationModel applicationModel;
+    RpcInvocation    invocation;
+
+    BaseFilter filter;
+
+    Invoker<?> invoker = mock(Invoker.class);
+
+    static final String INTERFACE_NAME = "org.apache.dubbo.MockInterface";
+    static final String METHOD_NAME = "mockMethod";
+    static final String GROUP = "mockGroup";
+    static final String VERSION = "1.0.0";
+
+    @AfterEach
+    public void teardown() {
+        if (applicationModel != null) {
+            applicationModel.destroy();
+        }
+    }
+
+    abstract BaseFilter createFilter(ApplicationModel applicationModel);
+
+    void setupConfig() {
+        ApplicationConfig config = new ApplicationConfig();
+        config.setName("MockObservations");
+
+        applicationModel = ApplicationModel.defaultModel();
+        applicationModel.getApplicationConfigManager().setApplication(config);
+
+        invocation = new RpcInvocation(new MockInvocation());
+        invocation.addInvokedInvoker(invoker);
+
+        applicationModel.getBeanFactory().registerBean(getObservationRegistry());
+        TracingConfig tracingConfig = new TracingConfig();
+        tracingConfig.setEnabled(true);
+        applicationModel.getApplicationConfigManager().setTracing(tracingConfig);
+
+        filter = createFilter(applicationModel);
+
+        given(invoker.invoke(invocation)).willReturn(new AppResponse("success"));
+
+        initParam();
+    }
+
+    private void initParam() {
+        invocation.setTargetServiceUniqueName(GROUP + "/" + INTERFACE_NAME + ":" + VERSION);
+        invocation.setMethodName(METHOD_NAME);
+        invocation.setParameterTypes(new Class[] {String.class});
+    }
+
+}

dubbo-metrics/dubbo-tracing/src/test/java/org/apache/dubbo/tracing/filter/ObservationSenderFilterTest.java renamed to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/ObservationSenderFilterTest.java

@@ -15,22 +15,23 @@
  * limitations under the License.
  */
 
-package org.apache.dubbo.tracing.filter;
+package org.apache.dubbo.rpc.cluster.filter;
 
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.rpc.RpcContext;
-import org.apache.dubbo.rpc.cluster.filter.ClusterFilter;
+import org.apache.dubbo.rpc.cluster.filter.support.ObservationSenderFilter;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 
 import io.micrometer.common.KeyValues;
 import io.micrometer.core.tck.MeterRegistryAssert;
+import io.micrometer.tracing.test.SampleTestRunner;
 import io.micrometer.tracing.test.simple.SpansAssert;
 import org.assertj.core.api.BDDAssertions;
 
 class ObservationSenderFilterTest extends AbstractObservationFilterTest {
 
     @Override
-    public SampleTestRunnerConsumer yourCode() {
+    public SampleTestRunner.SampleTestRunnerConsumer yourCode() {
         return (buildingBlocks, meterRegistry) -> {
             setupConfig();
             setupAttachments();

dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java

@@ -92,8 +92,6 @@ public interface LoggerCodeConstants {
 
     String VULNERABILITY_WARNING = "0-28";
 
-    String COMMON_NOT_FOUND_TRACER_DEPENDENCY = "0-29";
-
 
     // Registry module
 

dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java

@@ -73,6 +73,7 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static java.util.Arrays.asList;
 import static java.util.ServiceLoader.load;
@@ -346,7 +347,9 @@ public List<T> getActivateExtension(URL url, String[] values, String group) {
         checkDestroyed();
         // solve the bug of using @SPI's wrapper method to report a null pointer exception.
         Map<Class<?>, T> activateExtensionsMap = new TreeMap<>(activateComparator);
-        List<String> names = values == null ? new ArrayList<>(0) : asList(values);
+        List<String> names = values == null ?
+            new ArrayList<>(0) :
+            Arrays.stream(values).map(StringUtils::trim).collect(Collectors.toList());
         Set<String> namesSet = new HashSet<>(names);
         if (!namesSet.contains(REMOVE_VALUE_PREFIX + DEFAULT_KEY)) {
             if (cachedActivateGroups.size() == 0) {