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

chore: update OpenTelemetry Collector to v0.90.1-sumo-0 #3438

Merged
merged 1 commit into from Dec 11, 2023

Conversation

sumo-drosiek
Copy link
Contributor

Checklist

  • Changelog updated or skip changelog label added
  • Documentation updated
  • Template tests added for new features
  • Integration tests added or modified for major features

@sumo-drosiek sumo-drosiek requested a review from a team as a code owner December 11, 2023 14:58
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
@sumo-drosiek sumo-drosiek merged commit f1ef566 into main Dec 11, 2023
34 checks passed
@sumo-drosiek sumo-drosiek deleted the drosiek-bump-otelcol branch December 11, 2023 15:24
@sumo-backporter
Copy link
Contributor

The backport to release-v3 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 working tree
git worktree add .worktrees/backport-release-v3 release-v3
# Navigate to the new working tree
cd .worktrees/backport-release-v3
# Create a new branch
git switch --create backport-3438-to-release-v3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 f1ef566449b31e04f4e5467af6938d80fa23a993
# Push it to GitHub
git push --set-upstream origin backport-3438-to-release-v3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-v3

Then, create a pull request where the base branch is release-v3 and the compare/head branch is backport-3438-to-release-v3.

sumo-backporter bot pushed a commit that referenced this pull request Dec 11, 2023
Signed-off-by: Dominik Rosiek <drosiek@sumologic.com>
(cherry picked from commit f1ef566)
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.

None yet

3 participants