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 outdated java span profile information #3339

Merged
merged 3 commits into from
Jun 21, 2024

Conversation

simonswine
Copy link
Contributor

@simonswine simonswine commented Jun 5, 2024

I had been going through those docs with one of our customers, I think the code blocks are very confusing and I think settings should be set using environment variables.

I do hope I did not misunderstand anything.

@simonswine simonswine added type/docs Improvements for doc docs. Used by Docs team for project management backport release/v1.6 This label will backport a merged PR to the release/v1.6 branch labels Jun 5, 2024
Copy link
Contributor

github-actions bot commented Jun 5, 2024

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

@simonswine simonswine marked this pull request as ready for review June 5, 2024 18:32
@simonswine simonswine requested review from a team as code owners June 5, 2024 18:32
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.

One small question, but otherwise, looks good. Thank you for updating the docs!

@simonswine simonswine enabled auto-merge (squash) June 21, 2024 13:46
@simonswine simonswine disabled auto-merge June 21, 2024 13:48
…ofiles.md

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
@simonswine simonswine enabled auto-merge (squash) June 21, 2024 13:48
@simonswine simonswine merged commit fa05d6b into main Jun 21, 2024
16 checks passed
@simonswine simonswine deleted the 20240605_improve-java-span-docs branch June 21, 2024 13:55
github-actions bot pushed a commit that referenced this pull request Jun 21, 2024
* Update outdated java span profile information

* Remove first person and uppercase docker

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

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

---------

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
(cherry picked from commit fa05d6b)
Copy link
Contributor

The backport to release/v1.6 failed:

Validation Failed: "Could not resolve to a node with the global id of 'T_kwDOAG3Mbc4AczmP'."

To backport manually, run these commands in your terminal:

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

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-3339-to-release/v1.6
# Create the PR body template
PR_BODY=$(gh pr view 3339 --json body --template 'Backport fa05d6bd59c1db5b09ae5e211723ad7d2fb09b70 from #3339{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release/v1.6] Update outdated java span profile information' --body-file - --label 'type/docs' --label 'backport' --base release/v1.6 --milestone release/v1.6 --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-3339-to-release/v1.6

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

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

simonswine added a commit that referenced this pull request Jun 21, 2024
* Update outdated java span profile information

* Remove first person and uppercase docker

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

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>

---------

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
(cherry picked from commit fa05d6b)

Co-authored-by: Christian Simon <simon@swine.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release/v1.6 This label will backport a merged PR to the release/v1.6 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