From ff7502fbabf1b58f4dc75d75ada58da6626b6dc3 Mon Sep 17 00:00:00 2001 From: Kristen Kozak Date: Wed, 26 Sep 2018 18:29:05 -0700 Subject: [PATCH] adservice: enable OpenCensus log correlation OpenCensus log correlation (https://github.com/census-instrumentation/opencensus-java/tree/master/contrib/log_correlation/stackdriver) inserts the trace ID, span ID, and sampling decision into every log entry. The tracing data can be used to find all log entries associated with a single trace or span. This commit also upgrades OpenCensus to 0.16.1. --- src/adservice/build.gradle | 3 ++- src/adservice/src/main/resources/logging.properties | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/adservice/build.gradle b/src/adservice/build.gradle index b1cdd7f..2f4c73a 100644 --- a/src/adservice/build.gradle +++ b/src/adservice/build.gradle @@ -25,7 +25,7 @@ repositories { group = "adservice" version = "0.1.0-SNAPSHOT" // CURRENT_OPENCENSUS_VERSION -def opencensusVersion = "0.15.0" // LATEST_OPENCENSUS_RELEASE_VERSION +def opencensusVersion = "0.16.1" // LATEST_OPENCENSUS_RELEASE_VERSION def grpcVersion = "1.15.0" // CURRENT_GRPC_VERSION def prometheusVersion = "0.3.0" @@ -56,6 +56,7 @@ dependencies { runtime "com.google.cloud:google-cloud-logging:1.45.0", "io.opencensus:opencensus-impl:${opencensusVersion}", + "io.opencensus:opencensus-contrib-log-correlation-stackdriver:${opencensusVersion}", "io.netty:netty-tcnative-boringssl-static:2.0.8.Final" } } diff --git a/src/adservice/src/main/resources/logging.properties b/src/adservice/src/main/resources/logging.properties index 4e505d1..085d2e0 100644 --- a/src/adservice/src/main/resources/logging.properties +++ b/src/adservice/src/main/resources/logging.properties @@ -10,3 +10,5 @@ handlers=com.google.cloud.logging.LoggingHandler com.google.cloud.logging.LoggingHandler.formatter=java.util.logging.SimpleFormatter java.util.logging.SimpleFormatter.format=%3$s: %5$s%6$s + +com.google.cloud.logging.LoggingHandler.enhancers=io.opencensus.contrib.logcorrelation.stackdriver.OpenCensusTraceLoggingEnhancer