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

Fix environment variable name for configuring otel traces features #1387

Merged
merged 1 commit into from
Nov 20, 2024

Conversation

bjor-joh
Copy link
Contributor

I believe this should be the correct env

@CLAassistant
Copy link

CLAassistant commented Nov 20, 2024

CLA assistant check
All committers have signed the CLA.

Copy link
Contributor

@marctc marctc left a comment

Choose a reason for hiding this comment

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

Nice catch, thanks!

Copy link
Contributor

Hello @marctc!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

Copy link

codecov bot commented Nov 20, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.03%. Comparing base (99e7f0f) to head (c8b4dd5).
Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1387      +/-   ##
==========================================
- Coverage   81.09%   81.03%   -0.07%     
==========================================
  Files         147      147              
  Lines       14745    14745              
==========================================
- Hits        11957    11948       -9     
- Misses       2205     2213       +8     
- Partials      583      584       +1     
Flag Coverage Δ
integration-test 58.76% <ø> (+0.02%) ⬆️
k8s-integration-test 60.00% <ø> (+0.09%) ⬆️
oats-test 34.18% <ø> (+0.02%) ⬆️
unittests 51.89% <ø> (-0.05%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.


🚨 Try these New Features:

Copy link
Contributor

@grcevski grcevski left a comment

Choose a reason for hiding this comment

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

Awesome, thank you!

@grcevski grcevski merged commit 66b1975 into grafana:main Nov 20, 2024
21 checks passed
@grcevski
Copy link
Contributor

Thanks for your contribution @bjor-joh!

Copy link
Contributor

The backport to release-1.6 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-1387-to-release-1.6 origin/release-1.6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 66b197574aa1f4fbce0825ba23f488e1c08c219b

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-1387-to-release-1.6
# Create the PR body template
PR_BODY=$(gh pr view 1387 --json body --template 'Backport 66b197574aa1f4fbce0825ba23f488e1c08c219b from #1387{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-1.6] Fix environment variable name for configuring otel traces features' --body-file - --label 'backport-1.6' --label 'backport-release-1.7' --label 'backport-1.7' --label 'backport-1.8' --label 'backport-release-1.8' --label 'missing-labels' --label 'backport' --base release-1.6 --milestone release-1.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-1387-to-release-1.6

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

# Remove the local backport branch
git switch main
git branch -D backport-1387-to-release-1.6

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

Successfully merging this pull request may close these issues.

4 participants