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 2021/10/09 05:24:03 UTC
[skywalking-agent-test-tool] branch master updated: Remove
Span#operationId field (#33)
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 5acb890 Remove Span#operationId field (#33)
5acb890 is described below
commit 5acb890f225ca37ee60675ce3e330545e23e3cbc
Author: zhang-wei <zh...@apache.org>
AuthorDate: Sat Oct 9 13:23:57 2021 +0800
Remove Span#operationId field (#33)
---
.../skywalking/plugin/test/mockcollector/entity/Span.java | 1 -
.../test/agent/tool/validator/assertor/SegmentAssert.java | 1 -
.../test/agent/tool/validator/entity/SegmentForRead.java | 10 ----------
.../plugin/test/agent/tool/validator/entity/Span.java | 2 --
4 files changed, 14 deletions(-)
diff --git a/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/Span.java b/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/Span.java
index 13f67ba..86ba88e 100644
--- a/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/Span.java
+++ b/mock-collector/src/main/java/org/apache/skywalking/plugin/test/mockcollector/entity/Span.java
@@ -48,7 +48,6 @@ import org.apache.skywalking.apm.network.language.agent.v3.SegmentReference;
@AllArgsConstructor
public class Span {
private String operationName;
- private int operationId;
private int parentSpanId;
private int spanId;
private String spanLayer;
diff --git a/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/SegmentAssert.java b/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/SegmentAssert.java
index 8d45b2c..ee6dbbb 100644
--- a/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/SegmentAssert.java
+++ b/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/assertor/SegmentAssert.java
@@ -104,7 +104,6 @@ public class SegmentAssert {
ExpressParser.parse(excepted.endTime()).assertValue("end time", actualSpan.endTime());
ExpressParser.parse(excepted.parentSpanId()).assertValue("parent span id", actualSpan.parentSpanId());
ExpressParser.parse(excepted.spanId()).assertValue("span id", actualSpan.spanId());
- ExpressParser.parse(excepted.operationId()).assertValue("operation id", actualSpan.operationId());
ExpressParser.parse(excepted.peer()).assertValue("peer", actualSpan.peer());
ExpressParser.parse(excepted.spanLayer()).assertValue("span layer", actualSpan.spanLayer());
ExpressParser.parse(excepted.error()).assertValue("is error", actualSpan.error());
diff --git a/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentForRead.java b/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentForRead.java
index 6320bfc..dd815aa 100644
--- a/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentForRead.java
+++ b/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/SegmentForRead.java
@@ -114,7 +114,6 @@ public class SegmentForRead implements Segment {
public static class SpanForRead implements Span {
private String operationName;
- private String operationId;
private String parentSpanId;
private String spanId;
private String spanLayer;
@@ -136,10 +135,6 @@ public class SegmentForRead implements Segment {
this.operationName = operationName;
}
- public void setOperationId(String operationId) {
- this.operationId = operationId;
- }
-
public void setParentSpanId(String parentSpanId) {
this.parentSpanId = parentSpanId;
}
@@ -202,11 +197,6 @@ public class SegmentForRead implements Segment {
}
@Override
- public String operationId() {
- return operationId;
- }
-
- @Override
public String parentSpanId() {
return parentSpanId;
}
diff --git a/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Span.java b/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Span.java
index 00efa51..90350ad 100644
--- a/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Span.java
+++ b/validator/src/main/java/org/apache/skywalking/plugin/test/agent/tool/validator/entity/Span.java
@@ -22,8 +22,6 @@ import java.util.List;
public interface Span {
String operationName();
- String operationId();
-
String parentSpanId();
String spanId();