grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: Avoid compare default TagContext in thread local with empty. (#4613)

This commit is contained in:
Yang Song 2018-07-03 15:28:05 -07:00 committed by Kun Zhang
parent b61968c61a
commit 02ad99e1f5
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/test/java/io/grpc/internal/CensusModulesTest.java
View File

@ -70,7 +70,6 @@ import io.grpc.testing.TestMethodDescriptors;
import io.opencensus.contrib.grpc.metrics.RpcMeasureConstants; import io.opencensus.contrib.grpc.metrics.RpcMeasureConstants;
import io.opencensus.tags.TagContext; import io.opencensus.tags.TagContext;
import io.opencensus.tags.TagValue; import io.opencensus.tags.TagValue;
import io.opencensus.tags.Tags;
import io.opencensus.trace.EndSpanOptions; import io.opencensus.trace.EndSpanOptions;
import io.opencensus.trace.MessageEvent; import io.opencensus.trace.MessageEvent;
import io.opencensus.trace.MessageEvent.Type; import io.opencensus.trace.MessageEvent.Type;
@ -261,7 +260,7 @@ public class CensusModulesTest {
ctx.detach(origCtx); ctx.detach(origCtx);
} }
} else { } else {
assertEquals(Tags.getTagger().empty(), TAG_CONTEXT_KEY.get()); assertEquals(TAG_CONTEXT_KEY.get(Context.ROOT), TAG_CONTEXT_KEY.get());
assertNull(ContextUtils.CONTEXT_SPAN_KEY.get()); assertNull(ContextUtils.CONTEXT_SPAN_KEY.get());
call = interceptedChannel.newCall(method, CALL_OPTIONS); call = interceptedChannel.newCall(method, CALL_OPTIONS);
} }