Merge remote-tracking branch 'aosp/upstream-master' into merge am: dd3cabeacc

am: 6fbc3cf5a1

Change-Id: I11b0ec1cf561d2a14da78e444b1594f167787fe6

1 files changed, 26 insertions, 0 deletions

diff --git a/contrib/log_correlation/log4j2/build.gradle b/contrib/log_correlation/log4j2/build.gradle
new file mode 100644
index 00000000..4a4a6ebc
--- /dev/null
+++ b/contrib/log_correlation/log4j2/build.gradle
@@ -0,0 +1,26 @@
+description = 'OpenCensus Log4j 2 Log Correlation'
+
+apply plugin: 'java'
+
+dependencies {
+    compile project(':opencensus-api'),
+            libraries.log4j2
+
+    testCompile libraries.guava
+
+    signature "org.codehaus.mojo.signature:java16:+@signature"
+}
+
+compileTestJava {
+    sourceCompatibility = "1.7"
+    targetCompatibility = "1.7"
+}
+
+test {
+    systemProperties['log4j2.contextDataInjector'] =
+        'io.opencensus.contrib.logcorrelation.log4j2.OpenCensusTraceContextDataInjector'
+
+    // Each test class should run in a separate JVM. See the comment in
+    // AbstractOpenCensusLog4jLogCorrelationTest.
+    forkEvery = 1
+}