Skip to content

java: Allow different gProfiler versions to use different APs #137

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

Merged
merged 3 commits into from
Jul 13, 2021
Merged

java: Allow different gProfiler versions to use different APs #137

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
ea79213
java: Allow different gProfiler versions to use different APs
Jongy Jul 11, 2021
550169a
java: Embed AP version in its path (instead of gprofiler version)
Jongy Jul 12, 2021
517c93d
Merge branch 'master' into java-async-profiler-per-version
Jongy Jul 12, 2021
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
9 changes: 8 additions & 1 deletion gprofiler/java.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ def jattach_path() -> str:
return resource_path("java/jattach")


@functools.lru_cache(maxsize=1)
def get_ap_version() -> str:
return Path(resource_path("java/async-profiler-version")).read_text()


class AsyncProfiledProcess:
"""
Represents a process profiled with async-profiler.
Expand All @@ -73,7 +78,9 @@ def __init__(self, process: Process, storage_dir: str):
# multiple times into the process)
# without depending on storage_dir here, we maintain the same path even if gProfiler is re-run,
# because storage_dir changes between runs.
self._ap_dir = os.path.join(TEMPORARY_STORAGE_PATH, "async-profiler")
# we embed the async-profiler version in the path, so future gprofiler versions which use another version
# of AP case use it (will be loaded as a different DSO)
self._ap_dir = os.path.join(TEMPORARY_STORAGE_PATH, f"async-profiler-{get_ap_version()}")
self._ap_dir_host = resolve_proc_root_links(self._process_root, self._ap_dir)

self._libap_path_host = os.path.join(self._ap_dir_host, "libasyncProfiler.so")
Expand Down
11 changes: 10 additions & 1 deletion scripts/async_profiler_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,14 @@
#
set -euo pipefail

git clone --depth 1 -b v2.0g3 https://github.com/Granulate/async-profiler.git && cd async-profiler && git reset --hard 51447a849d686e899c1cd393e83f0f7c41685d95
VERSION=v2.0g3
OUTPUT=async-profiler-2.0-linux-x64.tar.gz

git clone --depth 1 -b "$VERSION" https://github.com/Granulate/async-profiler.git && cd async-profiler && git reset --hard 51447a849d686e899c1cd393e83f0f7c41685d95
make release

# add a version file to the build directory
echo -n "$VERSION" > async-profiler-version
gunzip "$OUTPUT"
tar -rf "${OUTPUT%.gz}" --transform s,^,async-profiler-2.0-linux-x64/build/, async-profiler-version
gzip "${OUTPUT%.gz}"