From 0b45cd6d2e9fb8f95fec9b324298a3ff06c7a111 Mon Sep 17 00:00:00 2001
From: David Georg Reichelt <davidgeorg_reichelt@dagere.de>
Date: Thu, 23 Jun 2022 20:09:19 +0200
Subject: [PATCH] Remove -all, since OpenTelemetry does not use the extension
anymore
---
frameworks/OpenTelemetry/benchmark.sh | 2 +-
frameworks/common-functions.sh | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/frameworks/OpenTelemetry/benchmark.sh b/frameworks/OpenTelemetry/benchmark.sh
index 0d7173b..4daa427 100755
--- a/frameworks/OpenTelemetry/benchmark.sh
+++ b/frameworks/OpenTelemetry/benchmark.sh
@@ -150,7 +150,7 @@ checkMoobenchApplication
getOpentelemetryAgent
JAVAARGS_NOINSTR="${JAVAARGS}"
-JAVAARGS_OPENTELEMETRY_BASIC="${JAVAARGS} -javaagent:${BASE_DIR}/lib/opentelemetry-javaagent-all.jar -Dotel.resource.attributes=service.name=moobench -Dotel.instrumentation.methods.include=moobench.application.MonitoredClassSimple[monitoredMethod];moobench.application.MonitoredClassThreaded[monitoredMethod]"
+JAVAARGS_OPENTELEMETRY_BASIC="${JAVAARGS} -javaagent:${BASE_DIR}/lib/opentelemetry-javaagent.jar -Dotel.resource.attributes=service.name=moobench -Dotel.instrumentation.methods.include=moobench.application.MonitoredClassSimple[monitoredMethod];moobench.application.MonitoredClassThreaded[monitoredMethod]"
JAVAARGS_OPENTELEMETRY_LOGGING_DEACTIVATED="${JAVAARGS_OPENTELEMETRY_BASIC} -Dotel.traces.exporter=logging -Dotel.traces.sampler=always_off"
JAVAARGS_OPENTELEMETRY_LOGGING="${JAVAARGS_OPENTELEMETRY_BASIC} -Dotel.traces.exporter=logging"
JAVAARGS_OPENTELEMETRY_ZIPKIN="${JAVAARGS_OPENTELEMETRY_BASIC} -Dotel.traces.exporter=zipkin -Dotel.metrics.exporter=none"
diff --git a/frameworks/common-functions.sh b/frameworks/common-functions.sh
index 9fc3bc4..6193880 100644
--- a/frameworks/common-functions.sh
+++ b/frameworks/common-functions.sh
@@ -42,11 +42,11 @@ function getInspectItAgent() {
}
function getOpentelemetryAgent() {
- if [ ! -f ${BASEDIR}lib/opentelemetry-javaagent-all.jar ]
+ if [ ! -f ${BASEDIR}lib/opentelemetry-javaagent.jar ]
then
mkdir -p ${BASEDIR}lib
- wget --output-document=${BASEDIR}lib/opentelemetry-javaagent-all.jar \
- https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent-all.jar
+ wget --output-document=${BASEDIR}lib/opentelemetry-javaagent.jar \
+ https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar
fi
}
--
GitLab