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.

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

feat: upgrade jmeter to 5.6 and provide http2 support #120

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions shibuya/Dockerfile.engines.jmeter
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
ARG jmeter_ver=3.3
ARG jmeter_ver=5.6

FROM asia-northeast1-docker.pkg.dev/shibuya-214807/shibuya/alpine:3.10.2 AS jmeter
ARG jmeter_ver
ENV JMETER_VERSION=$jmeter_ver
RUN wget archive.apache.org/dist/jmeter/binaries/apache-jmeter-${JMETER_VERSION}.zip
RUN unzip -qq apache-jmeter-${JMETER_VERSION}

FROM asia-northeast1-docker.pkg.dev/shibuya-214807/shibuya/openjdk:8u212-jdk
FROM openjdk:24-jdk-slim-bullseye
ARG jmeter_ver
ENV JMETER_VERSION=$jmeter_ver
RUN mkdir /test-conf /test-result
COPY --from=jmeter /apache-jmeter-${JMETER_VERSION} /apache-jmeter-${JMETER_VERSION}

COPY engines/jmeter/plugins /apache-jmeter-${JMETER_VERSION}/lib
ADD build/shibuya-agent /usr/local/bin/shibuya-agent
ADD engines/jmeter/shibuya.properties /test-conf/shibuya.properties
ADD engines/jmeter/jmeter.sh /apache-jmeter-${JMETER_VERSION}/bin/jmeter

# specify the heap size for jmeter containers.
ENV JVM_ARGS "-Xms512m -Xmx4096m"

CMD ["shibuya-agent"]

103 changes: 0 additions & 103 deletions shibuya/engines/jmeter/jmeter.sh

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions shibuya/engines/jmeter/shibuya-agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ const (
RESULT_ROOT = "/test-result"
TEST_DATA_FOLDER = "/test-data"
PROPERTY_FILE = "/test-conf/shibuya.properties"
JMETER_BIN_FOLER = "/apache-jmeter-3.3/bin"
JMETER_BIN = "jmeter"
JMETER_BIN_FOLER = "/apache-jmeter-5.6/bin"
JMETER_BIN = "jmeter.sh"
STDERR = "/dev/stderr"
JMX_FILENAME = "modified.jmx"
)
Expand Down