The {@link CopyOnWriteArraySet} values make it easy and relatively lightweight to get an + * immutable snapshot of all current subscribers to an event without any locking. + */ + private final Set> listeners = new CopyOnWriteArraySet<>(); + + final Map, Set>> listenerCache = new ConcurrentHashMap<>(64); + + /** + * Registers all subscriber methods on the given listener object. + * + * @param listener object whose subscriber methods should be registered. + */ + @Override + public void addListener(DubboListener listener) { + synchronized (this.listeners) { + this.listeners.add(listener); + listenerCache.clear(); + } + } + + /** + * Registers all subscriber methods on the given listener object. + * + * @param listener object whose subscriber methods should be registered. + */ + @Override + public void removeListener(DubboListener listener) { + synchronized (this.listeners) { + this.listeners.remove(listener); + listenerCache.clear(); + } + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + @Override + public void publishEvent(DubboEvent event) { + for (DubboListener listener : getListeners(event.getClass())) { + listener.onEvent(event); + } + } + + /** + * Return the listeners for the given event type. + * + * @param eventType the type of event to find listeners for. + * @return a live {@link Collection} of listeners for the given event type. If no listeners are + * found, this method returns an empty collection. + */ + public Collection> getListeners(Class eventType) { + return listenerCache.computeIfAbsent(eventType, key -> { + Set> listeners = new CopyOnWriteArraySet<>(); + for (DubboListener listener : this.listeners) { + if (listener.support(eventType)) { + listeners.add(listener); + } + } + return listeners; + }); + } + + /** + * Remove a listener from the notification list. + * + * @param listener the listener to remove + */ + @SuppressWarnings({"rawtypes", "unchecked"}) + @Override + public void publishBeforeEvent(DubboEvent event) { + for (DubboListener listener : getListeners(event.getClass())) { + if (listener instanceof DubboLifecycleListener) { + ((DubboLifecycleListener) listener).onEventBefore(event); + } + } + } + + @SuppressWarnings({"rawtypes", "unchecked"}) + @Override + public void publishErrorEvent(DubboEvent event) { + for (DubboListener listener : getListeners(event.getClass())) { + if (listener instanceof DubboLifecycleListener) { + ((DubboLifecycleListener) listener).onEventError(event); + } + } + } +} diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboEvent.java b/dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboEvent.java new file mode 100644 index 00000000000..3d3d0ff0902 --- /dev/null +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboEvent.java @@ -0,0 +1,43 @@ +/* + * 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.common.event; + +import org.apache.dubbo.rpc.model.ApplicationModel; + +import java.util.EventObject; + +/** + * Dubbo Event Object + * + * @since 3.3.0 + */ +public class DubboEvent extends EventObject { + + /** + * Constructs a prototypical Event. + * + * @param source The object on which the Event initially occurred. + * @throws IllegalArgumentException if source is null. + */ + public DubboEvent(ApplicationModel source) { + super(source); + } + + public ApplicationModel getApplicationModel() { + return (ApplicationModel) getSource(); + } +} diff --git a/dubbo-metrics/dubbo-metrics-event/src/main/java/org/apache/dubbo/metrics/event/MetricsEventBus.java b/dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboEventBus.java similarity index 50% rename from dubbo-metrics/dubbo-metrics-event/src/main/java/org/apache/dubbo/metrics/event/MetricsEventBus.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboEventBus.java index 7654c2d9020..66890853e48 100644 --- a/dubbo-metrics/dubbo-metrics-event/src/main/java/org/apache/dubbo/metrics/event/MetricsEventBus.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboEventBus.java @@ -14,12 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.metrics.event; +package org.apache.dubbo.common.event; +import org.apache.dubbo.common.beans.factory.ScopeBeanFactory; import org.apache.dubbo.common.logger.ErrorTypeAwareLogger; import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.rpc.model.ApplicationModel; -import java.util.Optional; +import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import java.util.function.Supplier; @@ -27,24 +29,50 @@ /** * Dispatches events to listeners, and provides ways for listeners to register themselves. + * + * @see DubboEvent + * @see DubboListener + * @see DubboLifecycleEventMulticaster + * @since 3.3.0 */ -public class MetricsEventBus { +public class DubboEventBus { + + private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(DubboEventBus.class); + + private static final ConcurrentHashMap cachedMulticasterMap = + new ConcurrentHashMap<>(); + + private DubboEventBus() {} + + /** + * Registers all subscriber methods on {@code object} to receive events. + * + * @param listener object whose subscriber methods should be registered. + */ + public static void addListener(ApplicationModel applicationModel, DubboListener listener) { + getMulticaster(applicationModel).addListener(listener); + } - private static final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(MetricsEventBus.class); + /** + * Unregisters all subscriber methods on a registered {@code object}. + * + * @param listener object whose subscriber methods should be unregistered. + * @throws IllegalArgumentException if the object was not previously registered. + */ + public static void removeListener(ApplicationModel applicationModel, DubboListener listener) { + getMulticaster(applicationModel).removeListener(listener); + } /** * Posts an event to all registered subscribers and only once. * * @param event event to post. */ - public static void publish(MetricsEvent event) { + public static void publish(DubboEvent event) { if (event.getSource() == null) { return; } - MetricsEventMulticaster dispatcher = event.getMetricsEventMulticaster(); - Optional.ofNullable(dispatcher).ifPresent(d -> { - tryInvoke(() -> d.publishEvent(event)); - }); + tryInvoke(() -> getMulticaster(event.getApplicationModel()).publishEvent(event)); } /** @@ -55,7 +83,7 @@ public static void publish(MetricsEvent event) { * @param event event to post. * @param targetSupplier original processing result targetSupplier */ - public static T post(MetricsEvent event, Supplier targetSupplier) { + public static T post(DubboEvent event, Supplier targetSupplier) { return post(event, targetSupplier, null); } @@ -68,30 +96,29 @@ public static T post(MetricsEvent event, Supplier targetSupplier) { * @param Biz result type * @return Biz result */ - public static T post(MetricsEvent event, Supplier targetSupplier, Function trFunction) { + public static T post(DubboEvent event, Supplier targetSupplier, Function trFunction) { T result; tryInvoke(() -> before(event)); + try { + result = targetSupplier.get(); + } catch (Throwable e) { + tryInvoke(() -> error(event)); + throw e; + } if (trFunction == null) { - try { - result = targetSupplier.get(); - } catch (Throwable e) { - tryInvoke(() -> error(event)); - throw e; - } + tryInvoke(() -> after(event, result)); + return result; + } + // Custom failure status + if (trFunction.apply(result)) { tryInvoke(() -> after(event, result)); } else { - // Custom failure status - result = targetSupplier.get(); - if (trFunction.apply(result)) { - tryInvoke(() -> after(event, result)); - } else { - tryInvoke(() -> error(event)); - } + tryInvoke(() -> error(event)); } return result; } - public static void tryInvoke(Runnable runnable) { + private static void tryInvoke(Runnable runnable) { try { runnable.run(); } catch (Throwable e) { @@ -103,36 +130,28 @@ public static void tryInvoke(Runnable runnable) { * Applicable to the scene where execution and return are separated, * eventSaveRunner saves the event, so that the calculation rt is introverted */ - public static void before(MetricsEvent event) { - MetricsEventMulticaster dispatcher = validate(event); - - if (dispatcher == null) return; - tryInvoke(() -> dispatcher.publishEvent(event)); + public static void before(DubboEvent event) { + tryInvoke(() -> getMulticaster(event.getApplicationModel()).publishBeforeEvent(event)); } - public static void after(MetricsEvent event, Object result) { - MetricsEventMulticaster dispatcher = validate(event); - if (dispatcher == null) return; + @SuppressWarnings({"unchecked", "rawtypes"}) + public static void after(DubboEvent event, Object result) { tryInvoke(() -> { - event.customAfterPost(result); - dispatcher.publishFinishEvent((TimeCounterEvent) event); + if (event instanceof CustomAfterPost) { + ((CustomAfterPost) event).customAfterPost(result); + } + getMulticaster(event.getApplicationModel()).publishEvent(event); }); } - public static void error(MetricsEvent event) { - MetricsEventMulticaster dispatcher = validate(event); - if (dispatcher == null) return; - tryInvoke(() -> dispatcher.publishErrorEvent((TimeCounterEvent) event)); + public static void error(DubboEvent event) { + tryInvoke(() -> getMulticaster(event.getApplicationModel()).publishErrorEvent(event)); } - private static MetricsEventMulticaster validate(MetricsEvent event) { - MetricsEventMulticaster dispatcher = event.getMetricsEventMulticaster(); - if (dispatcher == null) { - return null; - } - if (!(event instanceof TimeCounterEvent)) { - return null; - } - return dispatcher; + private static DubboLifecycleEventMulticaster getMulticaster(ApplicationModel applicationModel) { + return cachedMulticasterMap.computeIfAbsent(applicationModel, t -> { + ScopeBeanFactory beanFactory = applicationModel.getBeanFactory(); + return beanFactory.getBean(DubboLifecycleEventMulticaster.class); + }); } } diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboEventMulticaster.java b/dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboEventMulticaster.java new file mode 100644 index 00000000000..ecfae62a689 --- /dev/null +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboEventMulticaster.java @@ -0,0 +1,48 @@ +/* + * 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.common.event; + +/** + * Dispatches events to listeners, and provides ways for listeners to register themselves. + * + * @since 3.3.0 + * @see DubboEvent + * @see DubboListener + */ +public interface DubboEventMulticaster { + + /** + * Add a listener to be notified of all events. + * + * @param listener the listener to add + */ + void addListener(DubboListener listener); + + /** + * Add a listener to be notified of all events. + * + * @param listener the listener to add + */ + void removeListener(DubboListener listener); + + /** + * Publish the given event to all listeners. + * + * @param event the event to publish + */ + void publishEvent(DubboEvent event); +} diff --git a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/listener/MetricsLifeListener.java b/dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboLifecycleEventMulticaster.java similarity index 73% rename from dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/listener/MetricsLifeListener.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboLifecycleEventMulticaster.java index 67dd2ad8fd6..836844a9745 100644 --- a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/listener/MetricsLifeListener.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboLifecycleEventMulticaster.java @@ -14,16 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.metrics.listener; - -import org.apache.dubbo.metrics.event.TimeCounterEvent; +package org.apache.dubbo.common.event; /** - * Metrics Listener. + * Support publish before event and error event */ -public interface MetricsLifeListener extends MetricsListener { +public interface DubboLifecycleEventMulticaster extends DubboEventMulticaster { - default void onEventFinish(E event) {} + void publishBeforeEvent(DubboEvent event); - default void onEventError(E event) {} + void publishErrorEvent(DubboEvent event); } diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboLifecycleListener.java b/dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboLifecycleListener.java new file mode 100644 index 00000000000..39b95df6bff --- /dev/null +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboLifecycleListener.java @@ -0,0 +1,52 @@ +/* + * 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.common.event; + +/** + * Dubbo Lifecycle Listener. + */ +public interface DubboLifecycleListener extends DubboListener { + + @Override + default void onEvent(E event) { + this.onEventFinish(event); + } + + /** + * notify event. + * + * @param event BaseMetricsEvent + */ + default void onEventBefore(E event) {} + ; + + /** + * notify event. + * + * @param event BaseMetricsEvent + */ + default void onEventFinish(E event) {} + ; + + /** + * notify event. + * + * @param event BaseMetricsEvent + */ + default void onEventError(E event) {} + ; +} diff --git a/dubbo-metrics/dubbo-metrics-event/src/main/java/org/apache/dubbo/metrics/listener/MetricsListener.java b/dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboListener.java similarity index 72% rename from dubbo-metrics/dubbo-metrics-event/src/main/java/org/apache/dubbo/metrics/listener/MetricsListener.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboListener.java index 048625fb02f..80279a74c74 100644 --- a/dubbo-metrics/dubbo-metrics-event/src/main/java/org/apache/dubbo/metrics/listener/MetricsListener.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboListener.java @@ -14,16 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.metrics.listener; +package org.apache.dubbo.common.event; -import org.apache.dubbo.metrics.event.MetricsEvent; +import java.util.EventListener; /** - * Metrics Listener. + * Dubbo Listener. */ -public interface MetricsListener { +public interface DubboListener extends EventListener { - boolean isSupport(MetricsEvent event); + /** + * if support event. + * + * @param eventClass the event to respond to + * @return if support + */ + boolean support(Class eventClass); /** * notify event. diff --git a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/event/MetricsDispatcher.java b/dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboMulticasterScopeModelInitializer.java similarity index 53% rename from dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/event/MetricsDispatcher.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboMulticasterScopeModelInitializer.java index 1a976cf8753..24ab6ed0626 100644 --- a/dubbo-metrics/dubbo-metrics-api/src/main/java/org/apache/dubbo/metrics/event/MetricsDispatcher.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/event/DubboMulticasterScopeModelInitializer.java @@ -14,30 +14,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.metrics.event; +package org.apache.dubbo.common.event; import org.apache.dubbo.common.beans.factory.ScopeBeanFactory; -import org.apache.dubbo.common.extension.ExtensionLoader; -import org.apache.dubbo.metrics.collector.MetricsCollector; import org.apache.dubbo.rpc.model.ApplicationModel; - -import java.util.List; +import org.apache.dubbo.rpc.model.FrameworkModel; +import org.apache.dubbo.rpc.model.ModuleModel; +import org.apache.dubbo.rpc.model.ScopeModelInitializer; /** - * Global spi event publisher + * Initialize {@link DubboLifecycleEventMulticaster} for {@link ApplicationModel} + * + * @see DubboLifecycleEventMulticaster + * @since 3.3.0 */ -public class MetricsDispatcher extends SimpleMetricsEventMulticaster { +public class DubboMulticasterScopeModelInitializer implements ScopeModelInitializer { - @SuppressWarnings({"rawtypes"}) - public MetricsDispatcher(ApplicationModel applicationModel) { + @Override + public void initializeFrameworkModel(FrameworkModel frameworkModel) {} + + @Override + public void initializeApplicationModel(ApplicationModel applicationModel) { ScopeBeanFactory beanFactory = applicationModel.getBeanFactory(); - ExtensionLoader extensionLoader = applicationModel.getExtensionLoader(MetricsCollector.class); - if (extensionLoader != null) { - List customizeCollectors = extensionLoader.getActivateExtensions(); - for (MetricsCollector customizeCollector : customizeCollectors) { - beanFactory.registerBean(customizeCollector); - } - customizeCollectors.forEach(this::addListener); - } + beanFactory.registerBean(DefaultDubboEventMulticaster.class); } + + @Override + public void initializeModuleModel(ModuleModel moduleModel) {} } diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/utils/OrderedObjectCompareUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/OrderedObjectCompareUtils.java new file mode 100644 index 00000000000..9e24f9d7bcf --- /dev/null +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/OrderedObjectCompareUtils.java @@ -0,0 +1,40 @@ +/* + * 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.common.utils; + +import org.apache.dubbo.common.Ordered; + +public class OrderedObjectCompareUtils { + + public static int compareByOrder(Object o1, Object o2) { + boolean o1Ordered = o1 instanceof Ordered; + boolean o2Ordered = o2 instanceof Ordered; + if (!o1Ordered) { + if (!o2Ordered) { + return 0; + } else { + return -1; + } + } else { + if (!o2Ordered) { + return 1; + } else { + return Integer.compare(((Ordered) o1).getOrder(), ((Ordered) o2).getOrder()); + } + } + } +} diff --git a/dubbo-metrics/dubbo-metrics-event/src/main/java/org/apache/dubbo/metrics/model/TimePair.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/TimePair.java similarity index 97% rename from dubbo-metrics/dubbo-metrics-event/src/main/java/org/apache/dubbo/metrics/model/TimePair.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/TimePair.java index c00e96bbb74..32b75a45d35 100644 --- a/dubbo-metrics/dubbo-metrics-event/src/main/java/org/apache/dubbo/metrics/model/TimePair.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/TimePair.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.metrics.model; +package org.apache.dubbo.common.utils; public class TimePair { diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java index 1971cf25e70..8474638ca2c 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java @@ -25,6 +25,7 @@ import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.dubbo.common.threadpool.manager.ExecutorRepository; import org.apache.dubbo.common.utils.Assert; +import org.apache.dubbo.common.utils.OrderedObjectCompareUtils; import org.apache.dubbo.config.ApplicationConfig; import org.apache.dubbo.config.context.ConfigManager; @@ -123,9 +124,9 @@ protected ApplicationModel(FrameworkModel frameworkModel, boolean isInternal) { ExtensionLoader initializerExtensionLoader = this.getExtensionLoader(ScopeModelInitializer.class); Set initializers = initializerExtensionLoader.getSupportedExtensionInstances(); - for (ScopeModelInitializer initializer : initializers) { - initializer.initializeApplicationModel(this); - } + initializers.stream() + .sorted(OrderedObjectCompareUtils::compareByOrder) + .forEach(initializer -> initializer.initializeApplicationModel(this)); Assert.notNull(getApplicationServiceRepository(), "ApplicationServiceRepository can not be null"); Assert.notNull(getApplicationConfigManager(), "ApplicationConfigManager can not be null"); diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/FrameworkModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/FrameworkModel.java index e5fb2b52ff4..bcd6ec3b3bc 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/FrameworkModel.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/FrameworkModel.java @@ -24,6 +24,7 @@ import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.dubbo.common.resource.GlobalResourcesRepository; import org.apache.dubbo.common.utils.Assert; +import org.apache.dubbo.common.utils.OrderedObjectCompareUtils; import org.apache.dubbo.config.ApplicationConfig; import org.apache.dubbo.metadata.definition.TypeDefinitionBuilder; @@ -94,9 +95,9 @@ public FrameworkModel() { ExtensionLoader initializerExtensionLoader = this.getExtensionLoader(ScopeModelInitializer.class); Set initializers = initializerExtensionLoader.getSupportedExtensionInstances(); - for (ScopeModelInitializer initializer : initializers) { - initializer.initializeFrameworkModel(this); - } + initializers.stream() + .sorted(OrderedObjectCompareUtils::compareByOrder) + .forEach(initializer -> initializer.initializeFrameworkModel(this)); internalApplicationModel = new ApplicationModel(this, true); internalApplicationModel diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModuleModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModuleModel.java index 9af38b04289..aea6c241cce 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModuleModel.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModuleModel.java @@ -28,6 +28,7 @@ import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.dubbo.common.utils.Assert; import org.apache.dubbo.common.utils.ClassUtils; +import org.apache.dubbo.common.utils.OrderedObjectCompareUtils; import org.apache.dubbo.config.context.ModuleConfigManager; import java.util.HashMap; @@ -72,9 +73,9 @@ protected ModuleModel(ApplicationModel applicationModel, boolean isInternal) { ExtensionLoader initializerExtensionLoader = this.getExtensionLoader(ScopeModelInitializer.class); Set initializers = initializerExtensionLoader.getSupportedExtensionInstances(); - for (ScopeModelInitializer initializer : initializers) { - initializer.initializeModuleModel(this); - } + initializers.stream() + .sorted(OrderedObjectCompareUtils::compareByOrder) + .forEach(initializer -> initializer.initializeModuleModel(this)); Assert.notNull(getServiceRepository(), "ModuleServiceRepository can not be null"); Assert.notNull(getConfigManager(), "ModuleConfigManager can not be null"); Assert.assertTrue(getConfigManager().isInitialized(), "ModuleConfigManager can not be initialized"); diff --git a/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.model.ScopeModelInitializer b/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.model.ScopeModelInitializer index fdd8f8be8a4..57bb7d1398c 100644 --- a/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.model.ScopeModelInitializer +++ b/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.model.ScopeModelInitializer @@ -1 +1,2 @@ dubbo-common=org.apache.dubbo.common.CommonScopeModelInitializer +dubbo-multicaster-init=org.apache.dubbo.common.event.DubboMulticasterScopeModelInitializer diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/event/DubboEventTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/event/DubboEventTest.java new file mode 100644 index 00000000000..bdceba3fdf1 --- /dev/null +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/event/DubboEventTest.java @@ -0,0 +1,210 @@ +/* + * 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.common.event; + +import org.apache.dubbo.rpc.model.ApplicationModel; +import org.apache.dubbo.rpc.model.FrameworkModel; +import org.apache.dubbo.rpc.model.ModuleModel; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +class DubboEventTest { + + private FrameworkModel frameworkModel; + private ApplicationModel applicationModel; + private ModuleModel moduleModel; + + @BeforeEach + public void setUp() { + frameworkModel = new FrameworkModel(); + applicationModel = frameworkModel.newApplication(); + moduleModel = applicationModel.newModule(); + } + + @AfterEach + public void reset() { + frameworkModel.destroy(); + } + + @Test + public void testDubboListener() { + AtomicInteger num = new AtomicInteger(0); + List> classes = new ArrayList<>(); + DubboListener dubboListener = new DubboListener() { + @Override + public boolean support(Class eventClass) { + classes.add(eventClass); + return true; + } + + @Override + public void onEvent(DubboEvent event) { + num.incrementAndGet(); + } + }; + DubboEventBus.addListener(applicationModel, dubboListener); + + FirstDubboEvent firstDubboEvent = new FirstDubboEvent(applicationModel); + SecondDubboEvent secondDubboEvent = new SecondDubboEvent(applicationModel); + DubboEventBus.publish(firstDubboEvent); + DubboEventBus.publish(secondDubboEvent); + + Assertions.assertEquals(num.get(), 2); + Assertions.assertEquals(classes.size(), 2); + Assertions.assertTrue(classes.contains(FirstDubboEvent.class)); + Assertions.assertTrue(classes.contains(SecondDubboEvent.class)); + } + + @Test + public void testAbstractDubboListener() { + List eventList = new ArrayList<>(); + AbstractDubboListener dubboListener = new AbstractDubboListener() { + @Override + public void onEvent(FirstDubboEvent event) { + eventList.add(event); + } + }; + DubboEventBus.addListener(applicationModel, dubboListener); + + FirstDubboEvent firstDubboEvent = new FirstDubboEvent(applicationModel); + SecondDubboEvent secondDubboEvent = new SecondDubboEvent(applicationModel); + DubboEventBus.publish(firstDubboEvent); + DubboEventBus.publish(secondDubboEvent); + + Assertions.assertEquals(eventList.size(), 1); + Assertions.assertTrue(eventList.contains(firstDubboEvent)); + Assertions.assertFalse(eventList.contains(secondDubboEvent)); + } + + @Test + public void testAbstractDubboLifecycleListener() { + List beforeEventList = new ArrayList<>(); + List afterEventList = new ArrayList<>(); + List errorEventList = new ArrayList<>(); + AbstractDubboLifecycleListener dubboListener = + new AbstractDubboLifecycleListener() { + + @Override + public void onEventBefore(FirstDubboEvent event) { + beforeEventList.add(event); + } + + @Override + public void onEventFinish(FirstDubboEvent event) { + afterEventList.add(event); + } + + @Override + public void onEventError(FirstDubboEvent event) { + errorEventList.add(event); + } + }; + DubboEventBus.addListener(applicationModel, dubboListener); + + FirstDubboEvent firstDubboEvent = new FirstDubboEvent(applicationModel); + SecondDubboEvent secondDubboEvent = new SecondDubboEvent(applicationModel); + + DubboEventBus.post(firstDubboEvent, FirstDubboEvent.class::getName); + DubboEventBus.post(secondDubboEvent, SecondDubboEvent.class::getName); + + Assertions.assertEquals(beforeEventList.size(), 1); + Assertions.assertEquals(beforeEventList.get(0), firstDubboEvent); + Assertions.assertEquals(afterEventList.size(), 1); + Assertions.assertEquals(afterEventList.get(0), firstDubboEvent); + Assertions.assertEquals(errorEventList.size(), 0); + + beforeEventList.clear(); + afterEventList.clear(); + errorEventList.clear(); + + try { + DubboEventBus.post(firstDubboEvent, () -> { + throw new RuntimeException(); + }); + } catch (RuntimeException e) { + } + try { + DubboEventBus.post(secondDubboEvent, () -> { + throw new RuntimeException(); + }); + } catch (RuntimeException e) { + } + + Assertions.assertEquals(beforeEventList.size(), 1); + Assertions.assertEquals(beforeEventList.get(0), firstDubboEvent); + Assertions.assertEquals(afterEventList.size(), 0); + Assertions.assertEquals(errorEventList.size(), 1); + Assertions.assertEquals(errorEventList.get(0), firstDubboEvent); + + beforeEventList.clear(); + afterEventList.clear(); + errorEventList.clear(); + + DubboEventBus.post(firstDubboEvent, FirstDubboEvent.class::getName, result -> false); + DubboEventBus.post(secondDubboEvent, SecondDubboEvent.class::getName, result -> false); + + Assertions.assertEquals(beforeEventList.size(), 1); + Assertions.assertEquals(beforeEventList.get(0), firstDubboEvent); + Assertions.assertEquals(afterEventList.size(), 0); + Assertions.assertEquals(errorEventList.size(), 1); + Assertions.assertEquals(errorEventList.get(0), firstDubboEvent); + } + + @Test + public void testCustomAfterPostEventListener() { + SecondDubboEvent secondDubboEvent = new SecondDubboEvent(applicationModel); + + DubboEventBus.post(secondDubboEvent, SecondDubboEvent.class::getName); + List resultList = secondDubboEvent.getResultList(); + + Assertions.assertEquals(resultList.size(), 1); + Assertions.assertEquals(resultList.get(0), SecondDubboEvent.class.getName()); + } + + public static class FirstDubboEvent extends DubboEvent { + + public FirstDubboEvent(ApplicationModel source) { + super(source); + } + } + + public static class SecondDubboEvent extends DubboEvent implements CustomAfterPost { + + private final List resultList; + + public SecondDubboEvent(ApplicationModel source) { + super(source); + resultList = new ArrayList<>(); + } + + @Override + public void customAfterPost(String postResult) { + resultList.add(postResult); + } + + public List getResultList() { + return resultList; + } + } +} diff --git a/dubbo-config/dubbo-config-api/pom.xml b/dubbo-config/dubbo-config-api/pom.xml index 9ed360e9475..0b46d30253d 100644 --- a/dubbo-config/dubbo-config-api/pom.xml +++ b/dubbo-config/dubbo-config-api/pom.xml @@ -38,43 +38,7 @@ org.apache.dubbo - dubbo-metadata-api - ${project.parent.version} - - - - org.apache.dubbo - dubbo-metrics-api - ${project.parent.version} - - - - org.apache.dubbo - dubbo-metrics-default - ${project.parent.version} - - - - org.apache.dubbo - dubbo-metrics-registry - ${project.parent.version} - - - - org.apache.dubbo - dubbo-metrics-metadata - ${project.parent.version} - - - - org.apache.dubbo - dubbo-metrics-config-center - ${project.parent.version} - - - - org.apache.dubbo - dubbo-tracing + dubbo-metrics-monitor ${project.parent.version} diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/InitServiceMethodEvent.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/InitServiceMethodEvent.java new file mode 100644 index 00000000000..8055da3fe89 --- /dev/null +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/InitServiceMethodEvent.java @@ -0,0 +1,35 @@ +/* + * 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.config; + +import org.apache.dubbo.common.event.DubboEvent; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.model.ApplicationModel; + +public class InitServiceMethodEvent extends DubboEvent { + + private final Invocation invocation; + + public InitServiceMethodEvent(ApplicationModel source, Invocation invocation) { + super(source); + this.invocation = invocation; + } + + public Invocation getInvocation() { + return invocation; + } +} diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java index 363eccd8b5e..baa7ee21173 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java @@ -22,6 +22,7 @@ import org.apache.dubbo.common.config.ConfigurationUtils; import org.apache.dubbo.common.constants.CommonConstants; import org.apache.dubbo.common.constants.RegisterTypeEnum; +import org.apache.dubbo.common.event.DubboEventBus; import org.apache.dubbo.common.extension.ExtensionLoader; import org.apache.dubbo.common.logger.ErrorTypeAwareLogger; import org.apache.dubbo.common.logger.LoggerFactory; @@ -38,9 +39,6 @@ import org.apache.dubbo.config.support.Parameter; import org.apache.dubbo.config.utils.ConfigValidationUtils; import org.apache.dubbo.metadata.ServiceNameMapping; -import org.apache.dubbo.metrics.event.MetricsEventBus; -import org.apache.dubbo.metrics.event.MetricsInitEvent; -import org.apache.dubbo.metrics.model.MethodMetric; import org.apache.dubbo.registry.client.metadata.MetadataUtils; import org.apache.dubbo.rpc.Exporter; import org.apache.dubbo.rpc.Invoker; @@ -628,7 +626,6 @@ private void initServiceMethodMetrics(URL url) { String[] methods = Optional.ofNullable(url.getParameter(METHODS_KEY)) .map(i -> i.split(",")) .orElse(new String[] {}); - boolean serviceLevel = MethodMetric.isServiceLevel(application.getApplicationModel()); Arrays.stream(methods).forEach(method -> { RpcInvocation invocation = new RpcInvocation( url.getServiceKey(), @@ -642,8 +639,7 @@ private void initServiceMethodMetrics(URL url) { null, null, null); - MetricsEventBus.publish( - MetricsInitEvent.toMetricsInitEvent(application.getApplicationModel(), invocation, serviceLevel)); + DubboEventBus.publish(new InitServiceMethodEvent(application.getApplicationModel(), invocation)); }); } diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java index 28940038881..8f806a6e648 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java @@ -20,6 +20,7 @@ import org.apache.dubbo.common.config.ConfigurationUtils; import org.apache.dubbo.common.config.Environment; import org.apache.dubbo.common.config.ReferenceCache; +import org.apache.dubbo.common.config.configcenter.ConfigCenterChangeEvent; import org.apache.dubbo.common.config.configcenter.ConfigChangeType; import org.apache.dubbo.common.config.configcenter.DynamicConfiguration; import org.apache.dubbo.common.config.configcenter.DynamicConfigurationFactory; @@ -31,6 +32,7 @@ import org.apache.dubbo.common.deploy.DeployListener; import org.apache.dubbo.common.deploy.DeployState; import org.apache.dubbo.common.deploy.ModuleDeployer; +import org.apache.dubbo.common.event.DubboEventBus; import org.apache.dubbo.common.extension.ExtensionLoader; import org.apache.dubbo.common.lang.ShutdownHookCallbacks; import org.apache.dubbo.common.logger.ErrorTypeAwareLogger; @@ -44,22 +46,16 @@ import org.apache.dubbo.config.ConfigCenterConfig; import org.apache.dubbo.config.DubboShutdownHook; import org.apache.dubbo.config.MetadataReportConfig; -import org.apache.dubbo.config.MetricsConfig; import org.apache.dubbo.config.RegistryConfig; -import org.apache.dubbo.config.TracingConfig; import org.apache.dubbo.config.context.ConfigManager; +import org.apache.dubbo.config.deploy.event.ApplicationLoadedEvent; +import org.apache.dubbo.config.deploy.event.ApplicationStartedEvent; +import org.apache.dubbo.config.deploy.event.PreDestroyApplicationInstanceEvent; +import org.apache.dubbo.config.deploy.event.PrepareApplicationInstanceEvent; import org.apache.dubbo.config.utils.CompositeReferenceCache; import org.apache.dubbo.config.utils.ConfigValidationUtils; import org.apache.dubbo.metadata.report.MetadataReportFactory; import org.apache.dubbo.metadata.report.MetadataReportInstance; -import org.apache.dubbo.metrics.collector.DefaultMetricsCollector; -import org.apache.dubbo.metrics.config.event.ConfigCenterEvent; -import org.apache.dubbo.metrics.event.MetricsEventBus; -import org.apache.dubbo.metrics.report.DefaultMetricsReporterFactory; -import org.apache.dubbo.metrics.report.MetricsReporter; -import org.apache.dubbo.metrics.report.MetricsReporterFactory; -import org.apache.dubbo.metrics.service.MetricsServiceExporter; -import org.apache.dubbo.metrics.utils.MetricsSupportUtil; import org.apache.dubbo.registry.Registry; import org.apache.dubbo.registry.RegistryFactory; import org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataUtils; @@ -70,8 +66,6 @@ import org.apache.dubbo.rpc.model.ProviderModel; import org.apache.dubbo.rpc.model.ScopeModel; import org.apache.dubbo.rpc.model.ScopeModelUtil; -import org.apache.dubbo.tracing.DubboObservationRegistry; -import org.apache.dubbo.tracing.utils.ObservationSupportUtil; import java.io.IOException; import java.util.ArrayList; @@ -95,14 +89,11 @@ import static org.apache.dubbo.common.config.ConfigurationUtils.parseProperties; import static org.apache.dubbo.common.constants.CommonConstants.REGISTRY_SPLIT_PATTERN; import static org.apache.dubbo.common.constants.CommonConstants.REMOTE_METADATA_STORAGE_TYPE; -import static org.apache.dubbo.common.constants.LoggerCodeConstants.COMMON_METRICS_COLLECTOR_EXCEPTION; import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_FAILED_EXECUTE_DESTROY; import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_FAILED_INIT_CONFIG_CENTER; import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_FAILED_START_MODEL; import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_REFRESH_INSTANCE_ERROR; import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_REGISTER_INSTANCE_ERROR; -import static org.apache.dubbo.common.constants.MetricsConstants.PROTOCOL_DEFAULT; -import static org.apache.dubbo.common.constants.MetricsConstants.PROTOCOL_PROMETHEUS; import static org.apache.dubbo.common.utils.StringUtils.isEmpty; import static org.apache.dubbo.common.utils.StringUtils.isNotEmpty; import static org.apache.dubbo.config.Constants.DEFAULT_APP_NAME; @@ -136,8 +127,6 @@ public class DefaultApplicationDeployer extends AbstractDeployer startFuture; private final DubboShutdownHook dubboShutdownHook; - private volatile MetricsServiceExporter metricsServiceExporter; - private final Object stateLock = new Object(); private final Object startLock = new Object(); private final Object destroyLock = new Object(); @@ -227,12 +216,7 @@ public void initialize() { initModuleDeployers(); - initMetricsReporter(); - - initMetricsService(); - - // @since 3.2.3 - initObservationRegistry(); + DubboEventBus.publish(new ApplicationLoadedEvent(applicationModel)); // @since 2.7.8 startMetadataCenter(); @@ -375,86 +359,6 @@ private void useRegistryAsConfigCenterIfNecessary() { } } - private void initMetricsService() { - this.metricsServiceExporter = - getExtensionLoader(MetricsServiceExporter.class).getDefaultExtension(); - metricsServiceExporter.init(); - } - - private void initMetricsReporter() { - if (!MetricsSupportUtil.isSupportMetrics()) { - return; - } - DefaultMetricsCollector collector = applicationModel.getBeanFactory().getBean(DefaultMetricsCollector.class); - Optional configOptional = configManager.getMetrics(); - // If no specific metrics type is configured and there is no Prometheus dependency in the dependencies. - MetricsConfig metricsConfig = configOptional.orElse(new MetricsConfig(applicationModel)); - if (PROTOCOL_PROMETHEUS.equals(metricsConfig.getProtocol()) && !MetricsSupportUtil.isSupportPrometheus()) { - return; - } - if (StringUtils.isBlank(metricsConfig.getProtocol())) { - metricsConfig.setProtocol( - MetricsSupportUtil.isSupportPrometheus() ? PROTOCOL_PROMETHEUS : PROTOCOL_DEFAULT); - } - collector.setCollectEnabled(true); - collector.collectApplication(); - collector.setThreadpoolCollectEnabled( - Optional.ofNullable(metricsConfig.getEnableThreadpool()).orElse(true)); - collector.setMetricsInitEnabled( - Optional.ofNullable(metricsConfig.getEnableMetricsInit()).orElse(true)); - MetricsReporterFactory metricsReporterFactory = - getExtensionLoader(MetricsReporterFactory.class).getAdaptiveExtension(); - MetricsReporter metricsReporter = null; - try { - metricsReporter = metricsReporterFactory.createMetricsReporter(metricsConfig.toUrl()); - } catch (IllegalStateException e) { - if (e.getMessage().startsWith("No such extension org.apache.dubbo.metrics.report.MetricsReporterFactory")) { - logger.warn(COMMON_METRICS_COLLECTOR_EXCEPTION, "", "", e.getMessage()); - return; - } else { - throw e; - } - } - metricsReporter.init(); - applicationModel.getBeanFactory().registerBean(metricsReporter); - // If the protocol is not the default protocol, the default protocol is also initialized. - if (!PROTOCOL_DEFAULT.equals(metricsConfig.getProtocol())) { - DefaultMetricsReporterFactory defaultMetricsReporterFactory = - new DefaultMetricsReporterFactory(applicationModel); - MetricsReporter defaultMetricsReporter = - defaultMetricsReporterFactory.createMetricsReporter(metricsConfig.toUrl()); - defaultMetricsReporter.init(); - applicationModel.getBeanFactory().registerBean(defaultMetricsReporter); - } - } - - /** - * init ObservationRegistry(Micrometer) - */ - private void initObservationRegistry() { - if (!ObservationSupportUtil.isSupportObservation()) { - if (logger.isDebugEnabled()) { - logger.debug( - "Not found micrometer-observation or plz check the version of micrometer-observation version if already introduced, need > 1.10.0"); - } - return; - } - if (!ObservationSupportUtil.isSupportTracing()) { - if (logger.isDebugEnabled()) { - logger.debug("Not found micrometer-tracing dependency, skip init ObservationRegistry."); - } - return; - } - Optional configOptional = configManager.getTracing(); - if (!configOptional.isPresent() || !configOptional.get().getEnabled()) { - return; - } - - DubboObservationRegistry dubboObservationRegistry = - new DubboObservationRegistry(applicationModel, configOptional.get()); - dubboObservationRegistry.initObservationRegistry(); - } - private boolean isUsedRegistryAsConfigCenter(RegistryConfig registryConfig) { return isUsedRegistryAsCenter( registryConfig, registryConfig::getUseAsConfigCenter, "config", DynamicConfigurationFactory.class); @@ -780,7 +684,7 @@ public void prepareApplicationInstance(ModuleModel moduleModel) { } // export MetricsService - exportMetricsService(); + DubboEventBus.publish(new PrepareApplicationInstanceEvent(applicationModel)); if (moduleModel.getDeployer().hasRegistryInteraction()) { ApplicationConfig applicationConfig = configManager.getApplicationOrElseThrow(); @@ -832,36 +736,6 @@ public void prepareInternalModule() { } } - private void exportMetricsService() { - boolean exportMetrics = applicationModel - .getApplicationConfigManager() - .getMetrics() - .map(MetricsConfig::getExportMetricsService) - .orElse(true); - if (exportMetrics) { - try { - metricsServiceExporter.export(); - } catch (Exception e) { - logger.error( - LoggerCodeConstants.COMMON_METRICS_COLLECTOR_EXCEPTION, - "", - "", - "exportMetricsService an exception occurred when handle starting event", - e); - } - } - } - - private void unexportMetricsService() { - if (metricsServiceExporter != null) { - try { - metricsServiceExporter.unexport(); - } catch (Exception ignored) { - // ignored - } - } - } - private boolean hasExportedServices() { for (ModuleModel moduleModel : applicationModel.getModuleModels()) { if (CollectionUtils.isNotEmpty(moduleModel.getConfigManager().getServices())) { @@ -940,20 +814,20 @@ private DynamicConfiguration prepareEnvironment(ConfigCenterConfig configCenter) environment.updateAppExternalConfigMap(appConfigMap); // Add metrics - MetricsEventBus.publish(ConfigCenterEvent.toChangeEvent( + DubboEventBus.publish(new ConfigCenterChangeEvent( applicationModel, configCenter.getConfigFile(), configCenter.getGroup(), configCenter.getProtocol(), - ConfigChangeType.ADDED.name(), + ConfigChangeType.ADDED, configMap.size())); if (isNotEmpty(appGroup)) { - MetricsEventBus.publish(ConfigCenterEvent.toChangeEvent( + DubboEventBus.publish(new ConfigCenterChangeEvent( applicationModel, appConfigFile, appGroup, configCenter.getProtocol(), - ConfigChangeType.ADDED.name(), + ConfigChangeType.ADDED, appConfigMap.size())); } } catch (IOException e) { @@ -1094,7 +968,7 @@ public void preDestroy() { unregisterServiceInstance(); - unexportMetricsService(); + DubboEventBus.publish(new PreDestroyApplicationInstanceEvent(applicationModel)); unRegisterShutdownHook(); if (asyncMetadataFuture != null) { @@ -1335,7 +1209,7 @@ private void onStarted() { return; } setStarted(); - startMetricsCollector(); + DubboEventBus.publish(new ApplicationStartedEvent(applicationModel)); if (logger.isInfoEnabled()) { logger.info(getIdentifier() + " is ready."); } @@ -1365,13 +1239,6 @@ private void onCompletion() { } } - private void startMetricsCollector() { - DefaultMetricsCollector collector = applicationModel.getBeanFactory().getBean(DefaultMetricsCollector.class); - if (Objects.nonNull(collector) && collector.isThreadpoolCollectEnabled()) { - collector.registryDefaultSample(); - } - } - private void completeStartFuture(boolean success) { if (startFuture != null) { startFuture.complete(success); diff --git a/dubbo-metrics/dubbo-metrics-event/src/main/java/org/apache/dubbo/metrics/event/MetricsEventMulticaster.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/event/ApplicationLoadedEvent.java similarity index 70% rename from dubbo-metrics/dubbo-metrics-event/src/main/java/org/apache/dubbo/metrics/event/MetricsEventMulticaster.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/event/ApplicationLoadedEvent.java index 2f1381a7265..3c1468f71ae 100644 --- a/dubbo-metrics/dubbo-metrics-event/src/main/java/org/apache/dubbo/metrics/event/MetricsEventMulticaster.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/event/ApplicationLoadedEvent.java @@ -14,17 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.dubbo.metrics.event; +package org.apache.dubbo.config.deploy.event; -import org.apache.dubbo.metrics.listener.MetricsListener; +import org.apache.dubbo.common.event.DubboEvent; +import org.apache.dubbo.rpc.model.ApplicationModel; -public interface MetricsEventMulticaster { +public class ApplicationLoadedEvent extends DubboEvent { - void addListener(MetricsListener listener); - - void publishEvent(MetricsEvent event); - - void publishFinishEvent(TimeCounterEvent event); - - void publishErrorEvent(TimeCounterEvent event); + public ApplicationLoadedEvent(ApplicationModel source) { + super(source); + } } diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/event/ApplicationStartedEvent.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/event/ApplicationStartedEvent.java new file mode 100644 index 00000000000..298d5ef2a8f --- /dev/null +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/event/ApplicationStartedEvent.java @@ -0,0 +1,27 @@ +/* + * 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.config.deploy.event; + +import org.apache.dubbo.common.event.DubboEvent; +import org.apache.dubbo.rpc.model.ApplicationModel; + +public class ApplicationStartedEvent extends DubboEvent { + + public ApplicationStartedEvent(ApplicationModel source) { + super(source); + } +} diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/event/PreDestroyApplicationInstanceEvent.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/event/PreDestroyApplicationInstanceEvent.java new file mode 100644 index 00000000000..6e215575c9c --- /dev/null +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/event/PreDestroyApplicationInstanceEvent.java @@ -0,0 +1,27 @@ +/* + * 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.config.deploy.event; + +import org.apache.dubbo.common.event.DubboEvent; +import org.apache.dubbo.rpc.model.ApplicationModel; + +public class PreDestroyApplicationInstanceEvent extends DubboEvent { + + public PreDestroyApplicationInstanceEvent(ApplicationModel source) { + super(source); + } +} diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/event/PrepareApplicationInstanceEvent.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/event/PrepareApplicationInstanceEvent.java new file mode 100644 index 00000000000..cdead7419a7 --- /dev/null +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/event/PrepareApplicationInstanceEvent.java @@ -0,0 +1,27 @@ +/* + * 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.config.deploy.event; + +import org.apache.dubbo.common.event.DubboEvent; +import org.apache.dubbo.rpc.model.ApplicationModel; + +public class PrepareApplicationInstanceEvent extends DubboEvent { + + public PrepareApplicationInstanceEvent(ApplicationModel source) { + super(source); + } +} diff --git a/dubbo-config/dubbo-config-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metrics.service.MetricsServiceExporter b/dubbo-config/dubbo-config-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metrics.service.MetricsServiceExporter deleted file mode 100644 index 7edea936d57..00000000000 --- a/dubbo-config/dubbo-config-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.metrics.service.MetricsServiceExporter +++ /dev/null @@ -1 +0,0 @@ -default=org.apache.dubbo.config.deploy.DefaultMetricsServiceExporter diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.metrics.service.MetricsServiceExporter b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.metrics.service.MetricsServiceExporter deleted file mode 100644 index 7edea936d57..00000000000 --- a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.metrics.service.MetricsServiceExporter +++ /dev/null @@ -1 +0,0 @@ -default=org.apache.dubbo.config.deploy.DefaultMetricsServiceExporter diff --git a/dubbo-configcenter/dubbo-configcenter-apollo/pom.xml b/dubbo-configcenter/dubbo-configcenter-apollo/pom.xml index 5a709b40e8f..6c1e0a0e370 100644 --- a/dubbo-configcenter/dubbo-configcenter-apollo/pom.xml +++ b/dubbo-configcenter/dubbo-configcenter-apollo/pom.xml @@ -39,21 +39,6 @@ dubbo-common ${project.parent.version}