You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/08/07 02:09:12 UTC
[skywalking-agent-test-tool] branch master updated: Change
container to concurrent (#20)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-agent-test-tool.git
The following commit(s) were added to refs/heads/master by this push:
new 2eb5cb9 Change container to concurrent (#20)
2eb5cb9 is described below
commit 2eb5cb96c36fd720a013c70dba8c5717ddfbe870
Author: Daming <zt...@foxmail.com>
AuthorDate: Fri Aug 7 10:09:04 2020 +0800
Change container to concurrent (#20)
---
.../skywalking/plugin/test/mockcollector/entity/SegmentItem.java | 4 ++--
.../skywalking/plugin/test/mockcollector/entity/SegmentItems.java | 4 ++--
.../skywalking/plugin/test/mockcollector/entity/ValidateData.java | 4 ++--
.../plugin/test/mockcollector/service/ClearReceiveDataService.java | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItem.java b/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItem.java
index c6fde3f..54e839b 100644
--- a/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItem.java
+++ b/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItem.java
@@ -17,8 +17,8 @@
package org.apache.skywalking.plugin.test.mockcollector.entity;
-import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
public class SegmentItem {
private String serviceName;
@@ -26,7 +26,7 @@ public class SegmentItem {
public SegmentItem(String serviceName) {
this.serviceName = serviceName;
- segments = new ArrayList<>();
+ segments = new CopyOnWriteArrayList<>();
}
public void addSegments(Segment item) {
diff --git a/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItems.java b/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItems.java
index 8f2e526..785f3ef 100644
--- a/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItems.java
+++ b/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/SegmentItems.java
@@ -17,14 +17,14 @@
package org.apache.skywalking.plugin.test.mockcollector.entity;
-import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
public class SegmentItems {
private Map<String, SegmentItem> segmentItems;
public SegmentItems() {
- this.segmentItems = new HashMap<>();
+ this.segmentItems = new ConcurrentHashMap<>();
}
public SegmentItems addSegmentItem(String serviceName, Segment segment) {
diff --git a/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/ValidateData.java b/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/ValidateData.java
index 9e27823..12eb61d 100644
--- a/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/ValidateData.java
+++ b/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/ValidateData.java
@@ -25,11 +25,11 @@ public class ValidateData {
segmentItem = new SegmentItems();
}
- public SegmentItems getSegmentItem() {
+ public synchronized SegmentItems getSegmentItem() {
return segmentItem;
}
- public static void clearData() {
+ public synchronized void clearData() {
INSTANCE.segmentItem = new SegmentItems();
}
}
diff --git a/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/ClearReceiveDataService.java b/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/ClearReceiveDataService.java
index 3c42984..bb7c97a 100644
--- a/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/ClearReceiveDataService.java
+++ b/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/service/ClearReceiveDataService.java
@@ -34,7 +34,7 @@ public class ClearReceiveDataService extends HttpServlet {
resp.setContentType("text/json");
resp.setCharacterEncoding("utf-8");
resp.setStatus(200);
- ValidateData.clearData();
+ ValidateData.INSTANCE.clearData();
Writer out = resp.getWriter();
out.flush();
out.close();