Fix e2e with latest query protocol and cli.

Author: wu-sheng

.github/workflows/e2e.yaml

@@ -60,6 +60,6 @@ jobs:
         with:
           go-version: '1.18'
       - name: Run E2E Tests
-        uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
+        uses: apache/skywalking-infra-e2e@7e4b5b68716fdb7b79b21fa8908f9db497e1b115
         with:
           e2e-file: ${{ matrix.case.path }}

test/e2e/case/expected/event-list.yml

@@ -30,5 +30,5 @@ events:
   {{- end }}
   starttime: {{ gt .starttime 0 }}
   endtime: {{ gt .endtime 0 }}
-{{- end }}
-total: {{ gt .total 0 }}
+  layer: "GENERAL"
+{{- end }}

test/e2e/case/expected/logs-list.yml

@@ -36,4 +36,5 @@ logs:
       value: {{ notEmpty .value }}
     {{- end }}
   {{- end }}
-total: {{ gt .total 0 }}
+debuggingtrace: null
+errorreason: null

test/e2e/case/expected/metrics-has-value.yml

@@ -13,9 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{{- contains . }}
+  {{- contains . }}
 - key: {{ notEmpty .key }}
-  value: {{ ge .value 0 }}
+  value:
+    value: 0
+    isemptyvalue: true
 - key: {{ notEmpty .key }}
-  value: {{ ge .value 1 }}
-{{- end }}
+  value:
+    value: {{ ge .value.value 1 }}
+    isemptyvalue: false
+  {{- end }}

test/e2e/case/expected/service.yml

@@ -13,9 +13,28 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+{{- contains . }}
 - id: {{ b64enc "e2e-service-provider" }}.1
   name: e2e-service-provider
   group: ""
+  shortname: e2e-service-provider
+  normal: true
+  layers:
+    - SO11Y_JAVA_AGENT
+    - GENERAL
 - id: {{ b64enc "e2e-service-consumer" }}.1
   name: e2e-service-consumer
-  group: ""
+  group: ""
+  shortname: e2e-service-consumer
+  normal: true
+  layers:
+    - SO11Y_JAVA_AGENT
+    - GENERAL
+- id: {{ b64enc "localhost:-1" }}.0
+  name: localhost:-1
+  group: ""
+  shortname: localhost:-1
+  normal: false
+  layers:
+    - VIRTUAL_DATABASE
+{{- end }}

test/e2e/case/expected/trace-info-detail.yml

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+debuggingtrace: null
 spans:
   {{- contains .spans}}
   - traceid: {{ notEmpty .traceid }}
@@ -46,4 +47,5 @@ spans:
         value: '200'
       {{- end }}
     logs: []
+    attachedevents: []
   {{- end }}

test/e2e/case/expected/trace-users-detail.yml

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+debuggingtrace: null
 spans:
   {{- contains .spans}}
   - traceid: {{ notEmpty .traceid }}
@@ -40,4 +41,5 @@ spans:
         value: '200'
       {{- end }}
     logs: []
+    attachedevents: []
   {{- end }}

test/e2e/case/expected/traces-list.yml

@@ -13,17 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+debuggingtrace: null
 traces:
   {{- contains .traces }}
-  - segmentid: {{ notEmpty .segmentid }}
-    endpointnames:
-    {{- contains .endpointnames }}
-      - POST:/info
-    {{- end }}
-    duration: {{ ge .duration 0 }}
-    start: "{{ notEmpty .start}}"
-    iserror: false
-    traceids:
-      - {{ (index .traceids 0) }}
+- segmentid: {{ notEmpty .segmentid }}
+  endpointnames:
+    - POST:/info
+  duration: {{ ge .duration 0 }}
+  start: "{{ notEmpty .start}}"
+  iserror: false
+  traceids:
+    - {{ index .traceids 0 }}
   {{- end }}
-total: {{ gt .total 0 }}