You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2024/03/20 06:18:45 UTC
(skywalking) branch data-generator created (now 10cf48b264)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch data-generator
in repository https://gitbox.apache.org/repos/asf/skywalking.git
at 10cf48b264 Update peers to match instances
This branch includes the following new commits:
new 10cf48b264 Update peers to match instances
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(skywalking) 01/01: Update peers to match instances
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch data-generator
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 10cf48b264442cd4abcd7c10404bb7a7df2b7f58
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Wed Mar 20 14:18:10 2024 +0800
Update peers to match instances
Signed-off-by: Gao Hongtao <ha...@gmail.com>
---
.../skywalking/restapi/SegmentGenerator.java | 17 ++++-----
.../apache/skywalking/restapi/SegmentRequest.java | 19 ++++++++--
.../apache/skywalking/restapi/SpanGenerator.java | 17 ++++-----
.../skywalking/restapi/SegmentGeneratorTest.java | 23 ++++++++++--
.../src/test/resources/segment.tpl.json | 42 ++++++++--------------
5 files changed, 71 insertions(+), 47 deletions(-)
diff --git a/oap-server/server-tools/data-generator/src/main/java/org/apache/skywalking/restapi/SegmentGenerator.java b/oap-server/server-tools/data-generator/src/main/java/org/apache/skywalking/restapi/SegmentGenerator.java
index 899a3c164e..8ac2b195b0 100644
--- a/oap-server/server-tools/data-generator/src/main/java/org/apache/skywalking/restapi/SegmentGenerator.java
+++ b/oap-server/server-tools/data-generator/src/main/java/org/apache/skywalking/restapi/SegmentGenerator.java
@@ -45,8 +45,6 @@ import java.util.stream.IntStream;
public class SegmentGenerator implements Generator<SegmentGenerator.SegmentContext, SegmentGenerator.SegmentResult> {
private Generator<String, String> segmentId;
- private Generator<String, String> serviceName;
- private Generator<String, String> serviceInstanceName;
private Generator<String, String> endpointName;
private Generator<Object, Long> error;
private Generator<Object, List<TagGenerator>> tags;
@@ -55,8 +53,8 @@ public class SegmentGenerator implements Generator<SegmentGenerator.SegmentConte
@Override
public SegmentResult next(SegmentContext ctx) {
long now = System.currentTimeMillis();
- final String serviceName = getServiceName().next(null);
- final String serviceInstanceName = getServiceInstanceName().next(serviceName);
+ final String serviceName = ctx.serviceName;
+ final String serviceInstanceName = ctx.serviceInstanceName;
final String endpointName = getEndpointName().next(null);
if (segmentId == null) {
StringGenerator.Builder segmentIdBuilder = new StringGenerator.Builder();
@@ -75,7 +73,8 @@ public class SegmentGenerator implements Generator<SegmentGenerator.SegmentConte
.setParentService(parentSegment.segmentObject.getService())
.setParentSpanId(span.getSpanId())
.setParentTraceSegmentId(parentSegment.segment.getSegmentId())
- .setNetworkAddressUsedAtPeer(span.getPeer())
+ .setParentEndpoint(IDManager.EndpointID.analysisId(parentSegment.segment.getEndpointId()).getEndpointName())
+ .setNetworkAddressUsedAtPeer(serviceInstanceName)
.build()))
.orElse(null);
final String segmentId = getSegmentId().next(null);
@@ -90,7 +89,7 @@ public class SegmentGenerator implements Generator<SegmentGenerator.SegmentConte
IntStream.range(0, size)
.mapToObj(i -> {
SpanGenerator sg = spanGenerators.get(i);
- return sg.next(new SpanGenerator.SpanGeneratorContext(i, size, sr));
+ return sg.next(new SpanGenerator.SpanGeneratorContext(i, size, sr, ctx.peer));
})
.collect(Collectors.<SpanObject>toList()))
.setService(serviceName)
@@ -126,14 +125,16 @@ public class SegmentGenerator implements Generator<SegmentGenerator.SegmentConte
.map(tg -> tg.next(null))
.collect(Collectors.<Tag>toList()));
- segment.setDataBinary(segmentObj.toByteArray());
return new SegmentResult(segment, segmentObj);
}
@RequiredArgsConstructor
public static class SegmentContext {
final String traceId;
- final SegmentResult parentSegment;
+ final String serviceName;
+ final String serviceInstanceName;
+ String peer;
+ SegmentResult parentSegment;
}
@RequiredArgsConstructor
diff --git a/oap-server/server-tools/data-generator/src/main/java/org/apache/skywalking/restapi/SegmentRequest.java b/oap-server/server-tools/data-generator/src/main/java/org/apache/skywalking/restapi/SegmentRequest.java
index 8fa57d30ef..a1cecf7142 100644
--- a/oap-server/server-tools/data-generator/src/main/java/org/apache/skywalking/restapi/SegmentRequest.java
+++ b/oap-server/server-tools/data-generator/src/main/java/org/apache/skywalking/restapi/SegmentRequest.java
@@ -25,11 +25,15 @@ import org.apache.skywalking.generator.Generator;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
@Data
@JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
public final class SegmentRequest implements Generator<Object, List<SegmentGenerator.SegmentResult>> {
private Generator<String, String> traceId;
+ private Generator<String, String> serviceName;
+ private Generator<String, String> serviceInstanceName;
private Generator<Object, List<SegmentGenerator>> segments;
@Override
@@ -37,11 +41,22 @@ public final class SegmentRequest implements Generator<Object, List<SegmentGener
final String traceId = getTraceId().next(null);
final List<SegmentGenerator> segments = getSegments().next(traceId);
SegmentGenerator.SegmentResult last = null;
+ List<SegmentGenerator.SegmentContext> context = IntStream.range(0, segments.size()).mapToObj(i -> {
+ String serviceName = getServiceName().next(null);
+ return new SegmentGenerator.SegmentContext(traceId, serviceName, getServiceInstanceName().next(serviceName));
+ }).collect(Collectors.toList());
List<SegmentGenerator.SegmentResult> result = new ArrayList<>(segments.size());
- for (SegmentGenerator each : segments) {
- last = each.next(new SegmentGenerator.SegmentContext(traceId, last));
+ for (int i = 0; i < segments.size(); i++) {
+ SegmentGenerator.SegmentContext ctx = context.get(i);
+ ctx.parentSegment = last;
+ if (i < segments.size() - 1) {
+ ctx.peer = context.get(i + 1).serviceInstanceName;
+ }
+ last = segments.get(i).next(ctx);
result.add(last);
}
+
return result;
}
+
}
diff --git a/oap-server/server-tools/data-generator/src/main/java/org/apache/skywalking/restapi/SpanGenerator.java b/oap-server/server-tools/data-generator/src/main/java/org/apache/skywalking/restapi/SpanGenerator.java
index 708e58fe0b..2e1920046a 100644
--- a/oap-server/server-tools/data-generator/src/main/java/org/apache/skywalking/restapi/SpanGenerator.java
+++ b/oap-server/server-tools/data-generator/src/main/java/org/apache/skywalking/restapi/SpanGenerator.java
@@ -39,8 +39,6 @@ public final class SpanGenerator implements Generator<SpanGenerator.SpanGenerato
private Generator<Object, Long> endTime;
private Generator<Object, Long> latency;
private Generator<String, String> operationName;
- private Generator<String, String> peer;
- private Generator<Object, Long> spanLayer;
private Generator<Object, Long> componentId;
private Generator<Object, Boolean> error;
private Generator<Object, List<TagGenerator>> tags;
@@ -71,16 +69,20 @@ public final class SpanGenerator implements Generator<SpanGenerator.SpanGenerato
.setValue(it.getValue()).build())
.collect(Collectors.toList()));
if (ctx.index == 0) {
- sob.setSpanLayer(SpanLayer.forNumber(getSpanLayer().next(null).intValue()))
+ sob.setSpanLayer(SpanLayer.Http)
.setSpanType(SpanType.Entry);
if (ctx.ref != null) {
sob.addRefs(ctx.ref);
}
} else if (ctx.length > 1 && ctx.index == ctx.length - 1) {
- sob.setSpanType(SpanType.Exit).setPeer(getPeer().next(null)).setSpanLayer(SpanLayer.Database);
+ sob.setSpanType(SpanType.Exit);
+ if (ctx.peer != null) {
+ sob.setPeer(ctx.peer).setSpanLayer(SpanLayer.Http);
+ } else {
+ sob.setPeer("peer-database").setSpanLayer(SpanLayer.Database);
+ }
} else {
- sob.setSpanLayer(SpanLayer.forNumber(getSpanLayer().next(null).intValue()))
- .setSpanType(SpanType.Local);
+ sob.setSpanType(SpanType.Local);
}
return sob.build();
}
@@ -88,8 +90,6 @@ public final class SpanGenerator implements Generator<SpanGenerator.SpanGenerato
@Override
public void reset() {
operationName.reset();
- peer.reset();
- spanLayer.reset();
componentId.reset();
error.reset();
tags.reset();
@@ -100,5 +100,6 @@ public final class SpanGenerator implements Generator<SpanGenerator.SpanGenerato
final int index;
final int length;
final SegmentReference ref;
+ final String peer;
}
}
diff --git a/oap-server/server-tools/data-generator/src/test/java/org/apache/skywalking/restapi/SegmentGeneratorTest.java b/oap-server/server-tools/data-generator/src/test/java/org/apache/skywalking/restapi/SegmentGeneratorTest.java
index 29c9228fdb..c202043b26 100644
--- a/oap-server/server-tools/data-generator/src/test/java/org/apache/skywalking/restapi/SegmentGeneratorTest.java
+++ b/oap-server/server-tools/data-generator/src/test/java/org/apache/skywalking/restapi/SegmentGeneratorTest.java
@@ -26,9 +26,12 @@ import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import static graphql.Assert.assertFalse;
+import static graphql.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertNotNull;
class SegmentGeneratorTest {
@@ -40,7 +43,23 @@ class SegmentGeneratorTest {
assertNotNull(url);
File jsonFile = new File(url.toURI());
SegmentRequest sr = objectMapper.readValue(jsonFile, SegmentRequest.class);
- List<SegmentGenerator.SegmentResult> ss = sr.next(null);
- assertFalse(ss.isEmpty());
+ Set<String> serviceSet = new HashSet<>();
+ Set<String> serviceInstanceSet = new HashSet<>();
+ Set<String> endpointSet = new HashSet<>();
+ for (int i = 0; i < 1000; i++) {
+ List<SegmentGenerator.SegmentResult> ss = sr.next(null);
+ assertFalse(ss.isEmpty());
+ for (SegmentGenerator.SegmentResult s : ss) {
+ serviceSet.add(s.segmentObject.getService());
+ serviceInstanceSet.add(s.segmentObject.getServiceInstance());
+ endpointSet.add(s.segment.getEndpointId());
+ }
+ }
+ assertTrue(serviceSet.size() > 1);
+ assertTrue(serviceSet.size() <= 10);
+ assertTrue(serviceInstanceSet.size() > 1);
+ assertTrue(serviceInstanceSet.size() <= 100);
+ assertTrue(endpointSet.size() > 1);
+ assertTrue(endpointSet.size() <= 100);
}
}
\ No newline at end of file
diff --git a/oap-server/server-tools/data-generator/src/test/resources/segment.tpl.json b/oap-server/server-tools/data-generator/src/test/resources/segment.tpl.json
index fd9c31e6ec..90518347b4 100644
--- a/oap-server/server-tools/data-generator/src/test/resources/segment.tpl.json
+++ b/oap-server/server-tools/data-generator/src/test/resources/segment.tpl.json
@@ -3,25 +3,25 @@
"type": "uuid",
"changingFrequency": "1"
},
+ "serviceInstanceName": {
+ "type": "randomString",
+ "length": "10",
+ "letters": true,
+ "numbers": true,
+ "domainSize": 10
+ },
+ "serviceName": {
+ "type": "randomString",
+ "prefix": "service_",
+ "length": "1",
+ "letters": false,
+ "numbers": true,
+ "domainSize": 10
+ },
"segments": {
"type": "randomList",
"size": 5,
"item": {
- "serviceInstanceName": {
- "type": "randomString",
- "length": "10",
- "letters": true,
- "numbers": true,
- "domainSize": 10
- },
- "serviceName": {
- "type": "randomString",
- "prefix": "service_",
- "length": "1",
- "letters": false,
- "numbers": true,
- "domainSize": 10
- },
"endpointName": {
"type": "randomString",
"length": "10",
@@ -73,18 +73,6 @@
"letters": true,
"numbers": true
},
- "peer": {
- "type": "randomString",
- "length": "10",
- "prefix": "test_peer_",
- "letters": true,
- "numbers": true
- },
- "spanLayer": {
- "type": "randomInt",
- "min": "0",
- "max": "4"
- },
"componentId": {
"type": "randomInt",
"min": "0",