Disables self-tracing by default (openzipkin#1201)

adriancole · web-flow · commit ffe98d8e6d41 · 2016-07-25T14:43:40.000+08:00
* Switches self-tracing to use sql query constant

* Disables self-tracing by default
diff --git a/zipkin-autoconfigure/storage-mysql/src/main/java/zipkin/autoconfigure/storage/mysql/brave/TraceZipkinMySQLStorageAutoConfiguration.java b/zipkin-autoconfigure/storage-mysql/src/main/java/zipkin/autoconfigure/storage/mysql/brave/TraceZipkinMySQLStorageAutoConfiguration.java
@@ -37,6 +37,8 @@
 import zipkin.Endpoint;
 import zipkin.autoconfigure.storage.mysql.ZipkinMySQLStorageProperties;
 
+import static zipkin.TraceKeys.SQL_QUERY;
+
 /** Sets up the MySQL tracing in Brave as an initialization. */
 @ConditionalOnBean(Brave.class)
 @ConditionalOnProperty(name = "zipkin.storage.type", havingValue = "mysql")
@@ -89,9 +91,9 @@ public void renderEnd(ExecuteContext ctx) {
     brave.clientTracer().startNewSpan(ctx.type().toString().toLowerCase());
     String[] batchSQL = ctx.batchSQL();
     if (!StringUtils.isBlank(ctx.sql())) {
-      brave.clientTracer().submitBinaryAnnotation("jdbc.query", ctx.sql());
+      brave.clientTracer().submitBinaryAnnotation(SQL_QUERY, ctx.sql());
     } else if (batchSQL.length > 0 && batchSQL[batchSQL.length - 1] != null) {
-      brave.clientTracer().submitBinaryAnnotation("jdbc.query", StringUtils.join(batchSQL, '\n'));
+      brave.clientTracer().submitBinaryAnnotation(SQL_QUERY, StringUtils.join(batchSQL, '\n'));
     }
     brave.clientTracer()
         .setClientSent(mysqlEndpoint.ipv4, mysqlEndpoint.port, mysqlEndpoint.serviceName);
diff --git a/zipkin-server/README.md b/zipkin-server/README.md
@@ -71,7 +71,7 @@ Zipkin will self-trace calls to the api.
 
 Variable | Property | Description
 --- | --- | ---
-SELF_TRACING_ENABLED | zipkin.self-tracing.enabled | Set to false to disable self-tracing. Defaults to true
+SELF_TRACING_ENABLED | zipkin.self-tracing.enabled | Set to true to enable self-tracing. Defaults to false
 SELF_TRACING_SAMPLE_RATE`: Percentage of self-traces to retain, defaults to always sample (1.0).
 SELF_TRACING_FLUSH_INTERVAL | zipkin.self-tracing.flush-interval | Interval in seconds to flush self-tracing data to storage. Defaults to 1
 
diff --git a/zipkin-server/src/main/resources/zipkin-server.yml b/zipkin-server/src/main/resources/zipkin-server.yml
@@ -1,7 +1,7 @@
 zipkin:
   self-tracing:
-    # Set to false to disable self-tracing.
-    enabled: ${SELF_TRACING_ENABLED:true}
+    # Set to true to enable self-tracing.
+    enabled: ${SELF_TRACING_ENABLED:false}
     # percentage to self-traces to retain
     sample-rate: ${SELF_TRACING_SAMPLE_RATE:1.0}
     # Interval in seconds to flush self-tracing data to storage.
