Skip to content
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

Jump to bottom

Support service level metrics aggregate when missing pod context in eBPF Access Log Receiver #12608

Merged
merged 3 commits into from
Sep 10, 2024
Merged

Support service level metrics aggregate when missing pod context in eBPF Access Log Receiver #12608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be54957
Support service level metrics aggregate when missing pod context in e…
mrproliu Sep 10, 2024
0198cc3
Merge branch 'master' into service-level-access-log
mrproliu Sep 10, 2024
1d6fd1d
bump up all artifact related GHA version
mrproliu Sep 10, 2024
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
16 changes: 8 additions & 8 deletions .github/workflows/skywalking.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ jobs:
-Dcheckstyle.skip
- name: Verify builds are reproducible
run: ./mvnw -Dmaven.test.skip clean verify artifact:compare -Pall
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
name: Upload distribution tar
with:
name: dist
Expand All @@ -202,7 +202,7 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
name: Download distribution tar
with:
name: dist
Expand All @@ -220,7 +220,7 @@ jobs:
docker save -o docker-images-skywalking-oap.tar skywalking/oap:latest
docker save -o docker-images-skywalking-ui.tar skywalking/ui:latest
- name: Upload docker images
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docker-images-${{ matrix.java-version }}
path: docker-images-skywalking-*.tar
Expand Down Expand Up @@ -694,7 +694,7 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
name: Download docker images
with:
name: docker-images-11
Expand Down Expand Up @@ -733,7 +733,7 @@ jobs:
df -h
du -sh .
docker images
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
if: ${{ failure() }}
name: Upload Logs
with:
Expand Down Expand Up @@ -766,7 +766,7 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
name: Download docker images
with:
name: docker-images-11
Expand Down Expand Up @@ -794,7 +794,7 @@ jobs:
df -h
du -sh .
docker images
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
if: ${{ failure() }}
name: Upload Logs
with:
Expand All @@ -817,7 +817,7 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
name: Download docker images
with:
name: docker-images-${{ matrix.java-version }}
Expand Down
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 @@ -60,6 +60,7 @@
* Nacos as config server and cluster coordinator supports configuration contextPath.
* Update the endpoint name format to `<Method>:<Path>` in eBPF Access Log Receiver.
* Add self-observability metrics for OpenTelemetry receiver.
* Support service level metrics aggregate when missing pod context in eBPF Access Log Receiver.

#### UI

Expand Down
11 changes: 9 additions & 2 deletions .../apache/skywalking/oap/server/receiver/ebpf/provider/handler/AccessLogServiceHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,10 @@ protected void printDropReasons() {
}

protected KubernetesProcessAddress buildKubernetesAddressByIP(NodeInfo nodeInfo, IPAddress ipAddress) {
final ObjectID service = K8sInfoRegistry.getInstance().findServiceByIP(ipAddress.getHost());
if (service != ObjectID.EMPTY) {
return buildRemoteAddress(nodeInfo, service, null);
}
final ObjectID pod = K8sInfoRegistry.getInstance().findPodByIP(ipAddress.getHost());
if (pod == ObjectID.EMPTY) {
// if cannot found the address, then return the unknown address
Expand Down Expand Up @@ -513,7 +517,7 @@ protected KubernetesProcessAddress buildRemoteAddress(NodeInfo nodeInfo, ObjectI
}
return KubernetesProcessAddress.newBuilder()
.setServiceName(serviceName)
.setPodName(pod.name())
.setPodName(pod == null ? "" : pod.name())
.build();
}

Expand Down Expand Up @@ -585,7 +589,7 @@ public K8SService toService() {
}

public K8SServiceInstance toServiceInstance() {
if (Objects.equals(local, buildUnknownAddress())) {
if (Objects.equals(local, buildUnknownAddress()) || StringUtil.isEmpty(local.getPodName())) {
return null;
}
final K8SServiceInstance serviceInstance = new K8SServiceInstance();
Expand Down Expand Up @@ -619,6 +623,9 @@ public K8SServiceRelation toServiceRelation() {
}

public K8SServiceInstanceRelation toServiceInstanceRelation() {
if (StringUtil.isEmpty(local.getPodName()) || StringUtil.isEmpty(remote.getPodName())) {
return null;
}
final Tuple2<KubernetesProcessAddress, KubernetesProcessAddress> tuple = convertSourceAndDestAddress();
final K8SServiceInstanceRelation serviceInstanceRelation = new K8SServiceInstanceRelation();
final String sourceServiceName = buildServiceNameByAddress(nodeInfo, tuple._1);
Expand Down
Loading