SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Going back to snapshots

Browse Source
This commit is contained in:
Spencer Gibb
2018-09-21 19:12:25 -04:00
parent 30b2b63225
commit 390473a60e
22 changed files with 294 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
benchmarks/pom.xml
View File

@@ -22,7 +22,7 @@
<name>Benchmarks</name>
<description>Benchmarks (JMH)</description>
<groupId>org.springframework.cloud</groupId>
<version>2.1.0.M1</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<artifactId>benchmarks</artifactId>
<properties>
@@ -33,7 +33,7 @@
<sonar.skip>true</sonar.skip>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<spring-boot.version>2.1.0.M3</spring-boot.version>
<spring-boot.version>2.1.0.M1</spring-boot.version>
</properties>
<dependencyManagement>

24
config/releaser.properties
View File

@@ -1,24 +0,0 @@
releaser.fixed-versions[spring-boot]=2.1.0.M3
releaser.fixed-versions[spring-cloud-build]=2.1.0.M2
releaser.fixed-versions[spring-cloud-commons]=2.1.0.M1
releaser.fixed-versions[spring-cloud-function]=2.0.0.M2
releaser.fixed-versions[spring-cloud-stream]=Fishtown.M3
releaser.fixed-versions[spring-cloud-aws]=2.0.0.RELEASE
releaser.fixed-versions[spring-cloud-bus]=2.1.0.M1
releaser.fixed-versions[spring-cloud-task]=2.0.0.RELEASE
releaser.fixed-versions[spring-cloud-config]=2.1.0.M1
releaser.fixed-versions[spring-cloud-netflix]=2.1.0.M1
releaser.fixed-versions[spring-cloud-cloudfoundry]=2.1.0.M1
releaser.fixed-versions[spring-cloud-kubernetes]=1.0.0.M1
releaser.fixed-versions[spring-cloud-openfeign]=2.1.0.M1
releaser.fixed-versions[spring-cloud-consul]=2.1.0.M1
releaser.fixed-versions[spring-cloud-gateway]=2.1.0.M1
releaser.fixed-versions[spring-cloud-security]=2.0.0.RELEASE
releaser.fixed-versions[spring-cloud-sleuth]=2.1.0.M1
releaser.fixed-versions[spring-cloud-zookeeper]=2.1.0.M1
releaser.fixed-versions[spring-cloud-contract]=2.1.0.M1
releaser.fixed-versions[spring-cloud-gcp]=1.1.0.M2
releaser.fixed-versions[spring-cloud-vault]=2.1.0.M1
releaser.fixed-versions[spring-cloud-release]=Greenwich.M1
#releaser.meta-release.projects-to-skip=spring-boot,spring-cloud-stream,spring-cloud-task,spring-cloud-security
releaser.git.fetch-versions-from-git=false

2
docs/pom.xml
View File

@@ -21,7 +21,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>2.1.0.M1</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-cloud-sleuth-docs</artifactId>
<packaging>pom</packaging>

14
pom.xml
View File

@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-sleuth</artifactId>
<version>2.1.0.M1</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Cloud Sleuth</name>
<description>Spring Cloud Sleuth</description>
@@ -29,7 +29,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.1.0.M2</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
@@ -268,11 +268,11 @@
<maven.compiler.testSource>1.8</maven.compiler.testSource>
<surefire.plugin.version>2.19.1</surefire.plugin.version>
<checkstyle.version>2.17</checkstyle.version>
<spring-cloud-build.version>2.1.0.M2</spring-cloud-build.version>
<spring-cloud-commons.version>2.1.0.M1</spring-cloud-commons.version>
<spring-cloud-stream.version>Fishtown.M3</spring-cloud-stream.version>
<spring-cloud-netflix.version>2.1.0.M1</spring-cloud-netflix.version>
<spring-cloud-openfeign.version>2.1.0.M1</spring-cloud-openfeign.version>
<spring-cloud-build.version>2.1.0.BUILD-SNAPSHOT</spring-cloud-build.version>
<spring-cloud-commons.version>2.1.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-stream.version>Fishtown.BUILD-SNAPSHOT</spring-cloud-stream.version>
<spring-cloud-netflix.version>2.1.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-openfeign.version>2.1.0.BUILD-SNAPSHOT</spring-cloud-openfeign.version>
<brave.version>5.3.3</brave.version>
<spring-security-boot-autoconfigure.version>2.0.4.RELEASE</spring-security-boot-autoconfigure.version>
</properties>

2
spring-cloud-sleuth-core/pom.xml
View File

@@ -27,7 +27,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>2.1.0.M1</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

90
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/issues/issue_943/CustomExecutorConfig.java
View File

@@ -1,46 +1,46 @@
/*
* Copyright 2013-2018 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.instrument.messaging.issues.issue_943;
import java.util.concurrent.Executor;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.sleuth.instrument.async.LazyTraceExecutor;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.AsyncConfigurerSupport;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@EnableAsync
@Configuration
public class CustomExecutorConfig extends AsyncConfigurerSupport {
@Autowired BeanFactory beanFactory;
@Override public Executor getAsyncExecutor() {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
// CUSTOMIZE HERE
executor.setCorePoolSize(7);
executor.setMaxPoolSize(42);
executor.setQueueCapacity(11);
executor.setThreadNamePrefix("MyExecutor-");
// DON'T FORGET TO INITIALIZE
executor.initialize();
return new LazyTraceExecutor(this.beanFactory, executor);
}
/*
* Copyright 2013-2018 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.instrument.messaging.issues.issue_943;
import java.util.concurrent.Executor;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.sleuth.instrument.async.LazyTraceExecutor;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.AsyncConfigurerSupport;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@EnableAsync
@Configuration
public class CustomExecutorConfig extends AsyncConfigurerSupport {
@Autowired BeanFactory beanFactory;
@Override public Executor getAsyncExecutor() {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
// CUSTOMIZE HERE
executor.setCorePoolSize(7);
executor.setMaxPoolSize(42);
executor.setQueueCapacity(11);
executor.setThreadNamePrefix("MyExecutor-");
// DON'T FORGET TO INITIALIZE
executor.initialize();
return new LazyTraceExecutor(this.beanFactory, executor);
}
}

104
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/issues/issue_943/HelloWorldImpl.java
View File

@@ -1,52 +1,52 @@
/*
* Copyright 2013-2018 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.instrument.messaging.issues.issue_943;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class HelloWorldImpl {
private static final Logger LOG = LoggerFactory.getLogger(HelloWorldImpl.class);
public String invokeProcessor(String message) throws InterruptedException {
LOG.info(" input message "+message);
Thread.currentThread().sleep(500);
LOG.info(" After the Sleep "+message);
String responseMessage = message + " Persist into DB ";
return responseMessage;
}
public List<String> aggregate(List<String> requestMessage) {
LOG.info(Thread.currentThread().getName());
LOG.info(" requestMessage aggregate "+requestMessage);
return requestMessage;
}
public List<String> splitMessage(String[] splitRequest){
LOG.info(" Inside splitMessage " +splitRequest);
List<String> splitGBSResponse = new ArrayList<String>();
splitGBSResponse = Arrays.asList(splitRequest);
return splitGBSResponse;
}
}
/*
* Copyright 2013-2018 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.instrument.messaging.issues.issue_943;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class HelloWorldImpl {
private static final Logger LOG = LoggerFactory.getLogger(HelloWorldImpl.class);
public String invokeProcessor(String message) throws InterruptedException {
LOG.info(" input message "+message);
Thread.currentThread().sleep(500);
LOG.info(" After the Sleep "+message);
String responseMessage = message + " Persist into DB ";
return responseMessage;
}
public List<String> aggregate(List<String> requestMessage) {
LOG.info(Thread.currentThread().getName());
LOG.info(" requestMessage aggregate "+requestMessage);
return requestMessage;
}
public List<String> splitMessage(String[] splitRequest){
LOG.info(" Inside splitMessage " +splitRequest);
List<String> splitGBSResponse = new ArrayList<String>();
splitGBSResponse = Arrays.asList(splitRequest);
return splitGBSResponse;
}
}

136
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/issues/issue_943/HelloWorldRestController.java
View File

@@ -1,68 +1,68 @@
/*
* Copyright 2013-2018 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.instrument.messaging.issues.issue_943;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@RestController
public class HelloWorldRestController {
private static final Logger LOG = LoggerFactory.getLogger(HelloWorldRestController.class);
@Autowired
private ApplicationContext applicationContext;
@RequestMapping(path = "getHelloWorldMessage", method = RequestMethod.GET, produces = MediaType.TEXT_PLAIN_VALUE)
public ResponseEntity<String> getHelloWorld() throws Exception {
LOG.info("Inside getHelloWorldMessage");
String[] requestMessage = new String[3];
requestMessage[0] = "Hellow World Message 1";
requestMessage[1] = "Hellow World Message 2";
requestMessage[2] = "Hellow World Message 3";
PollableChannel outputChannel = (PollableChannel) applicationContext.getBean("messagingOutputChannel");
MessagingGateway messagingGateway = (MessagingGateway) applicationContext
.getBean("messagingGateway");
messagingGateway.processMessage(requestMessage);
GenericMessage reply = (GenericMessage) outputChannel.receive();
List<String> body = (List<String>) reply.getPayload();
LOG.info(" Response Message " + body);
return new ResponseEntity<String>(body.toString(), HttpStatus.OK);
}
}
/*
* Copyright 2013-2018 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.instrument.messaging.issues.issue_943;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@RestController
public class HelloWorldRestController {
private static final Logger LOG = LoggerFactory.getLogger(HelloWorldRestController.class);
@Autowired
private ApplicationContext applicationContext;
@RequestMapping(path = "getHelloWorldMessage", method = RequestMethod.GET, produces = MediaType.TEXT_PLAIN_VALUE)
public ResponseEntity<String> getHelloWorld() throws Exception {
LOG.info("Inside getHelloWorldMessage");
String[] requestMessage = new String[3];
requestMessage[0] = "Hellow World Message 1";
requestMessage[1] = "Hellow World Message 2";
requestMessage[2] = "Hellow World Message 3";
PollableChannel outputChannel = (PollableChannel) applicationContext.getBean("messagingOutputChannel");
MessagingGateway messagingGateway = (MessagingGateway) applicationContext
.getBean("messagingGateway");
messagingGateway.processMessage(requestMessage);
GenericMessage reply = (GenericMessage) outputChannel.receive();
List<String> body = (List<String>) reply.getPayload();
LOG.info(" Response Message " + body);
return new ResponseEntity<String>(body.toString(), HttpStatus.OK);
}
}

46
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/issues/issue_943/MessagingGateway.java
View File

@@ -1,23 +1,23 @@
/*
* Copyright 2013-2018 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.instrument.messaging.issues.issue_943;
public interface MessagingGateway {
void processMessage(String[] messageArray);
}
/*
* Copyright 2013-2018 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.instrument.messaging.issues.issue_943;
public interface MessagingGateway {
void processMessage(String[] messageArray);
}

164
spring-cloud-sleuth-core/src/test/resources/beans/applicationContext.xml
View File

@@ -1,83 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2013-2018 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.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:task="http://www.springframework.org/schema/task" xmlns:int="http://www.springframework.org/schema/integration"
xmlns:int-stream="http://www.springframework.org/schema/integration/stream"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
<int:channel id="messagingChannel" />
<int:channel id="splitterOutChannel" >
<int:queue capacity="10" />
</int:channel>
<int:channel id="messagingProcessedChannel">
<int:queue capacity="10" />
</int:channel>
<int:channel id="messagingOutputChannel">
<int:queue capacity="10" />
</int:channel>
<int:service-activator input-channel="splitterOutChannel"
method="invokeProcessor" output-channel="messagingProcessedChannel"
ref="helloWorldImpl">
<int:poller max-messages-per-poll="1" fixed-rate="1"
task-executor="requestExecutor" />
</int:service-activator>
<int:aggregator input-channel="messagingProcessedChannel"
output-channel="messagingOutputChannel"
message-store="messageStore"
send-partial-result-on-expiry="true">
<int:poller max-messages-per-poll="1" fixed-rate="1"
task-executor="requestExecutor" />
</int:aggregator>
<!-- Define a store for our search results and set up a reaper that will
periodically expire those results. -->
<bean id="messageStore"
class="org.springframework.integration.store.SimpleMessageStore" />
<bean id="messageStoreReaper"
class="org.springframework.integration.store.MessageGroupStoreReaper">
<property name="messageGroupStore" ref="messageStore" />
<property name="timeout" value="2000" />
</bean>
<int:gateway id="messagingGateway"
service-interface="org.springframework.cloud.sleuth.instrument.messaging.issues.issue_943.MessagingGateway"
default-request-channel="messagingChannel" default-reply-timeout="10000"
default-reply-channel="splitterOutChannel" />
<task:executor id="requestExecutor" pool-size="10"/>
<int:splitter ref="helloWorldImpl" method="splitMessage"
input-channel="messagingChannel" output-channel="splitterOutChannel" />
<bean id="helloWorldImpl" class="org.springframework.cloud.sleuth.instrument.messaging.issues.issue_943.HelloWorldImpl" />
</beans>
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2013-2018 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.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:task="http://www.springframework.org/schema/task" xmlns:int="http://www.springframework.org/schema/integration"
xmlns:int-stream="http://www.springframework.org/schema/integration/stream"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
<int:channel id="messagingChannel" />
<int:channel id="splitterOutChannel" >
<int:queue capacity="10" />
</int:channel>
<int:channel id="messagingProcessedChannel">
<int:queue capacity="10" />
</int:channel>
<int:channel id="messagingOutputChannel">
<int:queue capacity="10" />
</int:channel>
<int:service-activator input-channel="splitterOutChannel"
method="invokeProcessor" output-channel="messagingProcessedChannel"
ref="helloWorldImpl">
<int:poller max-messages-per-poll="1" fixed-rate="1"
task-executor="requestExecutor" />
</int:service-activator>
<int:aggregator input-channel="messagingProcessedChannel"
output-channel="messagingOutputChannel"
message-store="messageStore"
send-partial-result-on-expiry="true">
<int:poller max-messages-per-poll="1" fixed-rate="1"
task-executor="requestExecutor" />
</int:aggregator>
<!-- Define a store for our search results and set up a reaper that will
periodically expire those results. -->
<bean id="messageStore"
class="org.springframework.integration.store.SimpleMessageStore" />
<bean id="messageStoreReaper"
class="org.springframework.integration.store.MessageGroupStoreReaper">
<property name="messageGroupStore" ref="messageStore" />
<property name="timeout" value="2000" />
</bean>
<int:gateway id="messagingGateway"
service-interface="org.springframework.cloud.sleuth.instrument.messaging.issues.issue_943.MessagingGateway"
default-request-channel="messagingChannel" default-reply-timeout="10000"
default-reply-channel="splitterOutChannel" />
<task:executor id="requestExecutor" pool-size="10"/>
<int:splitter ref="helloWorldImpl" method="splitMessage"
input-channel="messagingChannel" output-channel="splitterOutChannel" />
<bean id="helloWorldImpl" class="org.springframework.cloud.sleuth.instrument.messaging.issues.issue_943.HelloWorldImpl" />
</beans>

4
spring-cloud-sleuth-dependencies/pom.xml
View File

@@ -21,11 +21,11 @@
<parent>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>2.1.0.M2</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-sleuth-dependencies</artifactId>
<version>2.1.0.M1</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>spring-cloud-sleuth-dependencies</name>
<description>Spring Cloud Sleuth Dependencies</description>

2
spring-cloud-sleuth-samples/pom.xml
View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>2.1.0.M1</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml
View File

@@ -27,7 +27,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>2.1.0.M1</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml
View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>2.1.0.M1</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml
View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>2.1.0.M1</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml
View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>2.1.0.M1</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml
View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>2.1.0.M1</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
View File

@@ -27,7 +27,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>2.1.0.M1</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml
View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>2.1.0.M1</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-sleuth-zipkin/pom.xml
View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>2.1.0.M1</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
spring-cloud-starter-sleuth/pom.xml
View File

@@ -21,7 +21,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>2.1.0.M1</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-sleuth</artifactId>

2
spring-cloud-starter-zipkin/pom.xml
View File

@@ -21,7 +21,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>2.1.0.M1</version>
<version>2.1.0.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-zipkin</artifactId>