This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-rover.git
The following commit(s) were added to refs/heads/main by this push:
new 3fd8498 Support Off CPU Profiling E2E test (#36)
3fd8498 is described below
commit 3fd84981b9d0229da09090e517592e61a89ae3fe
Author: mrproliu <[email protected]>
AuthorDate: Mon May 23 17:39:04 2022 +0800
Support Off CPU Profiling E2E test (#36)
* Support Off CPU Profiling E2E test
* Fix C++ Off CPU Profiling
---
.github/workflows/rover.yaml | 25 +++++++++++++++-------
pkg/profiling/task/offcpu/runner.go | 11 ++++------
pkg/tools/operator/distribution.go | 2 ++
test/e2e/base/env | 4 ++--
.../Dockerfile.sqrt => offcpu/c++/Dockerfile.file} | 6 +++---
.../{golang => offcpu/c++}/docker-compose.yml | 11 ++++++----
.../profiling/{golang => offcpu/c++}/e2e.yaml | 4 ++--
.../{c++/sqrt.cpp => offcpu/c++/file.cpp} | 13 +++++++----
.../{golang => offcpu/c++}/profiling-analysis.yml | 2 +-
.../Dockerfile.sqrt => offcpu/c/Dockerfile.file} | 6 +++---
.../{golang => offcpu/c}/docker-compose.yml | 11 ++++++----
.../cases/profiling/{golang => offcpu/c}/e2e.yaml | 4 ++--
.../cases/profiling/{c/sqrt.c => offcpu/c/file.c} | 25 +++++++++++++++-------
.../{ => offcpu}/c/profiling-analysis.yml | 2 +-
.../profiling/{ => offcpu}/expected/instance.yml | 2 +-
.../profiling/{ => offcpu}/expected/process.yml | 10 ++++-----
.../{ => offcpu}/expected/profiling-create.yml | 0
.../expected/profiling-schedule-list.yml | 14 ++++++------
.../{ => offcpu}/expected/profiling-task-list.yml | 6 +++---
.../profiling/{ => offcpu}/expected/service.yml | 6 +++---
.../golang/Dockerfile.file} | 6 +++---
.../{ => offcpu}/golang/docker-compose.yml | 11 ++++++----
.../cases/profiling/{ => offcpu}/golang/e2e.yaml | 4 ++--
.../{golang/sqrt.go => offcpu/golang/file.go} | 17 ++++++++-------
.../{c => offcpu/golang}/profiling-analysis.yml | 2 +-
.../profiling/{ => offcpu}/profiling-cases.yaml | 16 ++++++--------
.../rust/Dockerfile.file} | 6 +++---
.../{golang => offcpu/rust}/docker-compose.yml | 11 ++++++----
.../profiling/{golang => offcpu/rust}/e2e.yaml | 4 ++--
.../{rust/sqrt.rs => offcpu/rust/file.rs} | 15 ++++++-------
.../{ => offcpu}/rust/profiling-analysis.yml | 0
.../profiling/{ => oncpu}/c++/Dockerfile.sqrt | 0
.../profiling/{ => oncpu}/c++/docker-compose.yml | 4 ++--
.../cases/profiling/{golang => oncpu/c++}/e2e.yaml | 2 +-
.../{ => oncpu}/c++/profiling-analysis.yml | 0
test/e2e/cases/profiling/{ => oncpu}/c++/sqrt.cpp | 0
.../cases/profiling/{ => oncpu}/c/Dockerfile.sqrt | 0
.../profiling/{ => oncpu}/c/docker-compose.yml | 4 ++--
test/e2e/cases/profiling/{c++ => oncpu/c}/e2e.yaml | 2 +-
.../profiling/{ => oncpu}/c/profiling-analysis.yml | 0
test/e2e/cases/profiling/{ => oncpu}/c/sqrt.c | 0
.../profiling/{ => oncpu}/expected/instance.yml | 0
.../expected/process-estimate-scale.yml | 0
.../profiling/{ => oncpu}/expected/process.yml | 0
.../expected/profiling-create-prepare.yml | 0
.../{ => oncpu}/expected/profiling-create.yml | 0
.../expected/profiling-schedule-list.yml | 0
.../{ => oncpu}/expected/profiling-task-list.yml | 0
.../profiling/{ => oncpu}/expected/service.yml | 0
.../profiling/{ => oncpu}/golang/Dockerfile.sqrt | 0
.../{ => oncpu}/golang/docker-compose.yml | 4 ++--
.../cases/profiling/{c => oncpu/golang}/e2e.yaml | 2 +-
.../{ => oncpu}/golang/profiling-analysis.yml | 0
.../e2e/cases/profiling/{ => oncpu}/golang/sqrt.go | 0
.../profiling/{ => oncpu}/profiling-cases.yaml | 0
.../profiling/{ => oncpu}/rust/Dockerfile.sqrt | 0
.../profiling/{ => oncpu}/rust/docker-compose.yml | 4 ++--
test/e2e/cases/profiling/{ => oncpu}/rust/e2e.yaml | 2 +-
.../{ => oncpu}/rust/profiling-analysis.yml | 0
test/e2e/cases/profiling/{ => oncpu}/rust/sqrt.rs | 0
60 files changed, 154 insertions(+), 126 deletions(-)
diff --git a/.github/workflows/rover.yaml b/.github/workflows/rover.yaml
index 8c32a29..342d86b 100644
--- a/.github/workflows/rover.yaml
+++ b/.github/workflows/rover.yaml
@@ -75,14 +75,23 @@ jobs:
fail-fast: false
matrix:
test:
- - name: Golang Profiling
- config: test/e2e/cases/profiling/golang/e2e.yaml
- - name: C++ Profiling
- config: test/e2e/cases/profiling/c++/e2e.yaml
- - name: C Profiling
- config: test/e2e/cases/profiling/c/e2e.yaml
- - name: Rust Profiling
- config: test/e2e/cases/profiling/rust/e2e.yaml
+ - name: Golang On CPU Profiling
+ config: test/e2e/cases/profiling/oncpu/golang/e2e.yaml
+ - name: C++ On CPU Profiling
+ config: test/e2e/cases/profiling/oncpu/c++/e2e.yaml
+ - name: C On CPU Profiling
+ config: test/e2e/cases/profiling/oncpu/c/e2e.yaml
+ - name: Rust On CPU Profiling
+ config: test/e2e/cases/profiling/oncpu/rust/e2e.yaml
+
+ - name: Golang Off CPU Profiling
+ config: test/e2e/cases/profiling/offcpu/golang/e2e.yaml
+ - name: C++ Off CPU Profiling
+ config: test/e2e/cases/profiling/offcpu/c++/e2e.yaml
+ - name: C Off CPU Profiling
+ config: test/e2e/cases/profiling/offcpu/c/e2e.yaml
+ - name: Rust Off CPU Profiling
+ config: test/e2e/cases/profiling/offcpu/rust/e2e.yaml
- name: go2sky Agent Sensor
config: test/e2e/cases/process/agent_sensor/golang/e2e.yaml
diff --git a/pkg/profiling/task/offcpu/runner.go
b/pkg/profiling/task/offcpu/runner.go
index 81bc003..dca5343 100644
--- a/pkg/profiling/task/offcpu/runner.go
+++ b/pkg/profiling/task/offcpu/runner.go
@@ -61,7 +61,7 @@ type Runner struct {
kernelProfiling *profiling.Info
// runtime
- previousStacks map[ProcessStack]*StackCounter
+ previousStacks map[ProcessStack]StackCounter
bpf *bpfObjects
kprobe link.Link
stopChan chan bool
@@ -82,7 +82,7 @@ func (r *Runner) Init(task *base.ProfilingTask, process
api.ProcessInterface) er
log.Warnf("could not analyze kernel profiling stats: %v", err)
}
r.kernelProfiling = kernelProfiling
- r.previousStacks = make(map[ProcessStack]*StackCounter)
+ r.previousStacks = make(map[ProcessStack]StackCounter)
r.stopChan = make(chan bool, 1)
return nil
}
@@ -153,9 +153,6 @@ func (r *Runner) FlushData() ([]*v3.EBPFProfilingData,
error) {
if r.bpf == nil {
return nil, nil
}
- if r.flushDataNotify == nil {
- return nil, nil
- }
var stack ProcessStack
var counter StackCounter
iterate := r.bpf.Counts.Iterate()
@@ -183,11 +180,11 @@ func (r *Runner) FlushData() ([]*v3.EBPFProfilingData,
error) {
switchCount := int32(counter.Times)
duration := int64(counter.Deltas)
existCounter := r.previousStacks[stack]
- if existCounter != nil {
+ if existCounter.Times > 0 && existCounter.Deltas > 0 {
switchCount -= int32(existCounter.Times)
duration -= int64(existCounter.Deltas)
}
- r.previousStacks[stack] = &counter
+ r.previousStacks[stack] = counter
result = append(result, &v3.EBPFProfilingData{
Profiling: &v3.EBPFProfilingData_OffCPU{
diff --git a/pkg/tools/operator/distribution.go
b/pkg/tools/operator/distribution.go
index c63831e..4ea9304 100644
--- a/pkg/tools/operator/distribution.go
+++ b/pkg/tools/operator/distribution.go
@@ -132,5 +132,7 @@ func normalizeContent(d string) string {
d = strings.TrimSpace(d)
d = strings.ToLower(d)
d = strings.ReplaceAll(d, "-", "_")
+ d = strings.TrimPrefix(d, "\"")
+ d = strings.TrimSuffix(d, "\"")
return d
}
diff --git a/test/e2e/base/env b/test/e2e/base/env
index f07f319..a7733c4 100644
--- a/test/e2e/base/env
+++ b/test/e2e/base/env
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SW_CTL_COMMIT=03dbdcf8cecc3abdef661efaa5734c01ac49adea
-SW_OAP_COMMIT=91b94cfc105276897c82e2d0f8d4bb8bd3952660
+SW_CTL_COMMIT=bdcba1c93b1ad702a88f30b798df5e99d963689d
+SW_OAP_COMMIT=47509715f5a76aef33d0987be6302f7b31315bf0
SW_KUBERNETES_COMMIT_SHA=0f3ec68e5a7e1608cec8688716b848ed15e971e5
SW_AGENT_GO_COMMIT=216f122d942cb683f48578d3014cc5ea83637582
\ No newline at end of file
diff --git a/test/e2e/cases/profiling/c++/Dockerfile.sqrt
b/test/e2e/cases/profiling/offcpu/c++/Dockerfile.file
similarity index 92%
copy from test/e2e/cases/profiling/c++/Dockerfile.sqrt
copy to test/e2e/cases/profiling/offcpu/c++/Dockerfile.file
index c75cdf2..5c60321 100644
--- a/test/e2e/cases/profiling/c++/Dockerfile.sqrt
+++ b/test/e2e/cases/profiling/offcpu/c++/Dockerfile.file
@@ -17,7 +17,7 @@
FROM gcc:latest
WORKDIR /
-COPY sqrt.cpp /sqrt.cpp
-RUN g++ sqrt.cpp -o sqrt
+COPY file.cpp /file.cpp
+RUN g++ file.cpp -o file
-CMD ["/sqrt"]
\ No newline at end of file
+CMD ["/file"]
\ No newline at end of file
diff --git a/test/e2e/cases/profiling/golang/docker-compose.yml
b/test/e2e/cases/profiling/offcpu/c++/docker-compose.yml
similarity index 78%
copy from test/e2e/cases/profiling/golang/docker-compose.yml
copy to test/e2e/cases/profiling/offcpu/c++/docker-compose.yml
index 1f5369f..49aee4e 100644
--- a/test/e2e/cases/profiling/golang/docker-compose.yml
+++ b/test/e2e/cases/profiling/offcpu/c++/docker-compose.yml
@@ -18,23 +18,26 @@ version: '2.1'
services:
oap:
extends:
- file: ../../../base/base-compose.yml
+ file: ../../../../base/base-compose.yml
service: oap
ports:
- 12800:12800
rover:
extends:
- file: ../../../base/base-compose.yml
+ file: ../../../../base/base-compose.yml
service: rover
+ environment:
+ ROVER_PROCESS_DISCOVERY_REGEX_SCANNER_MATCH_CMD: /file
+ ROVER_PROCESS_DISCOVERY_REGEX_SCANNER_SERVICE_NAME: file
depends_on:
oap:
condition: service_healthy
- sqrt_go:
+ file_c_plus_plus:
build:
context: .
- dockerfile: Dockerfile.sqrt
+ dockerfile: Dockerfile.file
networks:
- e2e
diff --git a/test/e2e/cases/profiling/golang/e2e.yaml
b/test/e2e/cases/profiling/offcpu/c++/e2e.yaml
similarity index 93%
copy from test/e2e/cases/profiling/golang/e2e.yaml
copy to test/e2e/cases/profiling/offcpu/c++/e2e.yaml
index 0d79f55..8c9d512 100644
--- a/test/e2e/cases/profiling/golang/e2e.yaml
+++ b/test/e2e/cases/profiling/offcpu/c++/e2e.yaml
@@ -17,7 +17,7 @@ setup:
env: compose
file: docker-compose.yml
timeout: 20m
- init-system-environment: ../../../base/env
+ init-system-environment: ../../../../base/env
steps:
- name: set PATH
command: export PATH=/tmp/skywalking-infra-e2e/bin:$PATH
@@ -37,7 +37,7 @@ verify:
- includes:
- ../profiling-cases.yaml
- query: |
- taskid=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf list --service-name sqrt |yq e '.[0].taskid' -)
+ taskid=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf list --service-name file |yq e '.[0].taskid' -)
scheduleid=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf schedules --task-id=$taskid |yq e
'.[0].scheduleid' -);
start=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf schedules --task-id=$taskid | yq e
'.[0].starttime' -)
end=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf schedules --task-id=$taskid | yq e '.[0].endtime'
-)
diff --git a/test/e2e/cases/profiling/c++/sqrt.cpp
b/test/e2e/cases/profiling/offcpu/c++/file.cpp
similarity index 79%
copy from test/e2e/cases/profiling/c++/sqrt.cpp
copy to test/e2e/cases/profiling/offcpu/c++/file.cpp
index c0db43f..f0cfa2a 100644
--- a/test/e2e/cases/profiling/c++/sqrt.cpp
+++ b/test/e2e/cases/profiling/offcpu/c++/file.cpp
@@ -14,18 +14,23 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include <cmath>
+#include <iostream>
+#include <fstream>
using namespace std;
-void sqrtCPlusPlus()
+
+void fileCPlusPlus()
{
for (;;)
{
- sqrt(10000);
+ ofstream myfile;
+ myfile.open ("/tmp/skywalking-rover-e2e-test");
+ myfile << "e2e test.\n";
+ myfile.close();
}
}
int main()
{
- sqrtCPlusPlus();
+ fileCPlusPlus();
return 0;
}
\ No newline at end of file
diff --git a/test/e2e/cases/profiling/golang/profiling-analysis.yml
b/test/e2e/cases/profiling/offcpu/c++/profiling-analysis.yml
similarity index 96%
copy from test/e2e/cases/profiling/golang/profiling-analysis.yml
copy to test/e2e/cases/profiling/offcpu/c++/profiling-analysis.yml
index c8fe9d3..07ca02c 100644
--- a/test/e2e/cases/profiling/golang/profiling-analysis.yml
+++ b/test/e2e/cases/profiling/offcpu/c++/profiling-analysis.yml
@@ -20,7 +20,7 @@ trees:
{{- contains .elements }}
- id: "{{ notEmpty .id }}"
parentid: "{{ notEmpty .parentid }}"
- symbol: "main.sqrtGolang"
+ symbol: "fileCPlusPlus()"
stacktype: USER_SPACE
dumpcount: {{ gt .dumpcount 0 }}
{{- end }}
diff --git a/test/e2e/cases/profiling/c/Dockerfile.sqrt
b/test/e2e/cases/profiling/offcpu/c/Dockerfile.file
similarity index 93%
copy from test/e2e/cases/profiling/c/Dockerfile.sqrt
copy to test/e2e/cases/profiling/offcpu/c/Dockerfile.file
index 5f0150f..e175836 100644
--- a/test/e2e/cases/profiling/c/Dockerfile.sqrt
+++ b/test/e2e/cases/profiling/offcpu/c/Dockerfile.file
@@ -17,7 +17,7 @@
FROM gcc:latest
WORKDIR /
-COPY sqrt.c /sqrt.c
-RUN gcc sqrt.c -o sqrt
+COPY file.c /file.c
+RUN gcc file.c -o file
-CMD ["/sqrt"]
\ No newline at end of file
+CMD ["/file"]
\ No newline at end of file
diff --git a/test/e2e/cases/profiling/golang/docker-compose.yml
b/test/e2e/cases/profiling/offcpu/c/docker-compose.yml
similarity index 78%
copy from test/e2e/cases/profiling/golang/docker-compose.yml
copy to test/e2e/cases/profiling/offcpu/c/docker-compose.yml
index 1f5369f..816e685 100644
--- a/test/e2e/cases/profiling/golang/docker-compose.yml
+++ b/test/e2e/cases/profiling/offcpu/c/docker-compose.yml
@@ -18,23 +18,26 @@ version: '2.1'
services:
oap:
extends:
- file: ../../../base/base-compose.yml
+ file: ../../../../base/base-compose.yml
service: oap
ports:
- 12800:12800
rover:
extends:
- file: ../../../base/base-compose.yml
+ file: ../../../../base/base-compose.yml
service: rover
+ environment:
+ ROVER_PROCESS_DISCOVERY_REGEX_SCANNER_MATCH_CMD: /file
+ ROVER_PROCESS_DISCOVERY_REGEX_SCANNER_SERVICE_NAME: file
depends_on:
oap:
condition: service_healthy
- sqrt_go:
+ file_c:
build:
context: .
- dockerfile: Dockerfile.sqrt
+ dockerfile: Dockerfile.file
networks:
- e2e
diff --git a/test/e2e/cases/profiling/golang/e2e.yaml
b/test/e2e/cases/profiling/offcpu/c/e2e.yaml
similarity index 93%
copy from test/e2e/cases/profiling/golang/e2e.yaml
copy to test/e2e/cases/profiling/offcpu/c/e2e.yaml
index 0d79f55..8c9d512 100644
--- a/test/e2e/cases/profiling/golang/e2e.yaml
+++ b/test/e2e/cases/profiling/offcpu/c/e2e.yaml
@@ -17,7 +17,7 @@ setup:
env: compose
file: docker-compose.yml
timeout: 20m
- init-system-environment: ../../../base/env
+ init-system-environment: ../../../../base/env
steps:
- name: set PATH
command: export PATH=/tmp/skywalking-infra-e2e/bin:$PATH
@@ -37,7 +37,7 @@ verify:
- includes:
- ../profiling-cases.yaml
- query: |
- taskid=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf list --service-name sqrt |yq e '.[0].taskid' -)
+ taskid=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf list --service-name file |yq e '.[0].taskid' -)
scheduleid=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf schedules --task-id=$taskid |yq e
'.[0].scheduleid' -);
start=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf schedules --task-id=$taskid | yq e
'.[0].starttime' -)
end=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf schedules --task-id=$taskid | yq e '.[0].endtime'
-)
diff --git a/test/e2e/cases/profiling/c/sqrt.c
b/test/e2e/cases/profiling/offcpu/c/file.c
similarity index 71%
copy from test/e2e/cases/profiling/c/sqrt.c
copy to test/e2e/cases/profiling/offcpu/c/file.c
index 306c6b3..5ba3ae6 100644
--- a/test/e2e/cases/profiling/c/sqrt.c
+++ b/test/e2e/cases/profiling/offcpu/c/file.c
@@ -14,16 +14,25 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include <math.h>
-void sqrtC()
-{
+#include <stdio.h>
+#include <stdlib.h>
+
+int main() {
while (1)
{
- sqrt(100.0);
- }
-}
+ FILE *fptr;
-int main() {
- sqrtC();
+ // use appropriate location if you are using MacOS or Linux
+ fptr = fopen("/tmp/skywalking-rover-e2e-test","w");
+
+ if(fptr == NULL)
+ {
+ printf("Error!");
+ exit(1);
+ }
+
+ fprintf(fptr,"%d",1);
+ fclose(fptr);
+ }
return 0;
}
\ No newline at end of file
diff --git a/test/e2e/cases/profiling/c/profiling-analysis.yml
b/test/e2e/cases/profiling/offcpu/c/profiling-analysis.yml
similarity index 96%
copy from test/e2e/cases/profiling/c/profiling-analysis.yml
copy to test/e2e/cases/profiling/offcpu/c/profiling-analysis.yml
index 46a9d32..3f03f03 100644
--- a/test/e2e/cases/profiling/c/profiling-analysis.yml
+++ b/test/e2e/cases/profiling/offcpu/c/profiling-analysis.yml
@@ -20,7 +20,7 @@ trees:
{{- contains .elements }}
- id: "{{ notEmpty .id }}"
parentid: "{{ notEmpty .parentid }}"
- symbol: "sqrtC"
+ symbol: "fprintf"
stacktype: USER_SPACE
dumpcount: {{ gt .dumpcount 0 }}
{{- end }}
diff --git a/test/e2e/cases/profiling/expected/instance.yml
b/test/e2e/cases/profiling/offcpu/expected/instance.yml
similarity index 93%
copy from test/e2e/cases/profiling/expected/instance.yml
copy to test/e2e/cases/profiling/offcpu/expected/instance.yml
index 7f86905..db0638d 100644
--- a/test/e2e/cases/profiling/expected/instance.yml
+++ b/test/e2e/cases/profiling/offcpu/expected/instance.yml
@@ -14,7 +14,7 @@
# limitations under the License.
{{- contains . }}
-- id: {{ b64enc "sqrt" }}.1_{{ b64enc "test-instance" }}
+- id: {{ b64enc "file" }}.1_{{ b64enc "test-instance" }}
name: test-instance
attributes: []
language: UNKNOWN
diff --git a/test/e2e/cases/profiling/expected/process.yml
b/test/e2e/cases/profiling/offcpu/expected/process.yml
similarity index 88%
copy from test/e2e/cases/profiling/expected/process.yml
copy to test/e2e/cases/profiling/offcpu/expected/process.yml
index 02e62c0..69c1ae9 100644
--- a/test/e2e/cases/profiling/expected/process.yml
+++ b/test/e2e/cases/profiling/offcpu/expected/process.yml
@@ -15,10 +15,10 @@
{{- contains . }}
- id: {{ notEmpty .id }}
- name: sqrt
- serviceid: {{ b64enc "sqrt" }}.1
- servicename: sqrt
- instanceid: {{ b64enc "sqrt" }}.1_{{ b64enc "test-instance" }}
+ name: file
+ serviceid: {{ b64enc "file" }}.1
+ servicename: file
+ instanceid: {{ b64enc "file" }}.1_{{ b64enc "test-instance" }}
instancename: test-instance
agentid: {{ notEmpty .agentid }}
detecttype: VM
@@ -29,7 +29,7 @@
- name: pid
value: {{ notEmpty .value }}
- name: command_line
- value: /sqrt
+ value: /file
{{- end }}
labels:
{{- contains .labels }}
diff --git a/test/e2e/cases/profiling/expected/profiling-create.yml
b/test/e2e/cases/profiling/offcpu/expected/profiling-create.yml
similarity index 100%
copy from test/e2e/cases/profiling/expected/profiling-create.yml
copy to test/e2e/cases/profiling/offcpu/expected/profiling-create.yml
diff --git a/test/e2e/cases/profiling/expected/profiling-schedule-list.yml
b/test/e2e/cases/profiling/offcpu/expected/profiling-schedule-list.yml
similarity index 87%
copy from test/e2e/cases/profiling/expected/profiling-schedule-list.yml
copy to test/e2e/cases/profiling/offcpu/expected/profiling-schedule-list.yml
index 0127ebf..1e3eff6 100644
--- a/test/e2e/cases/profiling/expected/profiling-schedule-list.yml
+++ b/test/e2e/cases/profiling/offcpu/expected/profiling-schedule-list.yml
@@ -13,15 +13,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-{{- contains . }}
+ {{- contains . }}
- scheduleid: {{ notEmpty .scheduleid }}
taskid: {{ notEmpty .taskid }}
process:
id: {{ notEmpty .process.id }}
- name: sqrt
- serviceid: {{ b64enc "sqrt" }}.1
- servicename: sqrt
- instanceid: {{ b64enc "sqrt" }}.1_{{ b64enc "test-instance" }}
+ name: file
+ serviceid: {{ b64enc "file" }}.1
+ servicename: file
+ instanceid: {{ b64enc "file" }}.1_{{ b64enc "test-instance" }}
instancename: test-instance
agentid: {{ notEmpty .process.agentid }}
detecttype: VM
@@ -32,7 +32,7 @@
- name: pid
value: {{ notEmpty .value }}
- name: command_line
- value: /sqrt
+ value: /file
{{- end }}
labels:
{{- contains .process.labels }}
@@ -41,4 +41,4 @@
{{- end }}
starttime: {{ gt .starttime 0 }}
endtime: {{ gt .endtime 0 }}
-{{- end }}
\ No newline at end of file
+ {{- end }}
\ No newline at end of file
diff --git a/test/e2e/cases/profiling/expected/profiling-task-list.yml
b/test/e2e/cases/profiling/offcpu/expected/profiling-task-list.yml
similarity index 92%
copy from test/e2e/cases/profiling/expected/profiling-task-list.yml
copy to test/e2e/cases/profiling/offcpu/expected/profiling-task-list.yml
index f561c46..10ea7f8 100644
--- a/test/e2e/cases/profiling/expected/profiling-task-list.yml
+++ b/test/e2e/cases/profiling/offcpu/expected/profiling-task-list.yml
@@ -15,8 +15,8 @@
{{- contains . }}
- taskid: {{ notEmpty .taskid }}
- serviceid: {{ b64enc "sqrt" }}.1
- servicename: sqrt
+ serviceid: {{ b64enc "file" }}.1
+ servicename: file
processlabels:
{{- contains .processlabels }}
- e2e-label1
@@ -25,6 +25,6 @@
taskstarttime: {{ gt .taskstarttime 0 }}
triggertype: FIXED_TIME
fixedtriggerduration: 60
- targettype: ON_CPU
+ targettype: OFF_CPU
createtime: {{ gt .createtime 0 }}
{{- end }}
\ No newline at end of file
diff --git a/test/e2e/cases/profiling/expected/service.yml
b/test/e2e/cases/profiling/offcpu/expected/service.yml
similarity index 92%
copy from test/e2e/cases/profiling/expected/service.yml
copy to test/e2e/cases/profiling/offcpu/expected/service.yml
index 4c0ee2b..814563c 100644
--- a/test/e2e/cases/profiling/expected/service.yml
+++ b/test/e2e/cases/profiling/offcpu/expected/service.yml
@@ -14,10 +14,10 @@
# limitations under the License.
{{- contains . }}
-- id: {{ b64enc "sqrt" }}.1
- name: sqrt
+- id: {{ b64enc "file" }}.1
+ name: file
group: ""
- shortname: sqrt
+ shortname: file
layers:
- OS_LINUX
normal: true
diff --git a/test/e2e/cases/profiling/golang/Dockerfile.sqrt
b/test/e2e/cases/profiling/offcpu/golang/Dockerfile.file
similarity index 92%
copy from test/e2e/cases/profiling/golang/Dockerfile.sqrt
copy to test/e2e/cases/profiling/offcpu/golang/Dockerfile.file
index 432e696..eb6f559 100644
--- a/test/e2e/cases/profiling/golang/Dockerfile.sqrt
+++ b/test/e2e/cases/profiling/offcpu/golang/Dockerfile.file
@@ -17,7 +17,7 @@
FROM golang:1.17
WORKDIR /
-COPY sqrt.go /sqrt.go
-RUN go build -o sqrt sqrt.go
+COPY file.go /file.go
+RUN go build -o file file.go
-CMD ["/sqrt"]
\ No newline at end of file
+CMD ["/file"]
\ No newline at end of file
diff --git a/test/e2e/cases/profiling/golang/docker-compose.yml
b/test/e2e/cases/profiling/offcpu/golang/docker-compose.yml
similarity index 78%
copy from test/e2e/cases/profiling/golang/docker-compose.yml
copy to test/e2e/cases/profiling/offcpu/golang/docker-compose.yml
index 1f5369f..e1aa572 100644
--- a/test/e2e/cases/profiling/golang/docker-compose.yml
+++ b/test/e2e/cases/profiling/offcpu/golang/docker-compose.yml
@@ -18,23 +18,26 @@ version: '2.1'
services:
oap:
extends:
- file: ../../../base/base-compose.yml
+ file: ../../../../base/base-compose.yml
service: oap
ports:
- 12800:12800
rover:
extends:
- file: ../../../base/base-compose.yml
+ file: ../../../../base/base-compose.yml
service: rover
+ environment:
+ ROVER_PROCESS_DISCOVERY_REGEX_SCANNER_MATCH_CMD: /file
+ ROVER_PROCESS_DISCOVERY_REGEX_SCANNER_SERVICE_NAME: file
depends_on:
oap:
condition: service_healthy
- sqrt_go:
+ file_go:
build:
context: .
- dockerfile: Dockerfile.sqrt
+ dockerfile: Dockerfile.file
networks:
- e2e
diff --git a/test/e2e/cases/profiling/golang/e2e.yaml
b/test/e2e/cases/profiling/offcpu/golang/e2e.yaml
similarity index 93%
copy from test/e2e/cases/profiling/golang/e2e.yaml
copy to test/e2e/cases/profiling/offcpu/golang/e2e.yaml
index 0d79f55..8c9d512 100644
--- a/test/e2e/cases/profiling/golang/e2e.yaml
+++ b/test/e2e/cases/profiling/offcpu/golang/e2e.yaml
@@ -17,7 +17,7 @@ setup:
env: compose
file: docker-compose.yml
timeout: 20m
- init-system-environment: ../../../base/env
+ init-system-environment: ../../../../base/env
steps:
- name: set PATH
command: export PATH=/tmp/skywalking-infra-e2e/bin:$PATH
@@ -37,7 +37,7 @@ verify:
- includes:
- ../profiling-cases.yaml
- query: |
- taskid=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf list --service-name sqrt |yq e '.[0].taskid' -)
+ taskid=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf list --service-name file |yq e '.[0].taskid' -)
scheduleid=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf schedules --task-id=$taskid |yq e
'.[0].scheduleid' -);
start=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf schedules --task-id=$taskid | yq e
'.[0].starttime' -)
end=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf schedules --task-id=$taskid | yq e '.[0].endtime'
-)
diff --git a/test/e2e/cases/profiling/golang/sqrt.go
b/test/e2e/cases/profiling/offcpu/golang/file.go
similarity index 83%
copy from test/e2e/cases/profiling/golang/sqrt.go
copy to test/e2e/cases/profiling/offcpu/golang/file.go
index 1fc3d01..128f183 100644
--- a/test/e2e/cases/profiling/golang/sqrt.go
+++ b/test/e2e/cases/profiling/offcpu/golang/file.go
@@ -17,16 +17,17 @@
package main
import (
- "math"
+ "fmt"
+ "os"
)
-//go:noinline
-func sqrtGolang() {
+func main() {
+ d1 := []byte("e2e-test")
for {
- math.Sqrt(10000)
+ err := os.WriteFile("/tmp/skywalking-rover-e2e-test", d1, 0600)
+ if err != nil {
+ fmt.Printf("error: %v", err)
+ break
+ }
}
}
-
-func main() {
- sqrtGolang()
-}
diff --git a/test/e2e/cases/profiling/c/profiling-analysis.yml
b/test/e2e/cases/profiling/offcpu/golang/profiling-analysis.yml
similarity index 96%
copy from test/e2e/cases/profiling/c/profiling-analysis.yml
copy to test/e2e/cases/profiling/offcpu/golang/profiling-analysis.yml
index 46a9d32..fc75aff 100644
--- a/test/e2e/cases/profiling/c/profiling-analysis.yml
+++ b/test/e2e/cases/profiling/offcpu/golang/profiling-analysis.yml
@@ -20,7 +20,7 @@ trees:
{{- contains .elements }}
- id: "{{ notEmpty .id }}"
parentid: "{{ notEmpty .parentid }}"
- symbol: "sqrtC"
+ symbol: "os.WriteFile"
stacktype: USER_SPACE
dumpcount: {{ gt .dumpcount 0 }}
{{- end }}
diff --git a/test/e2e/cases/profiling/profiling-cases.yaml
b/test/e2e/cases/profiling/offcpu/profiling-cases.yaml
similarity index 67%
copy from test/e2e/cases/profiling/profiling-cases.yaml
copy to test/e2e/cases/profiling/offcpu/profiling-cases.yaml
index eb6956f..b2c7285 100644
--- a/test/e2e/cases/profiling/profiling-cases.yaml
+++ b/test/e2e/cases/profiling/offcpu/profiling-cases.yaml
@@ -16,23 +16,19 @@
# This file is used to show how to write configuration files and can be used
to test.
cases:
- - query: swctl --display yaml service ls
+ - query: swctl --base-url=http://${oap_host}:${oap_12800}/graphql --display
yaml service ls
expected: expected/service.yml
- - query: swctl --display yaml instance ls --service-name sqrt
+ - query: swctl --base-url=http://${oap_host}:${oap_12800}/graphql --display
yaml instance ls --service-name file
expected: expected/instance.yml
- - query: swctl --display yaml process ls --service-name sqrt --instance-name
test-instance
+ - query: swctl --base-url=http://${oap_host}:${oap_12800}/graphql --display
yaml process ls --service-name file --instance-name test-instance
expected: expected/process.yml
- - query: swctl --base-url=http://${oap_host}:${oap_12800}/graphql --display
yaml profiling ebpf create prepare --service-name sqrt
- expected: expected/profiling-create-prepare.yml
- - query: swctl --base-url=http://${oap_host}:${oap_12800}/graphql --display
yaml process estimate scale --service-name sqrt --labels e2e-label1,e2e-label2
- expected: expected/process-estimate-scale.yml
- query: |
- swctl --base-url=http://${oap_host}:${oap_12800}/graphql --display yaml
profiling ebpf create fixed --service-name sqrt --labels e2e-label1,e2e-label2
--duration 1m
+ swctl --base-url=http://${oap_host}:${oap_12800}/graphql --display yaml
profiling ebpf create fixed --service-name file --labels e2e-label1,e2e-label2
--duration 1m --target-type OFF_CPU
expected: expected/profiling-create.yml
- - query: swctl --base-url=http://${oap_host}:${oap_12800}/graphql --display
yaml profiling ebpf list --service-name sqrt
+ - query: swctl --base-url=http://${oap_host}:${oap_12800}/graphql --display
yaml profiling ebpf list --service-name file
expected: expected/profiling-task-list.yml
- query: |
swctl --base-url=http://${oap_host}:${oap_12800}/graphql --display yaml
profiling ebpf schedules --task-id=$( \
- swctl --base-url=http://${oap_host}:${oap_12800}/graphql --display
yaml profiling ebpf list --service-name sqrt |yq e '.[0].taskid' -
+ swctl --base-url=http://${oap_host}:${oap_12800}/graphql --display
yaml profiling ebpf list --service-name file |yq e '.[0].taskid' -
)
expected: expected/profiling-schedule-list.yml
\ No newline at end of file
diff --git a/test/e2e/cases/profiling/rust/Dockerfile.sqrt
b/test/e2e/cases/profiling/offcpu/rust/Dockerfile.file
similarity index 93%
copy from test/e2e/cases/profiling/rust/Dockerfile.sqrt
copy to test/e2e/cases/profiling/offcpu/rust/Dockerfile.file
index 402b8b1..18f7680 100644
--- a/test/e2e/cases/profiling/rust/Dockerfile.sqrt
+++ b/test/e2e/cases/profiling/offcpu/rust/Dockerfile.file
@@ -17,7 +17,7 @@
FROM rust:1.60
WORKDIR /
-COPY sqrt.rs /sqrt.rs
-RUN rustc -o sqrt sqrt.rs
+COPY file.rs /file.rs
+RUN rustc -o file file.rs
-CMD ["/sqrt"]
\ No newline at end of file
+CMD ["/file"]
\ No newline at end of file
diff --git a/test/e2e/cases/profiling/golang/docker-compose.yml
b/test/e2e/cases/profiling/offcpu/rust/docker-compose.yml
similarity index 78%
copy from test/e2e/cases/profiling/golang/docker-compose.yml
copy to test/e2e/cases/profiling/offcpu/rust/docker-compose.yml
index 1f5369f..723e51e 100644
--- a/test/e2e/cases/profiling/golang/docker-compose.yml
+++ b/test/e2e/cases/profiling/offcpu/rust/docker-compose.yml
@@ -18,23 +18,26 @@ version: '2.1'
services:
oap:
extends:
- file: ../../../base/base-compose.yml
+ file: ../../../../base/base-compose.yml
service: oap
ports:
- 12800:12800
rover:
extends:
- file: ../../../base/base-compose.yml
+ file: ../../../../base/base-compose.yml
service: rover
+ environment:
+ ROVER_PROCESS_DISCOVERY_REGEX_SCANNER_MATCH_CMD: /file
+ ROVER_PROCESS_DISCOVERY_REGEX_SCANNER_SERVICE_NAME: file
depends_on:
oap:
condition: service_healthy
- sqrt_go:
+ file_rust:
build:
context: .
- dockerfile: Dockerfile.sqrt
+ dockerfile: Dockerfile.file
networks:
- e2e
diff --git a/test/e2e/cases/profiling/golang/e2e.yaml
b/test/e2e/cases/profiling/offcpu/rust/e2e.yaml
similarity index 93%
copy from test/e2e/cases/profiling/golang/e2e.yaml
copy to test/e2e/cases/profiling/offcpu/rust/e2e.yaml
index 0d79f55..8c9d512 100644
--- a/test/e2e/cases/profiling/golang/e2e.yaml
+++ b/test/e2e/cases/profiling/offcpu/rust/e2e.yaml
@@ -17,7 +17,7 @@ setup:
env: compose
file: docker-compose.yml
timeout: 20m
- init-system-environment: ../../../base/env
+ init-system-environment: ../../../../base/env
steps:
- name: set PATH
command: export PATH=/tmp/skywalking-infra-e2e/bin:$PATH
@@ -37,7 +37,7 @@ verify:
- includes:
- ../profiling-cases.yaml
- query: |
- taskid=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf list --service-name sqrt |yq e '.[0].taskid' -)
+ taskid=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf list --service-name file |yq e '.[0].taskid' -)
scheduleid=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf schedules --task-id=$taskid |yq e
'.[0].scheduleid' -);
start=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf schedules --task-id=$taskid | yq e
'.[0].starttime' -)
end=$(swctl --base-url=http://${oap_host}:${oap_12800}/graphql
--display yaml profiling ebpf schedules --task-id=$taskid | yq e '.[0].endtime'
-)
diff --git a/test/e2e/cases/profiling/rust/sqrt.rs
b/test/e2e/cases/profiling/offcpu/rust/file.rs
similarity index 82%
copy from test/e2e/cases/profiling/rust/sqrt.rs
copy to test/e2e/cases/profiling/offcpu/rust/file.rs
index d9657ad..988d6f6 100644
--- a/test/e2e/cases/profiling/rust/sqrt.rs
+++ b/test/e2e/cases/profiling/offcpu/rust/file.rs
@@ -14,15 +14,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#[inline(never)]
-fn sqrt() {
- let positive = 4.0_f64;
+use std::fs::File;
+use std::io::prelude::*;
+
+fn main() -> std::io::Result<()> {
loop {
- _ = positive.sqrt();
+ let mut file = File::create("foo.txt")?;
+ file.write_all(b"Hello, world!")?;
}
-}
-
-#[inline(never)]
-fn main() {
- sqrt()
}
\ No newline at end of file
diff --git a/test/e2e/cases/profiling/rust/profiling-analysis.yml
b/test/e2e/cases/profiling/offcpu/rust/profiling-analysis.yml
similarity index 100%
copy from test/e2e/cases/profiling/rust/profiling-analysis.yml
copy to test/e2e/cases/profiling/offcpu/rust/profiling-analysis.yml
diff --git a/test/e2e/cases/profiling/c++/Dockerfile.sqrt
b/test/e2e/cases/profiling/oncpu/c++/Dockerfile.sqrt
similarity index 100%
rename from test/e2e/cases/profiling/c++/Dockerfile.sqrt
rename to test/e2e/cases/profiling/oncpu/c++/Dockerfile.sqrt
diff --git a/test/e2e/cases/profiling/c++/docker-compose.yml
b/test/e2e/cases/profiling/oncpu/c++/docker-compose.yml
similarity index 91%
rename from test/e2e/cases/profiling/c++/docker-compose.yml
rename to test/e2e/cases/profiling/oncpu/c++/docker-compose.yml
index ff5f760..613092c 100644
--- a/test/e2e/cases/profiling/c++/docker-compose.yml
+++ b/test/e2e/cases/profiling/oncpu/c++/docker-compose.yml
@@ -18,14 +18,14 @@ version: '2.1'
services:
oap:
extends:
- file: ../../../base/base-compose.yml
+ file: ../../../../base/base-compose.yml
service: oap
ports:
- 12800:12800
rover:
extends:
- file: ../../../base/base-compose.yml
+ file: ../../../../base/base-compose.yml
service: rover
depends_on:
oap:
diff --git a/test/e2e/cases/profiling/golang/e2e.yaml
b/test/e2e/cases/profiling/oncpu/c++/e2e.yaml
similarity index 96%
rename from test/e2e/cases/profiling/golang/e2e.yaml
rename to test/e2e/cases/profiling/oncpu/c++/e2e.yaml
index 0d79f55..f607abd 100644
--- a/test/e2e/cases/profiling/golang/e2e.yaml
+++ b/test/e2e/cases/profiling/oncpu/c++/e2e.yaml
@@ -17,7 +17,7 @@ setup:
env: compose
file: docker-compose.yml
timeout: 20m
- init-system-environment: ../../../base/env
+ init-system-environment: ../../../../base/env
steps:
- name: set PATH
command: export PATH=/tmp/skywalking-infra-e2e/bin:$PATH
diff --git a/test/e2e/cases/profiling/c++/profiling-analysis.yml
b/test/e2e/cases/profiling/oncpu/c++/profiling-analysis.yml
similarity index 100%
rename from test/e2e/cases/profiling/c++/profiling-analysis.yml
rename to test/e2e/cases/profiling/oncpu/c++/profiling-analysis.yml
diff --git a/test/e2e/cases/profiling/c++/sqrt.cpp
b/test/e2e/cases/profiling/oncpu/c++/sqrt.cpp
similarity index 100%
rename from test/e2e/cases/profiling/c++/sqrt.cpp
rename to test/e2e/cases/profiling/oncpu/c++/sqrt.cpp
diff --git a/test/e2e/cases/profiling/c/Dockerfile.sqrt
b/test/e2e/cases/profiling/oncpu/c/Dockerfile.sqrt
similarity index 100%
rename from test/e2e/cases/profiling/c/Dockerfile.sqrt
rename to test/e2e/cases/profiling/oncpu/c/Dockerfile.sqrt
diff --git a/test/e2e/cases/profiling/c/docker-compose.yml
b/test/e2e/cases/profiling/oncpu/c/docker-compose.yml
similarity index 92%
rename from test/e2e/cases/profiling/c/docker-compose.yml
rename to test/e2e/cases/profiling/oncpu/c/docker-compose.yml
index 4742e13..ed62923 100644
--- a/test/e2e/cases/profiling/c/docker-compose.yml
+++ b/test/e2e/cases/profiling/oncpu/c/docker-compose.yml
@@ -18,14 +18,14 @@ version: '2.1'
services:
oap:
extends:
- file: ../../../base/base-compose.yml
+ file: ../../../../base/base-compose.yml
service: oap
ports:
- 12800:12800
rover:
extends:
- file: ../../../base/base-compose.yml
+ file: ../../../../base/base-compose.yml
service: rover
depends_on:
oap:
diff --git a/test/e2e/cases/profiling/c++/e2e.yaml
b/test/e2e/cases/profiling/oncpu/c/e2e.yaml
similarity index 96%
rename from test/e2e/cases/profiling/c++/e2e.yaml
rename to test/e2e/cases/profiling/oncpu/c/e2e.yaml
index 0d79f55..f607abd 100644
--- a/test/e2e/cases/profiling/c++/e2e.yaml
+++ b/test/e2e/cases/profiling/oncpu/c/e2e.yaml
@@ -17,7 +17,7 @@ setup:
env: compose
file: docker-compose.yml
timeout: 20m
- init-system-environment: ../../../base/env
+ init-system-environment: ../../../../base/env
steps:
- name: set PATH
command: export PATH=/tmp/skywalking-infra-e2e/bin:$PATH
diff --git a/test/e2e/cases/profiling/c/profiling-analysis.yml
b/test/e2e/cases/profiling/oncpu/c/profiling-analysis.yml
similarity index 100%
rename from test/e2e/cases/profiling/c/profiling-analysis.yml
rename to test/e2e/cases/profiling/oncpu/c/profiling-analysis.yml
diff --git a/test/e2e/cases/profiling/c/sqrt.c
b/test/e2e/cases/profiling/oncpu/c/sqrt.c
similarity index 100%
rename from test/e2e/cases/profiling/c/sqrt.c
rename to test/e2e/cases/profiling/oncpu/c/sqrt.c
diff --git a/test/e2e/cases/profiling/expected/instance.yml
b/test/e2e/cases/profiling/oncpu/expected/instance.yml
similarity index 100%
rename from test/e2e/cases/profiling/expected/instance.yml
rename to test/e2e/cases/profiling/oncpu/expected/instance.yml
diff --git a/test/e2e/cases/profiling/expected/process-estimate-scale.yml
b/test/e2e/cases/profiling/oncpu/expected/process-estimate-scale.yml
similarity index 100%
rename from test/e2e/cases/profiling/expected/process-estimate-scale.yml
rename to test/e2e/cases/profiling/oncpu/expected/process-estimate-scale.yml
diff --git a/test/e2e/cases/profiling/expected/process.yml
b/test/e2e/cases/profiling/oncpu/expected/process.yml
similarity index 100%
rename from test/e2e/cases/profiling/expected/process.yml
rename to test/e2e/cases/profiling/oncpu/expected/process.yml
diff --git a/test/e2e/cases/profiling/expected/profiling-create-prepare.yml
b/test/e2e/cases/profiling/oncpu/expected/profiling-create-prepare.yml
similarity index 100%
rename from test/e2e/cases/profiling/expected/profiling-create-prepare.yml
rename to test/e2e/cases/profiling/oncpu/expected/profiling-create-prepare.yml
diff --git a/test/e2e/cases/profiling/expected/profiling-create.yml
b/test/e2e/cases/profiling/oncpu/expected/profiling-create.yml
similarity index 100%
rename from test/e2e/cases/profiling/expected/profiling-create.yml
rename to test/e2e/cases/profiling/oncpu/expected/profiling-create.yml
diff --git a/test/e2e/cases/profiling/expected/profiling-schedule-list.yml
b/test/e2e/cases/profiling/oncpu/expected/profiling-schedule-list.yml
similarity index 100%
rename from test/e2e/cases/profiling/expected/profiling-schedule-list.yml
rename to test/e2e/cases/profiling/oncpu/expected/profiling-schedule-list.yml
diff --git a/test/e2e/cases/profiling/expected/profiling-task-list.yml
b/test/e2e/cases/profiling/oncpu/expected/profiling-task-list.yml
similarity index 100%
rename from test/e2e/cases/profiling/expected/profiling-task-list.yml
rename to test/e2e/cases/profiling/oncpu/expected/profiling-task-list.yml
diff --git a/test/e2e/cases/profiling/expected/service.yml
b/test/e2e/cases/profiling/oncpu/expected/service.yml
similarity index 100%
rename from test/e2e/cases/profiling/expected/service.yml
rename to test/e2e/cases/profiling/oncpu/expected/service.yml
diff --git a/test/e2e/cases/profiling/golang/Dockerfile.sqrt
b/test/e2e/cases/profiling/oncpu/golang/Dockerfile.sqrt
similarity index 100%
rename from test/e2e/cases/profiling/golang/Dockerfile.sqrt
rename to test/e2e/cases/profiling/oncpu/golang/Dockerfile.sqrt
diff --git a/test/e2e/cases/profiling/golang/docker-compose.yml
b/test/e2e/cases/profiling/oncpu/golang/docker-compose.yml
similarity index 91%
rename from test/e2e/cases/profiling/golang/docker-compose.yml
rename to test/e2e/cases/profiling/oncpu/golang/docker-compose.yml
index 1f5369f..0df418f 100644
--- a/test/e2e/cases/profiling/golang/docker-compose.yml
+++ b/test/e2e/cases/profiling/oncpu/golang/docker-compose.yml
@@ -18,14 +18,14 @@ version: '2.1'
services:
oap:
extends:
- file: ../../../base/base-compose.yml
+ file: ../../../../base/base-compose.yml
service: oap
ports:
- 12800:12800
rover:
extends:
- file: ../../../base/base-compose.yml
+ file: ../../../../base/base-compose.yml
service: rover
depends_on:
oap:
diff --git a/test/e2e/cases/profiling/c/e2e.yaml
b/test/e2e/cases/profiling/oncpu/golang/e2e.yaml
similarity index 96%
rename from test/e2e/cases/profiling/c/e2e.yaml
rename to test/e2e/cases/profiling/oncpu/golang/e2e.yaml
index 0d79f55..f607abd 100644
--- a/test/e2e/cases/profiling/c/e2e.yaml
+++ b/test/e2e/cases/profiling/oncpu/golang/e2e.yaml
@@ -17,7 +17,7 @@ setup:
env: compose
file: docker-compose.yml
timeout: 20m
- init-system-environment: ../../../base/env
+ init-system-environment: ../../../../base/env
steps:
- name: set PATH
command: export PATH=/tmp/skywalking-infra-e2e/bin:$PATH
diff --git a/test/e2e/cases/profiling/golang/profiling-analysis.yml
b/test/e2e/cases/profiling/oncpu/golang/profiling-analysis.yml
similarity index 100%
rename from test/e2e/cases/profiling/golang/profiling-analysis.yml
rename to test/e2e/cases/profiling/oncpu/golang/profiling-analysis.yml
diff --git a/test/e2e/cases/profiling/golang/sqrt.go
b/test/e2e/cases/profiling/oncpu/golang/sqrt.go
similarity index 100%
rename from test/e2e/cases/profiling/golang/sqrt.go
rename to test/e2e/cases/profiling/oncpu/golang/sqrt.go
diff --git a/test/e2e/cases/profiling/profiling-cases.yaml
b/test/e2e/cases/profiling/oncpu/profiling-cases.yaml
similarity index 100%
rename from test/e2e/cases/profiling/profiling-cases.yaml
rename to test/e2e/cases/profiling/oncpu/profiling-cases.yaml
diff --git a/test/e2e/cases/profiling/rust/Dockerfile.sqrt
b/test/e2e/cases/profiling/oncpu/rust/Dockerfile.sqrt
similarity index 100%
rename from test/e2e/cases/profiling/rust/Dockerfile.sqrt
rename to test/e2e/cases/profiling/oncpu/rust/Dockerfile.sqrt
diff --git a/test/e2e/cases/profiling/rust/docker-compose.yml
b/test/e2e/cases/profiling/oncpu/rust/docker-compose.yml
similarity index 91%
rename from test/e2e/cases/profiling/rust/docker-compose.yml
rename to test/e2e/cases/profiling/oncpu/rust/docker-compose.yml
index 0fc3d94..405731d 100644
--- a/test/e2e/cases/profiling/rust/docker-compose.yml
+++ b/test/e2e/cases/profiling/oncpu/rust/docker-compose.yml
@@ -18,14 +18,14 @@ version: '2.1'
services:
oap:
extends:
- file: ../../../base/base-compose.yml
+ file: ../../../../base/base-compose.yml
service: oap
ports:
- 12800:12800
rover:
extends:
- file: ../../../base/base-compose.yml
+ file: ../../../../base/base-compose.yml
service: rover
depends_on:
oap:
diff --git a/test/e2e/cases/profiling/rust/e2e.yaml
b/test/e2e/cases/profiling/oncpu/rust/e2e.yaml
similarity index 96%
rename from test/e2e/cases/profiling/rust/e2e.yaml
rename to test/e2e/cases/profiling/oncpu/rust/e2e.yaml
index 0d79f55..f607abd 100644
--- a/test/e2e/cases/profiling/rust/e2e.yaml
+++ b/test/e2e/cases/profiling/oncpu/rust/e2e.yaml
@@ -17,7 +17,7 @@ setup:
env: compose
file: docker-compose.yml
timeout: 20m
- init-system-environment: ../../../base/env
+ init-system-environment: ../../../../base/env
steps:
- name: set PATH
command: export PATH=/tmp/skywalking-infra-e2e/bin:$PATH
diff --git a/test/e2e/cases/profiling/rust/profiling-analysis.yml
b/test/e2e/cases/profiling/oncpu/rust/profiling-analysis.yml
similarity index 100%
rename from test/e2e/cases/profiling/rust/profiling-analysis.yml
rename to test/e2e/cases/profiling/oncpu/rust/profiling-analysis.yml
diff --git a/test/e2e/cases/profiling/rust/sqrt.rs
b/test/e2e/cases/profiling/oncpu/rust/sqrt.rs
similarity index 100%
rename from test/e2e/cases/profiling/rust/sqrt.rs
rename to test/e2e/cases/profiling/oncpu/rust/sqrt.rs
