aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--all/build.gradle4
-rw-r--r--build.gradle4
-rw-r--r--buildscripts/import-control.xml2
-rw-r--r--contrib/log_correlation/log4j2/README.md (renamed from contrib/log_correlation/log4j/README.md)2
-rw-r--r--contrib/log_correlation/log4j2/build.gradle (renamed from contrib/log_correlation/log4j/build.gradle)6
-rw-r--r--contrib/log_correlation/log4j2/src/main/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusTraceContextDataInjector.java (renamed from contrib/log_correlation/log4j/src/main/java/io/opencensus/contrib/logcorrelation/log4j/OpenCensusTraceContextDataInjector.java)4
-rw-r--r--contrib/log_correlation/log4j2/src/test/java/io/opencensus/contrib/logcorrelation/log4j2/AbstractOpenCensusLog4jLogCorrelationTest.java (renamed from contrib/log_correlation/log4j/src/test/java/io/opencensus/contrib/logcorrelation/log4j/AbstractOpenCensusLog4jLogCorrelationTest.java)4
-rw-r--r--contrib/log_correlation/log4j2/src/test/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusLog4jLogCorrelationAllSpansTest.java (renamed from contrib/log_correlation/log4j/src/test/java/io/opencensus/contrib/logcorrelation/log4j/OpenCensusLog4jLogCorrelationAllSpansTest.java)4
-rw-r--r--contrib/log_correlation/log4j2/src/test/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusLog4jLogCorrelationNoSpansTest.java (renamed from contrib/log_correlation/log4j/src/test/java/io/opencensus/contrib/logcorrelation/log4j/OpenCensusLog4jLogCorrelationNoSpansTest.java)4
-rw-r--r--contrib/log_correlation/log4j2/src/test/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusLog4jLogCorrelationSampledSpansTest.java (renamed from contrib/log_correlation/log4j/src/test/java/io/opencensus/contrib/logcorrelation/log4j/OpenCensusLog4jLogCorrelationSampledSpansTest.java)4
-rw-r--r--contrib/log_correlation/log4j2/src/test/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusTraceContextDataInjectorTest.java (renamed from contrib/log_correlation/log4j/src/test/java/io/opencensus/contrib/logcorrelation/log4j/OpenCensusTraceContextDataInjectorTest.java)4
-rw-r--r--settings.gradle6
12 files changed, 24 insertions, 24 deletions
diff --git a/all/build.gradle b/all/build.gradle
index 97e98ff1..b8fea898 100644
--- a/all/build.gradle
+++ b/all/build.gradle
@@ -18,7 +18,7 @@ def subprojects = [
project(':opencensus-contrib-grpc-util'),
project(':opencensus-contrib-grpc-metrics'),
project(':opencensus-contrib-http-util'),
- project(':opencensus-contrib-log-correlation-log4j'),
+ project(':opencensus-contrib-log-correlation-log4j2'),
project(':opencensus-contrib-log-correlation-stackdriver'),
project(':opencensus-contrib-monitored-resource-util'),
project(':opencensus-contrib-spring'),
@@ -43,7 +43,7 @@ def subprojects_javadoc = [
project(':opencensus-contrib-grpc-util'),
project(':opencensus-contrib-grpc-metrics'),
project(':opencensus-contrib-http-util'),
- project(':opencensus-contrib-log-correlation-log4j'),
+ project(':opencensus-contrib-log-correlation-log4j2'),
project(':opencensus-contrib-log-correlation-stackdriver'),
project(':opencensus-contrib-monitored-resource-util'),
project(':opencensus-contrib-spring'),
diff --git a/build.gradle b/build.gradle
index f74dfd5e..c7ea819a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -154,7 +154,7 @@ subprojects {
googleAuthVersion = '0.10.0'
googleCloudBetaVersion = '0.58.0-beta'
googleCloudGaVersion = '1.40.0'
- log4jVersion = '2.11.1'
+ log4j2Version = '2.11.1'
signalfxVersion = '0.0.39'
springBootVersion = '1.5.15.RELEASE'
springCloudVersion = '1.3.4.RELEASE'
@@ -177,7 +177,7 @@ subprojects {
google_auth: "com.google.auth:google-auth-library-credentials:${googleAuthVersion}",
google_cloud_logging: "com.google.cloud:google-cloud-logging:${googleCloudGaVersion}",
google_cloud_trace: "com.google.cloud:google-cloud-trace:${googleCloudBetaVersion}",
- log4j: "org.apache.logging.log4j:log4j-core:${log4jVersion}",
+ log4j2: "org.apache.logging.log4j:log4j-core:${log4j2Version}",
zipkin_reporter: "io.zipkin.reporter2:zipkin-reporter:${zipkinReporterVersion}",
zipkin_urlconnection: "io.zipkin.reporter2:zipkin-sender-urlconnection:${zipkinReporterVersion}",
jaeger_reporter: "com.uber.jaeger:jaeger-core:${jaegerReporterVersion}",
diff --git a/buildscripts/import-control.xml b/buildscripts/import-control.xml
index ba04f07e..daa4e790 100644
--- a/buildscripts/import-control.xml
+++ b/buildscripts/import-control.xml
@@ -94,7 +94,7 @@ General guidelines on imports:
<allow pkg="io.opencensus.tags"/>
<allow pkg="io.opencensus.trace"/>
</subpackage>
- <subpackage name="logcorrelation.log4j">
+ <subpackage name="logcorrelation.log4j2">
<allow pkg="io.opencensus.trace"/>
<allow pkg="org.apache.logging.log4j"/>
</subpackage>
diff --git a/contrib/log_correlation/log4j/README.md b/contrib/log_correlation/log4j2/README.md
index bfcd143a..91597a05 100644
--- a/contrib/log_correlation/log4j/README.md
+++ b/contrib/log_correlation/log4j2/README.md
@@ -1,4 +1,4 @@
-# OpenCensus Log4j Log Correlation
+# OpenCensus Log4j 2 Log Correlation
This subproject is currently experimental, so it may be redesigned or removed in the future. It
will remain experimental until we have a specification for a log correlation feature in
diff --git a/contrib/log_correlation/log4j/build.gradle b/contrib/log_correlation/log4j2/build.gradle
index a832e146..4a4a6ebc 100644
--- a/contrib/log_correlation/log4j/build.gradle
+++ b/contrib/log_correlation/log4j2/build.gradle
@@ -1,10 +1,10 @@
-description = 'OpenCensus Log4j Log Correlation'
+description = 'OpenCensus Log4j 2 Log Correlation'
apply plugin: 'java'
dependencies {
compile project(':opencensus-api'),
- libraries.log4j
+ libraries.log4j2
testCompile libraries.guava
@@ -18,7 +18,7 @@ compileTestJava {
test {
systemProperties['log4j2.contextDataInjector'] =
- 'io.opencensus.contrib.logcorrelation.log4j.OpenCensusTraceContextDataInjector'
+ 'io.opencensus.contrib.logcorrelation.log4j2.OpenCensusTraceContextDataInjector'
// Each test class should run in a separate JVM. See the comment in
// AbstractOpenCensusLog4jLogCorrelationTest.
diff --git a/contrib/log_correlation/log4j/src/main/java/io/opencensus/contrib/logcorrelation/log4j/OpenCensusTraceContextDataInjector.java b/contrib/log_correlation/log4j2/src/main/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusTraceContextDataInjector.java
index 2d637732..47eb12c1 100644
--- a/contrib/log_correlation/log4j/src/main/java/io/opencensus/contrib/logcorrelation/log4j/OpenCensusTraceContextDataInjector.java
+++ b/contrib/log_correlation/log4j2/src/main/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusTraceContextDataInjector.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package io.opencensus.contrib.logcorrelation.log4j;
+package io.opencensus.contrib.logcorrelation.log4j2;
import io.opencensus.common.ExperimentalApi;
import io.opencensus.trace.Span;
@@ -92,7 +92,7 @@ public final class OpenCensusTraceContextDataInjector implements ContextDataInje
* @since 0.16
*/
public static final String SPAN_SELECTION_PROPERTY_NAME =
- "io.opencensus.contrib.logcorrelation.log4j."
+ "io.opencensus.contrib.logcorrelation.log4j2."
+ "OpenCensusTraceContextDataInjector.spanSelection";
private final SpanSelection spanSelection;
diff --git a/contrib/log_correlation/log4j/src/test/java/io/opencensus/contrib/logcorrelation/log4j/AbstractOpenCensusLog4jLogCorrelationTest.java b/contrib/log_correlation/log4j2/src/test/java/io/opencensus/contrib/logcorrelation/log4j2/AbstractOpenCensusLog4jLogCorrelationTest.java
index 104e7012..e907d6ca 100644
--- a/contrib/log_correlation/log4j/src/test/java/io/opencensus/contrib/logcorrelation/log4j/AbstractOpenCensusLog4jLogCorrelationTest.java
+++ b/contrib/log_correlation/log4j2/src/test/java/io/opencensus/contrib/logcorrelation/log4j2/AbstractOpenCensusLog4jLogCorrelationTest.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package io.opencensus.contrib.logcorrelation.log4j;
+package io.opencensus.contrib.logcorrelation.log4j2;
import io.opencensus.common.Function;
import io.opencensus.common.Scope;
-import io.opencensus.contrib.logcorrelation.log4j.OpenCensusTraceContextDataInjector.SpanSelection;
+import io.opencensus.contrib.logcorrelation.log4j2.OpenCensusTraceContextDataInjector.SpanSelection;
import io.opencensus.trace.Annotation;
import io.opencensus.trace.AttributeValue;
import io.opencensus.trace.EndSpanOptions;
diff --git a/contrib/log_correlation/log4j/src/test/java/io/opencensus/contrib/logcorrelation/log4j/OpenCensusLog4jLogCorrelationAllSpansTest.java b/contrib/log_correlation/log4j2/src/test/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusLog4jLogCorrelationAllSpansTest.java
index fb417004..2790b1e5 100644
--- a/contrib/log_correlation/log4j/src/test/java/io/opencensus/contrib/logcorrelation/log4j/OpenCensusLog4jLogCorrelationAllSpansTest.java
+++ b/contrib/log_correlation/log4j2/src/test/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusLog4jLogCorrelationAllSpansTest.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package io.opencensus.contrib.logcorrelation.log4j;
+package io.opencensus.contrib.logcorrelation.log4j2;
import static com.google.common.truth.Truth.assertThat;
import io.opencensus.common.Function;
-import io.opencensus.contrib.logcorrelation.log4j.OpenCensusTraceContextDataInjector.SpanSelection;
+import io.opencensus.contrib.logcorrelation.log4j2.OpenCensusTraceContextDataInjector.SpanSelection;
import io.opencensus.trace.SpanContext;
import io.opencensus.trace.SpanId;
import io.opencensus.trace.TraceId;
diff --git a/contrib/log_correlation/log4j/src/test/java/io/opencensus/contrib/logcorrelation/log4j/OpenCensusLog4jLogCorrelationNoSpansTest.java b/contrib/log_correlation/log4j2/src/test/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusLog4jLogCorrelationNoSpansTest.java
index 9e37cb27..1205924e 100644
--- a/contrib/log_correlation/log4j/src/test/java/io/opencensus/contrib/logcorrelation/log4j/OpenCensusLog4jLogCorrelationNoSpansTest.java
+++ b/contrib/log_correlation/log4j2/src/test/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusLog4jLogCorrelationNoSpansTest.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package io.opencensus.contrib.logcorrelation.log4j;
+package io.opencensus.contrib.logcorrelation.log4j2;
import static com.google.common.truth.Truth.assertThat;
import io.opencensus.common.Function;
-import io.opencensus.contrib.logcorrelation.log4j.OpenCensusTraceContextDataInjector.SpanSelection;
+import io.opencensus.contrib.logcorrelation.log4j2.OpenCensusTraceContextDataInjector.SpanSelection;
import io.opencensus.trace.SpanContext;
import io.opencensus.trace.SpanId;
import io.opencensus.trace.TraceId;
diff --git a/contrib/log_correlation/log4j/src/test/java/io/opencensus/contrib/logcorrelation/log4j/OpenCensusLog4jLogCorrelationSampledSpansTest.java b/contrib/log_correlation/log4j2/src/test/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusLog4jLogCorrelationSampledSpansTest.java
index ae3ec4e9..bbce4135 100644
--- a/contrib/log_correlation/log4j/src/test/java/io/opencensus/contrib/logcorrelation/log4j/OpenCensusLog4jLogCorrelationSampledSpansTest.java
+++ b/contrib/log_correlation/log4j2/src/test/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusLog4jLogCorrelationSampledSpansTest.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package io.opencensus.contrib.logcorrelation.log4j;
+package io.opencensus.contrib.logcorrelation.log4j2;
import static com.google.common.truth.Truth.assertThat;
import io.opencensus.common.Function;
-import io.opencensus.contrib.logcorrelation.log4j.OpenCensusTraceContextDataInjector.SpanSelection;
+import io.opencensus.contrib.logcorrelation.log4j2.OpenCensusTraceContextDataInjector.SpanSelection;
import io.opencensus.trace.SpanContext;
import io.opencensus.trace.SpanId;
import io.opencensus.trace.TraceId;
diff --git a/contrib/log_correlation/log4j/src/test/java/io/opencensus/contrib/logcorrelation/log4j/OpenCensusTraceContextDataInjectorTest.java b/contrib/log_correlation/log4j2/src/test/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusTraceContextDataInjectorTest.java
index 832ab668..e9edca31 100644
--- a/contrib/log_correlation/log4j/src/test/java/io/opencensus/contrib/logcorrelation/log4j/OpenCensusTraceContextDataInjectorTest.java
+++ b/contrib/log_correlation/log4j2/src/test/java/io/opencensus/contrib/logcorrelation/log4j2/OpenCensusTraceContextDataInjectorTest.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package io.opencensus.contrib.logcorrelation.log4j;
+package io.opencensus.contrib.logcorrelation.log4j2;
import static com.google.common.truth.Truth.assertThat;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
-import io.opencensus.contrib.logcorrelation.log4j.OpenCensusTraceContextDataInjector.SpanSelection;
+import io.opencensus.contrib.logcorrelation.log4j2.OpenCensusTraceContextDataInjector.SpanSelection;
import java.util.Collections;
import java.util.Map;
import org.apache.logging.log4j.core.config.Property;
diff --git a/settings.gradle b/settings.gradle
index 07f14eb5..fd3484d1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -19,7 +19,7 @@ include ":opencensus-contrib-exemplar-util"
include ":opencensus-contrib-grpc-metrics"
include ":opencensus-contrib-grpc-util"
include ":opencensus-contrib-http-util"
-include ":opencensus-contrib-log-correlation-log4j"
+include ":opencensus-contrib-log-correlation-log4j2"
include ":opencensus-contrib-log-correlation-stackdriver"
include ":opencensus-contrib-monitored-resource-util"
include ":opencensus-contrib-spring"
@@ -37,8 +37,8 @@ project(':opencensus-contrib-exemplar-util').projectDir = "$rootDir/contrib/exem
project(':opencensus-contrib-grpc-metrics').projectDir = "$rootDir/contrib/grpc_metrics" as File
project(':opencensus-contrib-grpc-util').projectDir = "$rootDir/contrib/grpc_util" as File
project(':opencensus-contrib-http-util').projectDir = "$rootDir/contrib/http_util" as File
-project(':opencensus-contrib-log-correlation-log4j').projectDir =
- "$rootDir/contrib/log_correlation/log4j" as File
+project(':opencensus-contrib-log-correlation-log4j2').projectDir =
+ "$rootDir/contrib/log_correlation/log4j2" as File
project(':opencensus-contrib-log-correlation-stackdriver').projectDir =
"$rootDir/contrib/log_correlation/stackdriver" as File
project(':opencensus-contrib-monitored-resource-util').projectDir =
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 09:18:33 +0000