/*
 * Copyright 2013-2015 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.springframework.cloud.sleuth.autoconfig;

import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.sleuth.Sampler;
import org.springframework.cloud.sleuth.sampler.IsTracingSampler;
import org.springframework.cloud.sleuth.trace.DefaultTracer;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import java.util.Random;

/**
 * @author Spencer Gibb
 */
@Configuration
@ConditionalOnProperty(value="spring.sleuth.enabled", matchIfMissing=true)
public class TraceAutoConfiguration {

	@Bean
	public Random random() {
		return new Random();
	}

	@Bean
	@ConditionalOnMissingBean
	public Sampler defaultTraceSampler() {
		return new IsTracingSampler();
	}

	@Bean
	@ConditionalOnMissingBean
	public DefaultTracer traceManager(Sampler sampler,
									ApplicationEventPublisher publisher) {
		return new DefaultTracer(sampler, random(), publisher);
	}
}

@@ -669,16 +669,42 @@
 onfig;%0A%0A
+import java.util.Random;%0A%0A
 import o
@@ -773,24 +773,24 @@
 issingBean;%0A
-
 import org.s
@@ -897,32 +897,80 @@
 sleuth.Sampler;%0A
+import org.springframework.cloud.sleuth.Tracer;%0A
 import org.sprin
@@ -1260,34 +1260,8 @@
 n;%0A%0A
-import java.util.Random;%0A%0A
 /**%0A
@@ -1420,24 +1420,51 @@
 n %7B%0A%0A%09@Bean%0A
+%09@ConditionalOnMissingBean%0A
 %09public Rand
@@ -1472,16 +1472,26 @@
 m random
+ForSpanIds
 () %7B%0A%09%09r
@@ -1650,32 +1650,46 @@
 nalOnMissingBean
+(Tracer.class)
 %0A%09public Default
@@ -1724,16 +1724,31 @@
 sampler,
+ Random random,
 %0A%09%09%09%09%09%09%09
@@ -1784,24 +1784,24 @@
 ublisher) %7B%0A
+
 %09%09return new
@@ -1830,18 +1830,16 @@
 , random
-()
 , publis

Tidy up conditionals in trace autoconfig