-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
fix(profiling): Ingest profile file path #4060
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
Open
Zylphrex
wants to merge
26
commits into
master
Choose a base branch
from
txiao/fix/ingest-profile-file-path
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+172
−2
Open
Changes from 17 commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
dd76ac6
fix(profiling): Ingest profile file path
Zylphrex 240eb92
feat: move profiling data to seaweedfs
aldy505 dae4436
feat: review from Sentry
aldy505 52f1c90
Apply suggestions from code review
aldy505 f0d3d29
ref: volume migration tests
aldy505 b9547fc
ref: execute file creation from vroom container
aldy505 4d228d9
fix: brainfart
aldy505 7570995
debug
aldy505 3cc8e38
hack
aldy505 e61c180
more debug
aldy505 0a2838f
now I know what I'm missing out
aldy505 9f3f8af
explicitly state feature complete
aldy505 048d061
try to pull vroom image
aldy505 7863455
should only run when COMPOSE_PROFILES is feature complete
aldy505 cd08591
using run invoked weed instead of empty shell
aldy505 aaa2d70
execute the upload script from vroom container
aldy505 8a14ed5
execute apt command as root
aldy505 74d0195
gonna sleep
aldy505 de17a3b
missing endgroup
aldy505 a12f98c
missing sh
aldy505 77e88a8
directly execute s3cmd and do 'wc' outside out the container
aldy505 69caa0c
why did other test start failing
aldy505 1a9834c
manual cleanup
aldy505 d0fd0f1
vroom is not a persistent volume
aldy505 238b058
what about not removing the seaweed volume
aldy505 4054b6d
Merge branch 'master' into txiao/fix/ingest-profile-file-path
aldy505 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| source _unit-test/_test_setup.sh | ||
| source install/dc-detect-version.sh | ||
| source install/create-docker-volumes.sh | ||
| source install/ensure-files-from-examples.sh | ||
| export COMPOSE_PROFILES="feature-complete" | ||
| $dc pull vroom | ||
| source install/ensure-correct-permissions-profiles-dir.sh | ||
|
|
||
| # Generate some random files on `sentry-vroom` volume for testing | ||
| $dc run --rm --no-deps -v sentry-vroom:/var/vroom/sentry-profiles --entrypoint /bin/bash vroom -c ' | ||
| for i in $(seq 1 1000); do | ||
| echo This is test file $i > /var/vroom/sentry-profiles/test_file_$i.txt | ||
| done | ||
| ' | ||
|
|
||
| # Set the flag to apply automatic updates | ||
| export APPLY_AUTOMATIC_CONFIG_UPDATES=1 | ||
|
|
||
| # Here we're just gonna test to run it multiple times | ||
| # Only to make sure it doesn't break | ||
| for i in $(seq 1 5); do | ||
| source install/bootstrap-s3-profiles.sh | ||
| done | ||
|
|
||
| # Ensure that the files have been migrated to SeaweedFS | ||
| migrated_files_count=$($dc run --rm --no-deps --entrypoint /bin/sh seaweedfs -c ' | ||
| apk add --no-cache s3cmd && | ||
| s3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=localhost:8333 --host-bucket="localhost:8333/%(bucket)" ls s3://profiles/ | wc -l | ||
| ') | ||
| if [[ "$migrated_files_count" -ne 1000 ]]; then | ||
| echo "Error: Expected 1000 migrated files, but found $migrated_files_count" | ||
| exit 1 | ||
| fi | ||
|
|
||
| report_success |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| # The purpose of this file is to have both `sentry`-based containers and `vroom` use the same bucket for profiling. | ||
| # On pre-25.10.0, we have a `sentry-vroom` volume which stores the profiling data however, since this version, | ||
| # the behavior changed, and `vroomrs` now ingests profiles directly. Both services must share the same bucket, | ||
| # but at the time of this writing, it's not possible because the `sentry-vroom` volume has ownership set to `vroom:vroom`. | ||
| # This prevents the `sentry`-based containers from performing read/write operations on that volume. | ||
| # | ||
| # Therefore, this script should do the following: | ||
| # 1. Check if there are any files inside the `sentry-vroom` volume. | ||
| # 2. If (1) finds files, copy those files into a "profiles" bucket on SeaweedFS. | ||
| # 3. Point `filestore-profiles` and vroom to the SeaweedFS "profiles" bucket. | ||
|
|
||
| # Should only run when `$COMPOSE_PROFILES` is set to `feature-complete` | ||
| if [[ "$COMPOSE_PROFILES" == "feature-complete" ]]; then | ||
| echo "${_group}Bootstrapping seaweedfs (profiles)..." | ||
|
|
||
| start_service_and_wait_ready seaweedfs | ||
| $dc exec -e "HTTP_PROXY=${HTTP_PROXY:-}" -e "HTTPS_PROXY=${HTTPS_PROXY:-}" -e "NO_PROXY=${NO_PROXY:-}" -e "http_proxy=${http_proxy:-}" -e "https_proxy=${https_proxy:-}" -e "no_proxy=${no_proxy:-}" seaweedfs apk add --no-cache s3cmd | ||
| s3cmd="$dc exec seaweedfs s3cmd" | ||
|
|
||
| bucket_list=$($s3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=localhost:8333 --host-bucket='localhost:8333/%(bucket)' ls) | ||
|
|
||
| if [[ $(echo "$bucket_list" | tail -1 | awk '{print $3}') != 's3://profiles' ]]; then | ||
| apply_config_changes_profiles=0 | ||
| # Only touch if no existing profiles config is found | ||
| if ! grep -q "filestore.profiles-backend" $SENTRY_CONFIG_YML; then | ||
| if [[ -z "${APPLY_AUTOMATIC_CONFIG_UPDATES:-}" ]]; then | ||
| echo | ||
| echo "We are migrating the Profiles data directory from the 'sentry-vroom' volume to SeaweedFS." | ||
| echo "This migration will ensure profiles ingestion works correctly with the new 'vroomrs'" | ||
| echo "and allows both 'sentry' and 'vroom' to transition smoothly." | ||
| echo "To complete this, your sentry/config.yml file needs to be modified." | ||
| echo "Would you like us to perform this modification automatically?" | ||
| echo | ||
|
|
||
| yn="" | ||
| until [ ! -z "$yn" ]; do | ||
| read -p "y or n? " yn | ||
| case $yn in | ||
| y | yes | 1) | ||
| export apply_config_changes_profiles=1 | ||
| echo | ||
| echo -n "Thank you." | ||
| ;; | ||
| n | no | 0) | ||
| export apply_config_changes_profiles=0 | ||
| echo | ||
| echo -n "Alright, you will need to update your sentry/config.yml file manually before running 'docker compose up'." | ||
| ;; | ||
| *) yn="" ;; | ||
| esac | ||
| done | ||
|
|
||
| echo | ||
| echo "To avoid this prompt in the future, use one of these flags:" | ||
| echo | ||
| echo " --apply-automatic-config-updates" | ||
| echo " --no-apply-automatic-config-updates" | ||
| echo | ||
| echo "or set the APPLY_AUTOMATIC_CONFIG_UPDATES environment variable:" | ||
| echo | ||
| echo " APPLY_AUTOMATIC_CONFIG_UPDATES=1 to apply automatic updates" | ||
| echo " APPLY_AUTOMATIC_CONFIG_UPDATES=0 to not apply automatic updates" | ||
| echo | ||
| sleep 5 | ||
| fi | ||
|
|
||
| if [[ "$APPLY_AUTOMATIC_CONFIG_UPDATES" == 1 || "$apply_config_changes_profiles" == 1 ]]; then | ||
| profiles_config=$(sed -n '/filestore.profiles-backend/,/s3v4"/{p}' sentry/config.example.yml) | ||
| echo "$profiles_config" >>$SENTRY_CONFIG_YML | ||
| fi | ||
| fi | ||
|
|
||
| $s3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=localhost:8333 --host-bucket='localhost:8333/%(bucket)' mb s3://profiles | ||
|
|
||
| # Check if there are files in the sentry-vroom volume | ||
| start_service_and_wait_ready vroom | ||
| vroom_files_count=$($dc exec vroom sh -c "find /var/vroom/sentry-profiles -type f | wc -l") | ||
| if [[ "$vroom_files_count" -gt 0 ]]; then | ||
| echo "Migrating $vroom_files_count files from 'sentry-vroom' volume to 'profiles' bucket on SeaweedFS..." | ||
|
|
||
| # Use a temporary container to copy files from the volume to SeaweedFS | ||
|
|
||
| $dc exec -e "HTTP_PROXY=${HTTP_PROXY:-}" -e "HTTPS_PROXY=${HTTPS_PROXY:-}" -e "NO_PROXY=${NO_PROXY:-}" -e "http_proxy=${http_proxy:-}" -e "https_proxy=${https_proxy:-}" -e "no_proxy=${no_proxy:-}" -u root vroom sh -c 'mkdir -p /var/lib/apt/lists/partial && apt-get update && apt-get install -y --no-install-recommends s3cmd' | ||
| $dc exec vroom sh -c 's3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=seaweedfs:8333 --host-bucket="seaweedfs:8333/%(bucket)" sync /var/vroom/sentry-profiles/ s3://profiles/' | ||
|
|
||
| echo "Migration completed." | ||
| else | ||
| echo "No files found in 'sentry-vroom' volume. Skipping files migration." | ||
| fi | ||
| else | ||
| echo "'profiles' bucket already exists on SeaweedFS. Skipping creation." | ||
| fi | ||
|
|
||
| if [[ -z "${APPLY_AUTOMATIC_CONFIG_UPDATES:-}" || "$APPLY_AUTOMATIC_CONFIG_UPDATES" == 1 ]]; then | ||
| lifecycle_policy=$( | ||
| cat <<EOF | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <LifecycleConfiguration> | ||
| <Rule> | ||
| <ID>Sentry-Profiles-Rule</ID> | ||
| <Status>Enabled</Status> | ||
| <Filter></Filter> | ||
| <Expiration> | ||
| <Days>$SENTRY_EVENT_RETENTION_DAYS</Days> | ||
| </Expiration> | ||
| </Rule> | ||
| </LifecycleConfiguration> | ||
| EOF | ||
| ) | ||
|
|
||
| $dc exec seaweedfs sh -c "printf '%s' '$lifecycle_policy' > /tmp/profiles-lifecycle-policy.xml" | ||
This comment was marked as outdated.
Sorry, something went wrong. |
||
| $s3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=localhost:8333 --host-bucket='localhost:8333/%(bucket)' setlifecycle /tmp/profiles-lifecycle-policy.xml s3://profiles | ||
|
|
||
| echo "Making sure the bucket lifecycle policy is all set up correctly..." | ||
| $s3cmd --access_key=sentry --secret_key=sentry --no-ssl --region=us-east-1 --host=localhost:8333 --host-bucket='localhost:8333/%(bucket)' getlifecycle s3://profiles | ||
| fi | ||
|
Comment on lines
+106
to
+116
This comment was marked as outdated.
Sorry, something went wrong.
Comment on lines
+106
to
+116
This comment was marked as outdated.
Sorry, something went wrong. |
||
| fi | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.