From 7f904eee329a6ede80056c88141b69350e407eb6 Mon Sep 17 00:00:00 2001 From: wusheng Date: Mon, 21 Dec 2015 21:32:08 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=A7=BB=E9=99=A4=E9=83=A8=E5=88=86=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81=E3=80=82=202.=E4=BF=AE=E6=94=B9Trac?= =?UTF-8?q?ingEnhanceProcessor=E7=9A=84BeanName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/spring/TracingPackageBean.java | 13 ------------- .../plugin/spring/TracingPatternParser.java | 17 ++++++----------- 2 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingPackageBean.java diff --git a/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingPackageBean.java b/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingPackageBean.java deleted file mode 100644 index 8ebd63d24..000000000 --- a/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingPackageBean.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.ai.cloud.skywalking.plugin.spring; - -public class TracingPackageBean { - private String packageName; - - public String getPackageName() { - return packageName; - } - - public void setPackageName(String packageName) { - this.packageName = packageName; - } -} diff --git a/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingPatternParser.java b/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingPatternParser.java index d462e0f79..c3b2ff96a 100644 --- a/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingPatternParser.java +++ b/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/TracingPatternParser.java @@ -11,15 +11,10 @@ import org.w3c.dom.Node; public class TracingPatternParser implements BeanDefinitionParser { - private final String TRACE_PROCESSOR_BEAN_NAME = "TraceProcessorBean"; + private final String TRACE_ENHANCE_PROCESSOR_BEAN_NAME = "TracingEnhanceProcessor"; @Override public BeanDefinition parse(Element element, ParserContext parserContext) { - // 获取Method并处理 - String methodPattern = element.getAttribute("method"); - if (methodPattern == null || methodPattern.length() == 0) { - throw new IllegalStateException("Miss method pattern"); - } RootBeanDefinition beanDefinition = new RootBeanDefinition(); beanDefinition.setBeanClass(TracingPattern.class); String id = element.getAttribute("id"); @@ -52,11 +47,11 @@ public class TracingPatternParser implements BeanDefinitionParser { } } - if (!parserContext.getRegistry().containsBeanDefinition(TRACE_PROCESSOR_BEAN_NAME)){ - RootBeanDefinition traceProcessorBeanDefinition = new RootBeanDefinition(); - traceProcessorBeanDefinition.setBeanClass(TracingEnhanceProcessor.class); - traceProcessorBeanDefinition.setLazyInit(false); - parserContext.getRegistry().registerBeanDefinition(TRACE_PROCESSOR_BEAN_NAME, traceProcessorBeanDefinition); + if (!parserContext.getRegistry().containsBeanDefinition(TRACE_ENHANCE_PROCESSOR_BEAN_NAME)){ + RootBeanDefinition traceEnhanceProcessorBeanDefinition = new RootBeanDefinition(); + traceEnhanceProcessorBeanDefinition.setBeanClass(TracingEnhanceProcessor.class); + traceEnhanceProcessorBeanDefinition.setLazyInit(false); + parserContext.getRegistry().registerBeanDefinition(TRACE_ENHANCE_PROCESSOR_BEAN_NAME, traceEnhanceProcessorBeanDefinition); } return beanDefinition;