Merge branch 'feature/1.6.0' into fix-network-ns-syscall

Signed-off-by: 烈香 <hengyoush1@163.com>
This commit is contained in:
烈香
2025-04-15 01:26:14 +08:00
committed by GitHub
4 changed files with 26 additions and 18 deletions

View File

@@ -13,6 +13,7 @@ permissions:
jobs:
release-test:
timeout-minutes: 60
runs-on: ubuntu-22.04
steps:

View File

@@ -13,6 +13,7 @@ jobs:
release:
runs-on: ubuntu-22.04
timeout-minutes: 60
steps:
- name: Remove large directories

View File

@@ -17,6 +17,7 @@ jobs:
build:
runs-on: ubuntu-22.04
timeout-minutes: 60
steps:
- uses: actions/checkout@v4.2.2
with:
@@ -161,15 +162,30 @@ jobs:
sudo curl -L "https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
docker-compose --version
#install mongodb shell
wget -qO- https://www.mongodb.org/static/pgp/server-8.0.asc | sudo tee /etc/apt/trusted.gpg.d/server-8.0.asc
echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/8.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-8.0.list
sudo apt-get update
sudo apt-get install -y mongodb-mongosh
- name: Test DNS
uses: cilium/little-vm-helper@c44c1221b104ee02ec0235211f7ace3c88eb11a2 # v0.0.19
with:
provision: 'false'
cmd: |
set -euxo pipefail
uname -a
cat /etc/issue
pushd /host
if [ -f "/var/lib/kyanos/btf/current.btf" ]; then
bash /host/testdata/test_dns.sh 'sudo /host/kyanos/kyanos $kyanos_log_option --btf /var/lib/kyanos/btf/current.btf'
else
bash /host/testdata/test_dns.sh 'sudo /host/kyanos/kyanos $kyanos_log_option'
fi
popd
- name: Test Mongo
uses: cilium/little-vm-helper@97c89f004bd0ab4caeacfe92ebc956e13e362e6b # v0.0.19
uses: cilium/little-vm-helper@c44c1221b104ee02ec0235211f7ace3c88eb11a2 # v0.0.19
with:
provision: 'false'
cmd: |
@@ -186,7 +202,6 @@ jobs:
- name: Test Truncated Data parsing
uses: cilium/little-vm-helper@c44c1221b104ee02ec0235211f7ace3c88eb11a2 # v0.0.19
if: ${{ !contains(fromJSON('["4.19-20240912.022020", "5.4-20240912.022020"]'), matrix.kernel) }}
with:
provision: 'false'
cmd: |
@@ -243,20 +258,6 @@ jobs:
bash /host/testdata/run_cap_bpf_test.sh "" "CAP_SYS_ADMIN"
popd
- name: Test Mongodb
uses: cilium/little-vm-helper@c44c1221b104ee02ec0235211f7ace3c88eb11a2 # v0.0.19
with:
provision: 'false'
cmd: |
set -ex
uname -a
cat /etc/issue
if [ -f "/var/lib/kyanos/btf/current.btf" ]; then
bash /host/testdata/test_mongodb.sh 'sudo /host/kyanos/kyanos $kyanos_log_option --btf /var/lib/kyanos/btf/current.btf'
else
bash /host/testdata/test_mongodb.sh 'sudo /host/kyanos/kyanos $kyanos_log_option'
fi
- name: Test RocketMQ
uses: cilium/little-vm-helper@c44c1221b104ee02ec0235211f7ace3c88eb11a2 # v0.0.19
with:
@@ -490,4 +491,4 @@ jobs:
cat /etc/issue
pushd /host
bash /host/testdata/run_k8s_test.sh "" 1
popd
popd

View File

@@ -10,6 +10,7 @@ import (
"os"
"regexp"
"strings"
"sync"
"time"
"github.com/cilium/ebpf"
@@ -18,6 +19,7 @@ import (
)
var attachedLibPaths map[string]bool = make(map[string]bool)
var attachedLibPathsMutex sync.Mutex
var uprobeLinks []link.Link = make([]link.Link, 0)
func StartHandleSchedExecEvent(ch chan *bpf.AgentProcessExecEvent) {
@@ -119,10 +121,13 @@ func AttachSslUprobe(pid int) ([]link.Link, error) {
return nil, err
}
attachedLibPathsMutex.Lock()
if _, found := attachedLibPaths[libSslPath]; found {
attachedLibPathsMutex.Unlock()
return []link.Link{}, nil
} else {
attachedLibPaths[libSslPath] = true
attachedLibPathsMutex.Unlock()
}
sslEx, err := link.OpenExecutable(libSslPath)