Skip to content

Conversation

@korniltsev
Copy link
Contributor

@korniltsev korniltsev commented Dec 13, 2024

  • use one dockerfile, build the profiler in the dockerfile, remove prerequisites to build the profiler and copy the profiler separately
  • add screenshot
  • fix profiler,pyroscope,collector versions. It does not work on the latests.

Notes: ebpf profiler does not properly work in minikube. I've tested in a real k8s cluster by pushing an image to the public docker repo. I am not sure we should advertise minikube in the example if it does not work. We can consider submiting a PR with pid namespace inspection from pyroscope ebpf profiler.

@korniltsev korniltsev requested a review from a team as a code owner December 13, 2024 10:44
@simonswine simonswine added type/docs Improvements for doc docs. Used by Docs team for project management backport release/v1.9 backport release/v1.10 This label will backport a merged PR to the release/v1.10 branch labels Dec 13, 2024
@github-actions
Copy link
Contributor

This PR must be merged before a backport PR will be created.

2 similar comments
@github-actions
Copy link
Contributor

This PR must be merged before a backport PR will be created.

@github-actions
Copy link
Contributor

This PR must be merged before a backport PR will be created.

Copy link
Contributor

@knylander-grafana knylander-grafana left a comment

Choose a reason for hiding this comment

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

Thank you for updating the readmes and the examples. Approving the readme changes.

Copy link
Contributor

@marcsanmi marcsanmi left a comment

Choose a reason for hiding this comment

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

LGTM 👍

RUN wget https://go.dev/dl/go1.22.10.linux-amd64.tar.gz
RUN tar -C /usr/local -xzf go1.22.10.linux-amd64.tar.gz
# fixed versions for pyroscope, otel-collector, otel-profiler due to protocol changes
RUN wget https://github.com/open-telemetry/opentelemetry-ebpf-profiler/archive/9eb454541a3cf1282a8755dbcec9a9471b243e83.tar.gz
Copy link
Contributor

Choose a reason for hiding this comment

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

I like this. However, I think we should update to avoid working with pinned versions and images once the profiler is stable enough

@korniltsev korniltsev merged commit a2c06ee into main Dec 16, 2024
21 checks passed
@korniltsev korniltsev deleted the korinltsev/docs-ebpf-otel branch December 16, 2024 10:47
@github-actions
Copy link
Contributor

The backport to release/v1.9 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-3777-to-release/v1.9 origin/release/v1.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x a2c06eeb4719429993c82a486c94a86785161d1c

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-3777-to-release/v1.9
# Create the PR body template
PR_BODY=$(gh pr view 3777 --json body --template 'Backport a2c06eeb4719429993c82a486c94a86785161d1c from #3777{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release/v1.9] docs: ebpf-otel fixes' --body-file - --label 'type/docs' --label 'backport' --base release/v1.9 --milestone release/v1.9 --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-3777-to-release/v1.9

# Create a pull request where the `base` branch is `release/v1.9` and the `compare`/`head` branch is `backport-3777-to-release/v1.9`.

# Remove the local backport branch
git switch main
git branch -D backport-3777-to-release/v1.9

@github-actions
Copy link
Contributor

The backport to release/v1.10 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-3777-to-release/v1.10 origin/release/v1.10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x a2c06eeb4719429993c82a486c94a86785161d1c

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-3777-to-release/v1.10
# Create the PR body template
PR_BODY=$(gh pr view 3777 --json body --template 'Backport a2c06eeb4719429993c82a486c94a86785161d1c from #3777{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release/v1.10] docs: ebpf-otel fixes' --body-file - --label 'type/docs' --label 'backport' --base release/v1.10 --milestone release/v1.10 --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-3777-to-release/v1.10

# Create a pull request where the `base` branch is `release/v1.10` and the `compare`/`head` branch is `backport-3777-to-release/v1.10`.

# Remove the local backport branch
git switch main
git branch -D backport-3777-to-release/v1.10

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport release/v1.10 This label will backport a merged PR to the release/v1.10 branch backport-failed type/docs Improvements for doc docs. Used by Docs team for project management

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants