add e2e test

rainbend · rainbend · commit 1e905b24b212 · 2022-02-01T17:28:03.000+08:00
diff --git a/.github/workflows/plugin_test.yaml b/.github/workflows/plugin_test.yaml
@@ -0,0 +1,27 @@
+name: PluginsTest
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  Plugins-Test:
+    name: SkyWalking
+    runs-on: ubuntu-latest
+    env:
+      e2e_file: "plugin/skywalking/test/sync-request/e2e.yaml"
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - uses: apache/skywalking-infra-e2e@main
+        with:
+          e2e-file: ${e2e_file}
+      - name: Show Container Logs
+        if: ${{ failure() }}
+        run: docker ps -a | grep -v CONTAINER | awk '{print $1}' | xargs -i docker logs {}
+      - name: Cleanup
+        if: ${{ failure() }}
+        run: e2e cleanup -c ${e2e_file}
diff --git a/plugin/skywalking/plugin-skywalking.go b/plugin/skywalking/plugin-skywalking.go
@@ -81,6 +81,7 @@ func (p PluginSkywalking) Name() string {
 
 func (p PluginSkywalking) Version() string {
 	return version
+
 }
 
 func (p *PluginSkywalking) ExecPreHook(ctx ofctx.Context, plugins map[string]plugin.Plugin) error {
diff --git a/plugin/skywalking/sync-request.go b/plugin/skywalking/sync-request.go
@@ -33,6 +33,7 @@ func postSyncRequestLogic(ctx *ofctx.Context) error {
 		return nil
 	}
 	defer span.End()
+
 	if ofctx.InternalError == ctx.Out.Code {
 		span.Error(time.Now(), "Error on handling request")
 	}
diff --git a/plugin/skywalking/test/sync-request/e2e.yaml b/plugin/skywalking/test/sync-request/e2e.yaml
@@ -1,7 +1,7 @@
 setup:
   env: compose
   file: docker-compose.yml
-  timeout: 1200
+  timeout: 20m
 
 cleanup:
   # always never success failure
diff --git a/plugin/skywalking/test/sync-request/expected.data.yml b/plugin/skywalking/test/sync-request/expected.data.yml
@@ -1,105 +1,103 @@
 segmentItems:
-  {{- contains .segmentItems }}
-  - serviceName: function-test
-    segmentSize: {{ gt .segmentSize 0 }}
-    segments:
-    {{- contains .segments }}
-    - segmentId: {{ notEmpty .segmentId }}
-      spans:
-      {{- contains .spans }}
-      - operationName: /GET/helloserver
-        isError: false
-        skipAnalysis: false
-        spanLayer: Http
-        startTime: {{ gt .startTime 0 }}
-        endTime: {{ gt .endTime 0 }}
-        parentSpanId: 0
-        spanId: 1
-        componentId: 5005
-        spanType: Exit
-        peer: provider:8080
-        tags:
-        {{- contains .tags }}
-        - key: http.method
-          value: GET
-        - key: url
-          value: {{ .value }}
-        - key: status_code
-          value: '200'
-        {{- end }}
-      - operationName: function-test
-        isError: false
-        skipAnalysis: false
-        spanLayer: FAAS
-        startTime: {{ gt .startTime 0 }}
-        endTime: {{ gt .endTime 0 }}
-        parentSpanId: -1
-        spanId: 0
-        componentId: 5004
-        spanType: Entry
-        peer: ''
-        tags:
-        {{- contains .tags }}
-        - key: http.method
-          value: GET
-        - key: url
-          value: {{ .value }}
-        - key: status_code
-          value: '200'
-        - key: layer
-          value: faas
-        - key: tag1
-          value: value1
-        - key: tag2
-          value: value2
-        - key: instance
-          value: function-test-vhct4
-        - key: namespace
-          value: test
-        - key: func
-          value: function-test
-        {{- end }}
+{{- contains .segmentItems }}
+- serviceName: function-test
+  segmentSize: {{ gt .segmentSize 0 }}
+  segments:
+  {{- contains .segments }}
+  - segmentId: {{ notEmpty .segmentId }}
+    spans:
+    {{- contains .spans }}
+    - operationName: /GET/helloserver
+      parentSpanId: 0
+      spanId: 1
+      spanLayer: Http
+      startTime: {{ gt .startTime 0 }}
+      endTime: {{ gt .endTime 0 }}
+      componentId: 5005
+      isError: false
+      spanType: Exit
+      peer: provider:8080
+      skipAnalysis: false
+      tags:
+      {{- contains .tags }}
+      - key: http.method
+        value: GET
+      - key: url
+        value: {{ .value }}
+      - key: status_code
+        value: '200'
       {{- end }}
+    - operationName: function-test
+      parentSpanId: -1
+      spanId: 0
+      spanLayer: FAAS
+      startTime: {{ gt .startTime 0 }}
+      endTime: {{ gt .endTime 0 }}
+      componentId: 5004
+      isError: false
+      spanType: Entry
+      peer: ''
+      skipAnalysis: false
+      tags:
+      {{- contains .tags }}
+      - key: http.method
+        value: GET
+      - key: url
+        value: {{ .value }}
+      - key: instance
+        value: function-test-vhct4
+      - key: namespace
+        value: test
+      - key: func
+        value: function-test
+      - key: layer
+        value: faas
+      - key: tag1
+        value: value1
+      - key: tag2
+        value: value2
     {{- end }}
-  - serviceName: provider
-    segmentSize: {{ gt .segmentSize 0 }}
-    segments:
-    {{- contains .segments }}
-    - segmentId: {{ notEmpty .segmentId }}
-      spans:
-      {{- contains .spans }}
-      - operationName: /GET/helloserver
-        parentSpanId: -1
-        spanId: 0
-        spanLayer: Http
-        startTime: {{ gt .startTime 0 }}
-        endTime: {{ gt .endTime 0 }}
-        componentId: 5004
-        isError: false
-        spanType: Entry
-        peer: ''
-        skipAnalysis: false
-        tags:
-        {{- contains .tags }}
-        - key: http.method
-          value: GET
-        - key: url
-          value: 'provider:8080/helloserver'
-        - key: status_code
-          value: '200'
-        {{- end }}
-        refs:
-          {{- contains .refs }}
-          - parentEndpoint: function-test
-            networkAddress: 'provider:8080'
-            refType: CrossProcess
-            parentSpanId: 1
-            parentTraceSegmentId: {{ notEmpty .parentTraceSegmentId }}
-            parentServiceInstance: function-test-vhct4
-            parentService: function-test
-            traceId: {{ notEmpty .traceId }}
-          {{- end}}
+  {{- end }}
+{{- end }}
+- serviceName: provider
+  segmentSize: {{ gt .segmentSize 0 }}
+  segments:
+  {{- contains .segments }}
+  - segmentId: {{ notEmpty .segmentId }}
+    spans:
+    {{- contains .spans }}
+    - operationName: /GET/helloserver
+      parentSpanId: -1
+      spanId: 0
+      spanLayer: Http
+      startTime: {{ gt .startTime 0 }}
+      endTime: {{ gt .endTime 0 }}
+      componentId: 5004
+      isError: false
+      spanType: Entry
+      peer: ''
+      skipAnalysis: false
+      tags:
+      {{- contains .tags }}
+      - key: http.method
+        value: GET
+      - key: url
+        value: 'provider:8080/helloserver'
+      - key: status_code
+        value: '200'
       {{- end }}
+      refs:
+        {{- contains .refs }}
+        - parentEndpoint: function-test
+          networkAddress: 'provider:8080'
+          refType: CrossProcess
+          parentSpanId: 1
+          parentTraceSegmentId: {{ notEmpty .parentTraceSegmentId }}
+          parentServiceInstance: function-test-vhct4
+          parentService: function-test
+          traceId: {{ notEmpty .traceId }}
+        {{- end}}
     {{- end }}
   {{- end }}
+{{- end }}
 meterItems: []

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ func (p PluginSkywalking) Name() string {`
`81`	`81`
`82`	`82`	`func (p PluginSkywalking) Version() string {`
`83`	`83`	`return version`
	`84`	`+`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`func (p *PluginSkywalking) ExecPreHook(ctx ofctx.Context, plugins map[string]plugin.Plugin) error {`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ func postSyncRequestLogic(ctx *ofctx.Context) error {`
`33`	`33`	`return nil`
`34`	`34`	`}`
`35`	`35`	`defer span.End()`
	`36`	`+`
`36`	`37`	`if ofctx.InternalError == ctx.Out.Code {`
`37`	`38`	`span.Error(time.Now(), "Error on handling request")`
`38`	`39`	`}`