Skip to content

Add Ambient Mesh E2E #13255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wu-sheng merged 14 commits into from
May 22, 2025
Merged

Add Ambient Mesh E2E #13255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fa50b67
Add Ambient Mesh E2E
mrproliu May 20, 2025
704a450
Merge branch 'master' into ambient-e2e
mrproliu May 21, 2025
a920752
update traffic generate frequency
mrproliu May 21, 2025
b609899
update the E2E file
mrproliu May 21, 2025
f0a8c14
update E2E file path
mrproliu May 21, 2025
c4566dd
split to new GHA jobs
mrproliu May 21, 2025
9a2deab
fix missing path
mrproliu May 21, 2025
a733a95
fix missing service
mrproliu May 21, 2025
ec88c55
fix e2e upload log name
mrproliu May 21, 2025
6fdfd67
adding debug logs
mrproliu May 21, 2025
edd4f1a
add sleep for waiting rover monitoring all process success
mrproliu May 21, 2025
50f569a
add sleep for waiting rover monitoring all process success
mrproliu May 21, 2025
fd2652e
Update banyandb stage e2e.yaml
wankai123 May 22, 2025
b4e209d
fix E2E
mrproliu May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 65 additions & 1 deletion .github/workflows/skywalking.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ jobs:
KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }}
ALS_ANALYZER: ${{ matrix.analyzer }}
with:
e2e-file: $GITHUB_WORKSPACE/test/e2e-v2/cases/istio/als/e2e.yaml
e2e-file: test/e2e-v2/cases/istio/als/e2e.yaml
Copy link
Member

@wu-sheng wu-sheng May 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What was the $GITHUB_WORKSPACE/ for? @kezhenxu94

Copy link
Member

@kezhenxu94 kezhenxu94 May 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What was the $GITHUB_WORKSPACE/ for? @kezhenxu94

Just to make sure the path is absolute file path, if the e2e-file is relative to the workspace folder it’s OK to remove this

- if: ${{ failure() }}
run: |
df -h
Expand All @@ -839,6 +839,67 @@ jobs:
name: test-logs-${{ matrix.test.name }}
path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"

e2e-test-istio-ambient:
if: |
( always() && ! cancelled() ) &&
((github.event_name == 'schedule' && github.repository == 'apache/skywalking') || needs.changes.outputs.oap == 'true')
name: E2E test
needs: [docker]
runs-on: ubuntu-24.04
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
analyzer: [k8s-mesh, mx-mesh]
versions:
- istio: 1.23.0
kubernetes: 28
- istio: 1.24.0
kubernetes: 28
steps:
- uses: actions/checkout@v4
with:
submodules: true
persist-credentials: false
- run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV"
- uses: apache/skywalking-cli/actions/setup@master
with:
version: ${{ env.SW_CTL_COMMIT }}
- uses: actions/download-artifact@v4
name: Download docker images
with:
name: docker-images-11
path: docker-images
- name: Load docker images
run: |
find docker-images -name "*.tar" -exec docker load -i {} \;
find docker-images -name "*.tar" -exec rm {} \;
- name: Login to ghcr
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: ${{ matrix.test.name }}
uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
env:
ISTIO_VERSION: ${{ matrix.versions.istio }}
KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }}
ALS_ANALYZER: ${{ matrix.analyzer }}
with:
e2e-file: test/e2e-v2/cases/istio/ambient-als/e2e.yaml
- if: ${{ failure() }}
run: |
df -h
du -sh .
docker images
- uses: actions/upload-artifact@v4
if: ${{ failure() }}
name: Upload Logs
with:
name: test-istio-ambient-logs-${{ matrix.versions.istio }}-${{ matrix.versions.kubernetes }}-${{ matrix.analyzer }}
path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"

e2e-test-java-versions:
if: |
( always() && ! cancelled() ) &&
Expand Down Expand Up @@ -1004,6 +1065,7 @@ jobs:
- slow-integration-test
- e2e-test
- e2e-test-istio
- e2e-test-istio-ambient
- e2e-test-java-versions
runs-on: ubuntu-latest
timeout-minutes: 10
Expand All @@ -1023,13 +1085,15 @@ jobs:
timeConsumingITResults=${{ needs.slow-integration-test.result }};
e2eResults=${{ needs.e2e-test.result }};
e2eIstioResults=${{ needs.e2e-test-istio.result }};
e2eIstioAmbientResults=${{ needs.e2e-test-istio-ambient.result }};
e2eJavaVersionResults=${{ needs.e2e-test-java-versions.result }};

[[ ${depLicenseResults} == 'success' ]] || [[ ${execute} != 'true' && ${depLicenseResults} == 'skipped' ]] || exit -2;
[[ ${unitResults} == 'success' ]] || [[ ${execute} != 'true' && ${unitResults} == 'skipped' ]] || exit -3;
[[ ${integrationResults} == 'success' ]] || [[ ${execute} != 'true' && ${integrationResults} == 'skipped' ]] || exit -4;
[[ ${e2eResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eResults} == 'skipped' ]] || exit -5;
[[ ${e2eIstioResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eIstioResults} == 'skipped' ]] || exit -6;
[[ ${e2eIstioAmbientResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eIstioAmbientResults} == 'skipped' ]] || exit -6;
[[ ${e2eJavaVersionResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eJavaVersionResults} == 'skipped' ]] || exit -7;
[[ ${timeConsumingITResults} == 'success' ]] || [[ ${execute} != 'true' && ${timeConsumingITResults} == 'skipped' ]] || exit -8;

Expand Down
2 changes: 1 addition & 1 deletion apm-protocol/apm-network/src/main/proto
Open in desktop
Submodule proto updated 1 files
+2 −0 ebpf/accesslog.proto
1 change: 1 addition & 0 deletions docs/en/changes/changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
* Support analysis waypoint metrics in Envoy ALS receiver.
* Add Ztunnel component in the topology.
* [Break Change] Change `compomentId` to `componentIds` in the K8SServiceRelation Scope.
* Adapt the mesh metrics if detect the ambient mesh in the eBPF access log receiver.

#### UI

Expand Down
7 changes: 6 additions & 1 deletion oap-server/server-receiver-plugin/skywalking-ebpf-receiver-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,15 @@
<artifactId>skywalking-sharing-server-plugin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>skywalking-mesh-receiver-plugin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>agent-analyzer</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>
</project>
Loading
Loading