diff --git a/htrace-core4/src/main/java/org/apache/htrace/core/TracerPool.java b/htrace-core4/src/main/java/org/apache/htrace/core/TracerPool.java index 26e39f5..cb04934 100644 --- a/htrace-core4/src/main/java/org/apache/htrace/core/TracerPool.java +++ b/htrace-core4/src/main/java/org/apache/htrace/core/TracerPool.java @@ -228,7 +228,9 @@ public class TracerPool { HTraceConfiguration conf, ClassLoader classLoader) { SpanReceiver[] receivers = curReceivers; for (SpanReceiver receiver : receivers) { - if (receiver.getClass().getName().equals(className)) { + String receiverClass = className.contains(".") ? + receiver.getClass().getName() : receiver.getClass().getSimpleName(); + if (receiverClass.equals(className)) { LOG.trace(toString() + ": returning a reference to receiver " + receiver.toString()); return receiver; @@ -282,4 +284,4 @@ public class TracerPool { public String toString() { return "TracerPool(" + name + ")"; } -} \ No newline at end of file +} diff --git a/htrace-core4/src/test/java/org/apache/htrace/core/TestTracerPool.java b/htrace-core4/src/test/java/org/apache/htrace/core/TestTracerPool.java new file mode 100644 index 0000000..daf8ac1 --- /dev/null +++ b/htrace-core4/src/test/java/org/apache/htrace/core/TestTracerPool.java @@ -0,0 +1,44 @@ +/* + * 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.htrace.core; + +import static org.junit.Assert.assertTrue; +import org.junit.Test; + +public class TestTracerPool { + HTraceConfiguration conf = HTraceConfiguration.EMPTY; + ClassLoader loader = TestTracerPool.class.getClassLoader(); + + @Test + public void testLoadReceiver() { + addThenLoadReceiverType("org.apache.htrace.core.POJOSpanReceiver"); + } + + @Test + public void testLoadReceiverWithSimpleName() { + addThenLoadReceiverType("POJOSpanReceiver"); + } + + public void addThenLoadReceiverType(String className) { + TracerPool pool = new TracerPool(className); + SpanReceiver receiver = new SpanReceiver.Builder(conf). + className(className). + build(); + pool.addReceiver(receiver); + assertTrue(receiver == pool.loadReceiverType(className, conf, loader)); + } +}