Skip to content

Fixes for ARM board #38

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

Open
shinhyungyang wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Fixes for ARM board #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5538e2c
Removed cpu check for the Prometheus configuration
shinhyungyang Sep 25, 2025
b82c679
Launching prometheus ARM64
shinhyungyang Sep 29, 2025
9d68ff8
Fixes for OpenTelemetry-java
shinhyungyang Oct 14, 2025
d22c221
Fixes for Skywalking-java
shinhyungyang Oct 14, 2025
100cac5
Create MACHINE_TYPE variable in benchmark.sh
shinhyungyang Oct 15, 2025
c1f5bf6
Fixes for prometheus PID and machine type
Oct 21, 2025
00e00be
Removed MACHINE_TYPE checking on OpenTelemetry-java.
Oct 21, 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
27 changes: 25 additions & 2 deletions common-functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,34 @@ function periodicallyCurlPrometheus {
}

function startPrometheus {
periodicallyCurlPrometheus $1 &
pid=$!
if [ ${MACHINE_TYPE} == 'aarch64' ]
then
startPrometheusARM64
else
periodicallyCurlPrometheus $1 &
pid=$!
fi
}

function startPrometheusARM64 {
if [ ! -d prometheus-3.6.0.linux-arm64 ]
then
wget https://github.com/prometheus/prometheus/releases/download/v3.6.0/prometheus-3.6.0.linux-arm64.tar.gz
tar -xvf prometheus-3.6.0.linux-arm64.tar.gz
rm prometheus-3.6.0.linux-arm64.tar.gz
fi
cd prometheus-3.6.0.linux-arm64
./prometheus &> prometheus.log &
echo $! > /tmp/prometheus.pid
cd ..
}

function stopBackgroundProcess {
if [ -f /tmp/prometheus.pid ]
then
pid=$(cat /tmp/prometheus.pid)
rm /tmp/prometheus.pid
fi
kill $pid
}

Expand Down
8 changes: 2 additions & 6 deletions frameworks/OpenTelemetry-java/labels.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,5 @@ TITLE[0]="No instrumentation"
TITLE[1]="No logging"
TITLE[2]="Logging"
TITLE[3]="Zipkin"
MACHINE_TYPE=`uname -m`;
if [ ${MACHINE_TYPE} == 'x86_64' ]
then
TITLE[4]="Prometheus"
#TITLE[5]="OpenTelemetry Jaeger"
fi
TITLE[4]="Prometheus"
#TITLE[5]="OpenTelemetry Jaeger"
3 changes: 2 additions & 1 deletion frameworks/Skywalking-java/functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ function startSkywalkingServer {
./oapService.sh &
SKYWALKING_PID=$!
cd "${BASE_DIR}"
while ! nc -z localhost 11800; do
# while ! nc -z localhost 11800; do
while ! timeout 1 bash -c "cat < /dev/null > /dev/tcp/localhost/11800" 2>/dev/null; do
sleep 2
done
}
Expand Down
2 changes: 1 addition & 1 deletion init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if [ -z $DEBUG ]; then
DEBUG=false ## false
fi


MACHINE_TYPE=`uname -m`

# load configuration and common functions
if [ -f "${BASE_DIR}/config.rc" ] ; then
Expand Down