fanruan
/
design
6
1
Fork 1
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

Pull request #14185: REPORT-114392 FR-FBP版本本地设计适配 去除支线且暂不支持的逻辑，保证测试 

Merge in DESIGN/design from ~DESTINY.LIN/design:fbp-1.0 to fbp-1.0

* commit '1c4aa2cd887d3701841ecf3dc007994cb4830ff4':
  REPORT-114392 FR-FBP版本本地设计适配 去除支线且暂不支持的逻辑，保证测试
fbp-1.0
Destiny.Lin-林锦龙 8 months ago
parent
f714695751 1c4aa2cd88
commit
900713c5de
2 changed files with 72 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      designer-realize/src/main/java/com/fanruan/boot/env/DesignPluginComponent.java
  2. 128
      designer-realize/src/main/java/com/fanruan/boot/env/function/DesignAnalyzerComponent.java

8
designer-realize/src/main/java/com/fanruan/boot/env/DesignPluginComponent.java vendored
Unescape View File

@ -1,9 +1,13 @@
package com.fanruan.boot.env;
import com.fanruan.boot.PluginComponent;
import com.fanruan.carina.Carina;
import com.fanruan.carina.annotions.DependsOn;
import com.fanruan.carina.annotions.FineComponent;
import com.fanruan.carina.annotions.Start;
import com.fanruan.plugin.autonomy.AutonomyClassManagerGroup;
import com.fanruan.plugin.autonomy.AutonomyClassManagerProvider;
import com.fr.plugin.ExtraClassManager;
import javax.servlet.ServletContext;
@ -23,7 +27,9 @@ public class DesignPluginComponent extends PluginComponent {
*/
@Start
public void start() {
super.start();
// 暂不启动,预留接口
ExtraClassManager.getInstance().registerAutonomyClassManager(Carina.getApplicationContext().group(AutonomyClassManagerGroup.class).getAll().toArray(new AutonomyClassManagerProvider[0]));
}
@Override

128
designer-realize/src/main/java/com/fanruan/boot/env/function/DesignAnalyzerComponent.java vendored
Unescape View File

@ -65,41 +65,41 @@ public class DesignAnalyzerComponent extends ResourceAffiliate {
*/
@Start
public void start() {
OptimizeUtil.open(OptimizeUtil.Module.ANALYZER,() -> {
AnalyzerAssemblyFactory basicFactory = createBasicFactory();
// 兼容逻辑
List<AnalyzerConfiguration> backwardsConfigurations = new ArrayList<>(Carina.getApplicationContext().group(AnalyzerKey.class).getAll());
if (!CollectionUtils.isEmpty(backwardsConfigurations)) {
// 直接初始化，不添加默认值，防止和下面的冲突
FineAnalyzer.initDirectly(FineAssist.findInstrumentation(), basicFactory, backwardsConfigurations.toArray(new AnalyzerConfiguration[0]));
}
// 等页面完全打开后，再进行 retransform， 别影响了启动速度
EventDispatcher.listen(DesignerLaunchStatus.STARTUP_COMPLETE, new Listener<Null>() {
@Override
public void on(Event event, Null param) {
ExecutorService es = newSingleThreadExecutor(new NamedThreadFactory("designer-analyzer", true));
try {
// 加入 retransform 部分的逻辑
List<FineAdviceAssistant> adviceConfigurations = new ArrayList<>(Carina.getApplicationContext().group(AnalyzerAdviceKey.class).getAll());
if (!CollectionUtils.isEmpty(adviceConfigurations)) {
AnalyzerConfiguration[] configurations = convertConfigurations(adviceConfigurations);
es.submit(() -> {
DesignerAnalyzer.init(basicFactory, configurations);
});
}
} finally {
es.shutdown();
}
}
});
});
/// 埋点分析模块等fbp那边把逻辑理顺了再加上去
// OptimizeUtil.open(OptimizeUtil.Module.ANALYZER,() -> {
//
// AnalyzerAssemblyFactory basicFactory = createBasicFactory();
//
// // 兼容逻辑
// List<AnalyzerConfiguration> backwardsConfigurations = new ArrayList<>(Carina.getApplicationContext().group(AnalyzerKey.class).getAll());
// if (!CollectionUtils.isEmpty(backwardsConfigurations)) {
// // 直接初始化，不添加默认值，防止和下面的冲突
// FineAnalyzer.initDirectly(FineAssist.findInstrumentation(), basicFactory, backwardsConfigurations.toArray(new AnalyzerConfiguration[0]));
// }
//
// // 等页面完全打开后，再进行 retransform， 别影响了启动速度
// EventDispatcher.listen(DesignerLaunchStatus.STARTUP_COMPLETE, new Listener<Null>() {
//
// @Override
// public void on(Event event, Null param) {
//
// ExecutorService es = newSingleThreadExecutor(new NamedThreadFactory("designer-analyzer", true));
// try {
// // 加入 retransform 部分的逻辑
// List<FineAdviceAssistant> adviceConfigurations = new ArrayList<>(Carina.getApplicationContext().group(AnalyzerAdviceKey.class).getAll());
//
// if (!CollectionUtils.isEmpty(adviceConfigurations)) {
// AnalyzerConfiguration[] configurations = convertConfigurations(adviceConfigurations);
// es.submit(() -> {
// DesignerAnalyzer.init(basicFactory, configurations);
// });
// }
// } finally {
// es.shutdown();
// }
// }
// });
// });
}
@NotNull
@ -116,35 +116,37 @@ public class DesignAnalyzerComponent extends ResourceAffiliate {
*/
@Supplemental
public void prepare() {
Carina.getApplicationContext().group(AnalyzerAdviceKey.class).add(FineAdviceAssistant.create(
ElementMatchers.isAnnotatedWith(Focus.class),
FocusAdvice.class
));
Carina.getApplicationContext().group(AnalyzerAdviceKey.class).add(FineAdviceAssistant.create(
ElementMatchers.isAnnotatedWith(Compute.class),
MonitorAdvice.class
));
Carina.getApplicationContext().group(AnalyzerAdviceKey.class).add(FineAdviceAssistant.create(
ElementMatchers.isAnnotatedWith(DBMetrics.class),
DBMonitorAdvice.class
));
Carina.getApplicationContext().group(AnalyzerAdviceKey.class).add(FineAdviceAssistant.create(
ElementMatchers.isAnnotatedWith(PerformancePoint.class),
PerformancePointAdvice.class
));
Carina.getApplicationContext().group(AnalyzerAdviceKey.class).add(FineAdviceAssistant.create(
ElementMatchers.isAnnotatedWith(FaultTolerance.class),
FaultToleranceAdvice.class
));
// 保持M1 可用
Carina.getApplicationContext().group(AnalyzerKey.class).add(AnalyzerConfiguration.create((builder, typeDescription, classLoader, module) -> builder
.method(ElementMatchers.isAnnotatedWith(Collect.class))
.intercept(MethodDelegation.to(CollectInterceptor.class))));
Carina.getApplicationContext().group(AnalyzerAdviceKey.class).add(FineAdviceAssistant.create(
ElementMatchers.isAnnotatedWith(Collect.class),
CollectAdvice.class
));
/// 埋点分析模块等fbp那边把逻辑理顺了再加上去
// Carina.getApplicationContext().group(AnalyzerAdviceKey.class).add(FineAdviceAssistant.create(
// ElementMatchers.isAnnotatedWith(Focus.class),
// FocusAdvice.class
// ));
// Carina.getApplicationContext().group(AnalyzerAdviceKey.class).add(FineAdviceAssistant.create(
// ElementMatchers.isAnnotatedWith(Compute.class),
// MonitorAdvice.class
// ));
// Carina.getApplicationContext().group(AnalyzerAdviceKey.class).add(FineAdviceAssistant.create(
// ElementMatchers.isAnnotatedWith(DBMetrics.class),
// DBMonitorAdvice.class
// ));
// Carina.getApplicationContext().group(AnalyzerAdviceKey.class).add(FineAdviceAssistant.create(
// ElementMatchers.isAnnotatedWith(PerformancePoint.class),
// PerformancePointAdvice.class
// ));
// Carina.getApplicationContext().group(AnalyzerAdviceKey.class).add(FineAdviceAssistant.create(
// ElementMatchers.isAnnotatedWith(FaultTolerance.class),
// FaultToleranceAdvice.class
// ));
// // 保持M1 可用
// Carina.getApplicationContext().group(AnalyzerKey.class).add(AnalyzerConfiguration.create((builder, typeDescription, classLoader, module) -> builder
// .method(ElementMatchers.isAnnotatedWith(Collect.class))
// .intercept(MethodDelegation.to(CollectInterceptor.class))));
//
// Carina.getApplicationContext().group(AnalyzerAdviceKey.class).add(FineAdviceAssistant.create(
// ElementMatchers.isAnnotatedWith(Collect.class),
// CollectAdvice.class
// ));
}

Write Preview
Loading…
Cancel
Save