diff options
| author | sebright <sebright@google.com> | 2018-09-09 13:27:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-09 13:27:57 -0700 |
| commit | dfc9d00706a16387346e2567ef23139da29fba2f (patch) | |
| tree | 81f009519e36878c3b296299150df2bdf38b1c1f | |
| parent | 1450cd934d1d3a316f6acee8c6d33fc16759dceb (diff) | |
| download | platform_external_opencensus-java-dfc9d00706a16387346e2567ef23139da29fba2f.tar.gz platform_external_opencensus-java-dfc9d00706a16387346e2567ef23139da29fba2f.tar.bz2 platform_external_opencensus-java-dfc9d00706a16387346e2567ef23139da29fba2f.zip | |
Avoid using internal org.apache.logging.log4j.core.impl package. (#1421)
This commit adds the internal package to import-control.xml and removes the use
of org.apache.logging.log4j.core.impl.ThreadContextDataInjector.
| -rw-r--r-- | buildscripts/import-control.xml | 1 | ||||
| -rw-r--r-- | contrib/log_correlation/log4j2/src/main/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusTraceContextDataInjector.java | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/buildscripts/import-control.xml b/buildscripts/import-control.xml index daa4e790..938b57ee 100644 --- a/buildscripts/import-control.xml +++ b/buildscripts/import-control.xml @@ -96,6 +96,7 @@ General guidelines on imports: </subpackage> <subpackage name="logcorrelation.log4j2"> <allow pkg="io.opencensus.trace"/> + <disallow pkg="org.apache.logging.log4j.core.impl"/> <allow pkg="org.apache.logging.log4j"/> </subpackage> <subpackage name="logcorrelation.stackdriver"> diff --git a/contrib/log_correlation/log4j2/src/main/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusTraceContextDataInjector.java b/contrib/log_correlation/log4j2/src/main/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusTraceContextDataInjector.java index 30279ec5..0993a8e4 100644 --- a/contrib/log_correlation/log4j2/src/main/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusTraceContextDataInjector.java +++ b/contrib/log_correlation/log4j2/src/main/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusTraceContextDataInjector.java @@ -20,6 +20,7 @@ import io.opencensus.common.ExperimentalApi; import io.opencensus.trace.Span; import io.opencensus.trace.SpanContext; import io.opencensus.trace.unsafe.ContextUtils; +import java.util.Collection; import java.util.List; import java.util.Map; import javax.annotation.Nullable; @@ -28,7 +29,6 @@ import org.apache.logging.log4j.core.ContextDataInjector; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.Property; -import org.apache.logging.log4j.core.impl.ThreadContextDataInjector; import org.apache.logging.log4j.util.SortedArrayStringMap; import org.apache.logging.log4j.util.StringMap; @@ -176,11 +176,17 @@ public final class OpenCensusTraceContextDataInjector implements ContextDataInje return rawContextData(); } // Context data has precedence over configuration properties. - ThreadContextDataInjector.copyProperties(properties, reusable); + putProperties(properties, reusable); reusable.putAll(rawContextData()); return reusable; } + private static void putProperties(Collection<Property> properties, StringMap stringMap) { + for (Property property : properties) { + stringMap.putValue(property.getName(), property.getValue()); + } + } + // This method avoids getting the current span when the feature is disabled, for efficiency. @Override public StringMap rawContextData() { |