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

Make span collection thread safe in message source

Browse Source
This commit is contained in:
Dave Syer
2016-01-20 16:52:09 +00:00
parent 10325e9547
commit 7f58eab435
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/StreamSpanListener.java
View File

@@ -17,8 +17,10 @@
package org.springframework.cloud.sleuth.stream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ConcurrentLinkedQueue;
import org.springframework.cloud.sleuth.Span;
import org.springframework.cloud.sleuth.event.ClientReceivedEvent;
@@ -45,14 +47,14 @@ public class StreamSpanListener {
public static final String SERVER_RECV = "sr";
public static final String SERVER_SEND = "ss";
private List<Span> queue = new ArrayList<>();
private Collection<Span> queue = new ConcurrentLinkedQueue<>();
private HostLocator endpointLocator;
public StreamSpanListener(HostLocator endpointLocator) {
this.endpointLocator = endpointLocator;
}
public void setQueue(List<Span> queue) {
public void setQueue(Collection<Span> queue) {
this.queue = queue;
}

13
spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java
View File

@@ -16,6 +16,13 @@
package org.springframework.cloud.sleuth.stream;
import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.PostConstruct;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,12 +49,6 @@ import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.messaging.Message;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import javax.annotation.PostConstruct;
import java.util.ArrayList;
import java.util.List;
import static org.junit.Assert.assertEquals;
/**
* @author Dave Syer
*