Merge pull request #538 from yanhom1314/master

[ISSUE #530 #533] replace cglib with bytebuddy

Author: yanhom1314

common/pom.xml

@@ -52,8 +52,8 @@
         </dependency>
 
         <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
         </dependency>
 
         <dependency>

common/src/main/java/org/dromara/dynamictp/common/plugin/DtpInterceptorProxyFactory.java

@@ -18,7 +18,12 @@
 package org.dromara.dynamictp.common.plugin;
 
 import com.google.common.collect.Maps;
-import net.sf.cglib.proxy.Enhancer;
+import net.bytebuddy.ByteBuddy;
+import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
+import net.bytebuddy.implementation.InvocationHandlerAdapter;
+import net.bytebuddy.implementation.attribute.MethodAttributeAppender;
+import net.bytebuddy.matcher.ElementMatchers;
+import org.dromara.dynamictp.common.util.UUIDUtil;
 
 import java.lang.reflect.Method;
 import java.util.HashSet;
@@ -43,21 +48,32 @@ public static Object enhance(Object target, Class<?>[] argumentTypes, Object[] a
         if (!signatureMap.containsKey(target.getClass())) {
             return target;
         }
-        Enhancer enhancer = new Enhancer();
-        enhancer.setSuperclass(target.getClass());
-        enhancer.setCallback(new DtpInterceptorProxy(target, interceptor, signatureMap));
-        if (Objects.isNull(argumentTypes) || Objects.isNull(arguments)) {
-            return enhancer.create();
+        try {
+            Class<?> proxyClass = new ByteBuddy()
+                    .subclass(target.getClass())
+                    .name(String.format("%s$ByteBuddy$%s", target.getClass().getName(), UUIDUtil.genUuid(5)))
+                    .method(ElementMatchers.any())
+                    .intercept(InvocationHandlerAdapter.of(new DtpInvocationHandler(target, interceptor, signatureMap)))
+                    .attribute(MethodAttributeAppender.ForInstrumentedMethod.INCLUDING_RECEIVER)
+                    .annotateType(target.getClass().getAnnotations())
+                    .make()
+                    .load(DtpInterceptorProxyFactory.class.getClassLoader(), ClassLoadingStrategy.Default.INJECTION)
+                    .getLoaded();
+
+            if (Objects.isNull(argumentTypes) || Objects.isNull(arguments)) {
+                return proxyClass.getDeclaredConstructor().newInstance();
+            }
+            return proxyClass.getDeclaredConstructor(argumentTypes).newInstance(arguments);
+        } catch (Exception e) {
+            throw new PluginException("Failed to create proxy instance", e);
         }
-        return enhancer.create(argumentTypes, arguments);
     }
 
     private static Map<Class<?>, Set<Method>> getSignatureMap(DtpInterceptor interceptor) {
         DtpIntercepts interceptsAnno = interceptor.getClass().getAnnotation(DtpIntercepts.class);
         if (interceptsAnno == null) {
             throw new PluginException("No @DtpIntercepts annotation was found in interceptor " + interceptor.getClass().getName());
         }
-
         DtpSignature[] signatures = interceptsAnno.signatures();
         Map<Class<?>, Set<Method>> signatureMap = Maps.newHashMap();
         for (DtpSignature signature : signatures) {

…p/common/plugin/DtpInterceptorProxy.java …/common/plugin/DtpInvocationHandler.javacommon/src/main/java/org/dromara/dynamictp/common/plugin/DtpInterceptorProxy.java renamed to common/src/main/java/org/dromara/dynamictp/common/plugin/DtpInvocationHandler.java common/src/main/java/org/dromara/dynamictp/common/plugin/DtpInterceptorProxy.java renamed to common/src/main/java/org/dromara/dynamictp/common/plugin/DtpInvocationHandler.java

@@ -17,39 +17,39 @@
 
 package org.dromara.dynamictp.common.plugin;
 
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
 import org.apache.commons.collections4.CollectionUtils;
 
+import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.Set;
 
 /**
- * @author windsearcher.lq
- * @since 1.1.4
+ * DtpInvocationHandler related
+ *
+ * @author yanhom
+ * @since 1.2.1
  */
-public class DtpInterceptorProxy implements MethodInterceptor {
+public class DtpInvocationHandler implements InvocationHandler {
 
     private final Object target;
 
     private final DtpInterceptor interceptor;
 
     private final Map<Class<?>, Set<Method>> signatureMap;
 
-    public DtpInterceptorProxy(Object target, DtpInterceptor interceptor, Map<Class<?>, Set<Method>> signatureMap) {
+    public DtpInvocationHandler(Object target, DtpInterceptor interceptor, Map<Class<?>, Set<Method>> signatureMap) {
         this.target = target;
         this.interceptor = interceptor;
         this.signatureMap = signatureMap;
     }
 
     @Override
-    public Object intercept(Object object, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
         Set<Method> methods = signatureMap.get(method.getDeclaringClass());
         if (CollectionUtils.isNotEmpty(methods) && methods.contains(method)) {
             return interceptor.intercept(new DtpInvocation(target, method, args));
         }
-
         return method.invoke(target, args);
     }
 }

common/src/main/java/org/dromara/dynamictp/common/util/BeanCopierUtil.java

@@ -0,0 +1,38 @@
+/*
+ * 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.dromara.dynamictp.common.util;
+
+import java.util.UUID;
+
+/**
+ * UUID util.
+ *
+ * @author yanhom
+ */
+public class UUIDUtil {
+
+    private UUIDUtil() { }
+    
+    public static String genUuid() {
+        return UUID.randomUUID().toString();
+    }
+
+    public static String genUuid(int length) {
+        return genUuid().replace("-", "").substring(0, length);
+    }
+}

common/src/main/java/org/dromara/dynamictp/common/util/UUIDUtil.java

@@ -24,9 +24,7 @@
 import org.dromara.dynamictp.common.event.CollectEvent;
 import org.dromara.dynamictp.common.event.CustomContextRefreshedEvent;
 import org.dromara.dynamictp.common.manager.EventBusManager;
-
 import org.dromara.dynamictp.common.properties.DtpProperties;
-
 import org.dromara.dynamictp.core.DtpRegistry;
 import org.dromara.dynamictp.core.converter.ExecutorConverter;
 import org.dromara.dynamictp.core.handler.CollectorHandler;
@@ -80,8 +78,12 @@ public synchronized void onContextRefreshedEvent(CustomContextRefreshedEvent eve
 
     private void run() {
         Set<String> executorNames = DtpRegistry.getAllExecutorNames();
-        checkAlarm(executorNames);
-        collectMetrics(executorNames);
+        try {
+            checkAlarm(executorNames);
+            collectMetrics(executorNames);
+        } catch (Exception e) {
+            log.error("DynamicTp monitor, run error", e);
+        }
     }
 
     private void checkAlarm(Set<String> executorNames) {

core/src/main/java/org/dromara/dynamictp/core/monitor/DtpMonitor.java

@@ -17,12 +17,12 @@
 
 package org.dromara.dynamictp.core.monitor.collector;
 
+import cn.hutool.core.bean.BeanUtil;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.dynamictp.common.em.CollectorTypeEnum;
 import org.dromara.dynamictp.common.entity.ThreadPoolStats;
-import org.dromara.dynamictp.common.util.BeanCopierUtil;
 import org.dromara.dynamictp.common.util.CommonUtil;
 
 import java.util.ArrayList;
@@ -61,7 +61,7 @@ public void collect(ThreadPoolStats threadPoolStats) {
         if (Objects.isNull(oldStats)) {
             GAUGE_CACHE.put(threadPoolStats.getPoolName(), threadPoolStats);
         } else {
-            BeanCopierUtil.copyProperties(threadPoolStats, oldStats);
+            BeanUtil.copyProperties(threadPoolStats, oldStats);
         }
         gauge(GAUGE_CACHE.get(threadPoolStats.getPoolName()));
     }

core/src/main/java/org/dromara/dynamictp/core/monitor/collector/MicroMeterCollector.java

@@ -17,10 +17,10 @@
 
 package org.dromara.dynamictp.core.monitor.collector.jmx;
 
+import cn.hutool.core.bean.BeanUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.dynamictp.common.em.CollectorTypeEnum;
 import org.dromara.dynamictp.common.entity.ThreadPoolStats;
-import org.dromara.dynamictp.common.util.BeanCopierUtil;
 import org.dromara.dynamictp.core.monitor.collector.AbstractCollector;
 
 import javax.management.JMException;
@@ -49,7 +49,7 @@ public class JMXCollector extends AbstractCollector {
     public void collect(ThreadPoolStats threadPoolStats) {
         if (GAUGE_CACHE.containsKey(threadPoolStats.getPoolName())) {
             ThreadPoolStats poolStats = GAUGE_CACHE.get(threadPoolStats.getPoolName());
-            BeanCopierUtil.copyProperties(threadPoolStats, poolStats);
+            BeanUtil.copyProperties(threadPoolStats, poolStats);
         } else {
             try {
                 MBeanServer server = ManagementFactory.getPlatformMBeanServer();

core/src/main/java/org/dromara/dynamictp/core/monitor/collector/jmx/JMXCollector.java

@@ -17,6 +17,7 @@
 
 package org.dromara.dynamictp.core.notifier;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.google.common.base.Joiner;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
@@ -28,7 +29,6 @@
 import org.dromara.dynamictp.common.entity.NotifyPlatform;
 import org.dromara.dynamictp.common.entity.TpMainFields;
 import org.dromara.dynamictp.common.notifier.Notifier;
-import org.dromara.dynamictp.common.util.BeanCopierUtil;
 import org.dromara.dynamictp.common.util.CommonUtil;
 import org.dromara.dynamictp.common.util.DateUtil;
 import org.dromara.dynamictp.core.notifier.alarm.AlarmCounter;
@@ -182,7 +182,7 @@ protected String formatReceivers(String receives) {
 
     private NotifyPlatform newTargetPlatform(NotifyPlatform platform) {
         NotifyPlatform targetPlatform = new NotifyPlatform();
-        BeanCopierUtil.copyProperties(platform, targetPlatform);
+        BeanUtil.copyProperties(platform, targetPlatform);
 
         BaseNotifyCtx context = DtpNotifyCtxHolder.get();
         NotifyItem item = context.getNotifyItem();

core/src/main/java/org/dromara/dynamictp/core/notifier/AbstractDtpNotifier.java

@@ -17,10 +17,10 @@
 
 package org.dromara.dynamictp.core.support;
 
+import cn.hutool.core.bean.BeanUtil;
 import lombok.Data;
 import org.dromara.dynamictp.common.em.NotifyItemEnum;
 import org.dromara.dynamictp.common.entity.NotifyItem;
-import org.dromara.dynamictp.common.util.BeanCopierUtil;
 import org.dromara.dynamictp.core.aware.AwareManager;
 import org.dromara.dynamictp.core.aware.RejectHandlerAware;
 import org.dromara.dynamictp.core.aware.TaskEnhanceAware;
@@ -166,8 +166,8 @@ public static ExecutorWrapper of(DtpExecutor executor) {
      */
     public ExecutorWrapper capture() {
         ExecutorWrapper executorWrapper = new ExecutorWrapper();
-        BeanCopierUtil.copyProperties(this, executorWrapper);
-        executorWrapper.executor = new CapturedExecutor(this.getExecutor());
+        BeanUtil.copyProperties(this, executorWrapper);
+        executorWrapper.setExecutor(new CapturedExecutor(this.getExecutor()));
         return executorWrapper;
     }
     /**