aboutsummaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorsebright <sebright@google.com>2018-09-14 11:28:10 -0700
committerGitHub <noreply@github.com>2018-09-14 11:28:10 -0700
commit97a1875a5829de584ecd0d723f0c0bbea3f97319 (patch)
treed894632b0910c5ba0a0ba2d3070b540b61fad58b /buildscripts
parent4ddf824f81d1e4b5ebdfd988ccc140686b9fa3f5 (diff)
downloadopencensus-java-97a1875a5829de584ecd0d723f0c0bbea3f97319.tar.gz
Improve implementation of OpenCensusTraceContextDataInjector. (#1413)
This commit improves the thread safety of OpenCensusTraceContextDataInjector by following the thread safety requirements in the Javadocs of the overridden methods from ContextDataInjector. It also handles the possibility of ThreadContext.getThreadContextMap() returning null by adding a Nullable annotation in a Checker Framework stub file and adding null checks to the code.
Diffstat (limited to 'buildscripts')
-rw-r--r--buildscripts/import-control.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/buildscripts/import-control.xml b/buildscripts/import-control.xml
index b89f9f27..61c42f10 100644
--- a/buildscripts/import-control.xml
+++ b/buildscripts/import-control.xml
@@ -95,6 +95,7 @@ General guidelines on imports:
<allow pkg="io.opencensus.trace"/>
</subpackage>
<subpackage name="logcorrelation.log4j2">
+ <allow pkg="io.opencensus.contrib.logcorrelation.log4j2"/>
<allow pkg="io.opencensus.trace"/>
<disallow pkg="org.apache.logging.log4j.core.impl"/>
<allow pkg="org.apache.logging.log4j"/>