From 7a701b7d1660eb1ec983f0ee5fc811108e78e0ee Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Wed, 19 Aug 2015 08:32:28 +0100
Subject: [PATCH] Add spring cloud stream processing headers in bootstrap

---
 ...raceBootstrapEnvironmentPostProcessor.java | 70 +++++++++++++++++++
 .../main/resources/META-INF/spring.factories  |  4 ++
 2 files changed, 74 insertions(+)
 create mode 100644 spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/bootstrap/TraceBootstrapEnvironmentPostProcessor.java

diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/bootstrap/TraceBootstrapEnvironmentPostProcessor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/bootstrap/TraceBootstrapEnvironmentPostProcessor.java
new file mode 100644
index 000000000..ab91a0e10
--- /dev/null
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/bootstrap/TraceBootstrapEnvironmentPostProcessor.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 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.bootstrap;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.env.EnvironmentPostProcessor;
+import org.springframework.cloud.sleuth.Trace;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.util.ClassUtils;
+
+/**
+ * @author Dave Syer
+ *
+ */
+public class TraceBootstrapEnvironmentPostProcessor implements EnvironmentPostProcessor {
+
+	private static final String STREAM_BINDER_HEADERS = "streamBinderHeaders";
+	private static String[] headers = new String[] { Trace.SPAN_ID_NAME,
+		Trace.TRACE_ID_NAME, Trace.PARENT_ID_NAME, Trace.PROCESS_ID_NAME,
+		Trace.NOT_SAMPLED_NAME, Trace.SPAN_NAME_NAME };
+
+	@Override
+	public void postProcessEnvironment(ConfigurableEnvironment environment,
+			SpringApplication application) {
+		Map<String, Object> map = new HashMap<String, Object>();
+		addHeaders(
+				map,
+				"org.springframework.cloud.stream.binder.redis.RedisMessageChannelBinder",
+				"redis");
+		addHeaders(
+				map,
+				"org.springframework.cloud.stream.binder.rabbit.RabbitMessageChannelBinder",
+				"rabbit");
+		addHeaders(
+				map,
+				"org.springframework.cloud.stream.binder.kafka.KafkaMessageChannelBinder",
+				"kafka");
+		MapPropertySource source = new MapPropertySource(STREAM_BINDER_HEADERS, map);
+		environment.getPropertySources().addLast(source);
+	}
+
+	private void addHeaders(Map<String, Object> map, String type, String binder) {
+		if (ClassUtils.isPresent(type, null)) {
+			String stem = "spring.cloud.stream.binder." + binder + ".headers.";
+			for (int i = 0; i < headers.length; i++) {
+				map.put(stem + binder + ".headers[" + i + "]", headers[i]);
+			}
+		}
+
+	}
+
+}
diff --git a/spring-cloud-sleuth-core/src/main/resources/META-INF/spring.factories b/spring-cloud-sleuth-core/src/main/resources/META-INF/spring.factories
index f17f8c40b..fab237e07 100644
--- a/spring-cloud-sleuth-core/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-sleuth-core/src/main/resources/META-INF/spring.factories
@@ -10,3 +10,7 @@ org.springframework.cloud.sleuth.instrument.web.TraceWebAutoConfiguration,\
 org.springframework.cloud.sleuth.instrument.web.client.TraceWebClientAutoConfiguration,\
 org.springframework.cloud.sleuth.instrument.web.client.TraceFeignClientAutoConfiguration,\
 org.springframework.cloud.sleuth.instrument.zuul.TraceZuulAutoConfiguration
+
+# Environment Post Processor
+org.springframework.boot.env.EnvironmentPostProcessor=\
+org.springframework.cloud.sleuth.bootstrap.TraceBootstrapEnvironmentPostProcessororg.springframework.cloud.sleuth.bootstrap.TraceBootstrapEnvironmentPostProcessororg.springframework.cloud.sleuth.bootstrap.TraceBootstrapEnvironmentPostProcessor