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

[DOC] Update Configure the client and span profiles doc #3028

Merged

Conversation

knylander-grafana
Copy link
Contributor

@knylander-grafana knylander-grafana commented Feb 27, 2024

This PR does two things:

Fixes #2771

@knylander-grafana knylander-grafana added the type/docs Improvements for doc docs. Used by Docs team for project management label Feb 27, 2024
@knylander-grafana knylander-grafana self-assigned this Feb 27, 2024
@knylander-grafana knylander-grafana changed the title [DOC] Update Configure the client page [DOC] Update Configure the client and span profiles doc Feb 27, 2024
2. Optional: Choose any tags to use in the query. If left blank, the default values of service.name and service.namespace are used.

The tags you configure must be present in the spans attributes or resources for a trace to profiles span link to appear. You can optionally configure a new name for the tag. This is useful for example if the tag has dots in the name and the target data source doesn’t allow using dots in labels. In that case you can for example remap service.name to service_name.
## View the span profiles in Grafana or Grafana Cloud

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We have the full content for Traces to profiles in the Pyroscope documentation. I removed the content from the Traces to profiles and linked to the page instead.

Doc is here: https://grafana.com/docs/pyroscope/next/view-and-analyze-profile-data/profile-tracing/traces-to-profiles/

We can make it live. It's currently in /next. Not sure why it isn't live.

@@ -7,38 +7,52 @@ weight: 100

# Span profiles with Traces to profiles for Go

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The blog post about span profiles has some great content, so I used a few of the paragraphs for the introduction and linked to the blog post.

Blog post: https://grafana.com/blog/2024/02/06/combining-tracing-and-profiling-for-enhanced-observability-introducing-span-profiles/

Copy link
Collaborator

@kolesnikovae kolesnikovae left a comment

Choose a reason for hiding this comment

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

LGTM

@knylander-grafana
Copy link
Contributor Author

@kolesnikovae Thank you for the review! Should the wording for your comment above be application-wide or system-wide?

@knylander-grafana knylander-grafana merged commit 87423e4 into grafana:main Feb 29, 2024
16 of 19 checks passed
@knylander-grafana knylander-grafana deleted the 2771-update-client-page branch February 29, 2024 15:49
@knylander-grafana knylander-grafana added the backport release/v1.4 This label will backport a merged PR to the release/v1.4 branch label Feb 29, 2024
Copy link
Contributor

The backport to release/v1.4 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-3028-to-release/v1.4 origin/release/v1.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 87423e4c3f2c7a21323d8e9290220c382350c5fb

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-3028-to-release/v1.4
# Create the PR body template
PR_BODY=$(gh pr view 3028 --json body --template 'Backport 87423e4c3f2c7a21323d8e9290220c382350c5fb from #3028{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release/v1.4] [DOC] Update Configure the client and span profiles doc" --body-file - --label "type/docs" --label "backport" --base release/v1.4 --milestone release/v1.4 --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-3028-to-release/v1.4

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

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

knylander-grafana added a commit that referenced this pull request Feb 29, 2024
* Update Configure the client page

* Update Span Profiles doc

* Apply suggestions from code review

* fix broken link from validator

* Update _index.md

* Update docs/sources/configure-client/go-span-profiles.md

(cherry picked from commit 87423e4)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release/v1.4 This label will backport a merged PR to the release/v1.4 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.

[DOC] Update the Configure the client page in Pyroscope doc
2 participants