Skip to content

Commit e67ea54

Browse files
EvenLjjliujianjun.ljj
and
liujianjun.ljj
authored
fix test case error (#1407)
Co-authored-by: liujianjun.ljj <[email protected]>
1 parent 70f16f3 commit e67ea54

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

tracer/tracer-opentracing/src/test/java/com/alipay/sofa/rpc/event/SofaTracerSubscriberTest.java test/test-integration/src/test/java/com/alipay/sofa/rpc/tracer/sofatracer/SofaTracerSubscriberTest.java

+5-14
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,20 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
package com.alipay.sofa.rpc.event;
17+
package com.alipay.sofa.rpc.tracer.sofatracer;
1818

1919
import com.alipay.common.tracer.core.holder.SofaTraceContextHolder;
2020
import com.alipay.common.tracer.core.span.SofaTracerSpan;
2121
import com.alipay.sofa.rpc.common.RemotingConstants;
22-
import com.alipay.sofa.rpc.common.RpcOptions;
2322
import com.alipay.sofa.rpc.context.RpcInternalContext;
2423
import com.alipay.sofa.rpc.core.request.SofaRequest;
24+
import com.alipay.sofa.rpc.event.ClientBeforeSendEvent;
25+
import com.alipay.sofa.rpc.event.ClientStartInvokeEvent;
26+
import com.alipay.sofa.rpc.event.EventBus;
27+
import com.alipay.sofa.rpc.event.ServerReceiveEvent;
2528
import com.alipay.sofa.rpc.tracer.sofatracer.log.tags.RpcSpanTags;
2629
import io.opentracing.tag.Tags;
27-
import org.junit.AfterClass;
2830
import org.junit.Assert;
29-
import org.junit.BeforeClass;
3031
import org.junit.Test;
3132

3233
import java.util.Map;
@@ -41,11 +42,6 @@
4142
*/
4243
public class SofaTracerSubscriberTest {
4344

44-
@BeforeClass
45-
public static void beforeClass() {
46-
System.getProperties().put(RpcOptions.DEFAULT_TRACER, "sofaTracer");
47-
}
48-
4945
@Test
5046
public void testClientSendAndServerReceiveTracerEvent() {
5147
SofaRequest sofaRequest = new SofaRequest();
@@ -85,9 +81,4 @@ public void testClientSendAndServerReceiveTracerEvent() {
8581
SofaTraceContextHolder.getSofaTraceContext().clear();
8682
}
8783

88-
@AfterClass
89-
public static void afterClass() {
90-
System.getProperties().remove(RpcOptions.DEFAULT_TRACER);
91-
}
92-
9384
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"rpc.config.order": 999,
3-
"logger.impl": "com.alipay.sofa.rpc.log.SLF4JLoggerImpl"
3+
"logger.impl": "com.alipay.sofa.rpc.log.SLF4JLoggerImpl",
4+
"default.tracer": "sofaTracer"
45
}

0 commit comments

Comments
 (0)