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

Update from upstream (take 2) #4

Merged
merged 119 commits into from
Nov 26, 2024
Merged

Conversation

aleks-p
Copy link

@aleks-p aleks-p commented Nov 22, 2024

Like #3 but with a fix for the new tests (AllocTests was hanging) and without the GitHub action changes.

apangin and others added 30 commits January 22, 2024 22:49
krk and others added 22 commits October 17, 2024 11:25
Signed-off-by: Andrei Pangin <1749416+apangin@users.noreply.github.com>
@CLAassistant
Copy link

CLAassistant commented Nov 22, 2024

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 5 committers have signed the CLA.

✅ aleks-p
❌ krk
❌ apangin
❌ alvdavi
❌ openorclose
You have signed the CLA already but the status is still pending? Let us recheck it.

@@ -1,30 +1,58 @@
PROFILER_VERSION=3.0.0.0
PROFILER_VERSION ?= 3.0.0.1

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To not forget: Change this back in case we decide not to bump.

long time = getVarlong();
int tid = getVarint();
int stackTraceId = getVarint();
int threadState = getVarint();
return new ExecutionSample(time, tid, stackTraceId, threadState);
getVarint(); // contextId
Copy link
Author

@aleks-p aleks-p Nov 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a manual addition and JFR conversion doesn't work without this. AFAIK in the current usage of the library this only affects tests, Pyroscope uses https://github.com/grafana/jfr-parser to ingest JFR files which does the same.

@korniltsev fyi

@aleks-p aleks-p merged commit a647de3 into feat/context_id Nov 26, 2024
2 of 3 checks passed
@aleks-p aleks-p deleted the update-from-upstream branch November 26, 2024 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.