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: downgrade otel to 0.86.0-sumo-1 #3352

Merged
merged 1 commit into from
Oct 25, 2023
Merged

Conversation

swiatekm-sumo
Copy link

This is mitigates open-telemetry/opentelemetry-collector-contrib#28567.

Checklist

  • Changelog updated or skip changelog label added

@swiatekm-sumo swiatekm-sumo requested a review from a team as a code owner October 25, 2023 09:33
@github-actions github-actions bot added the documentation documentation label Oct 25, 2023
@swiatekm-sumo swiatekm-sumo merged commit 5eb480b into main Oct 25, 2023
39 checks passed
@swiatekm-sumo swiatekm-sumo deleted the fix/downgrade-otc-0860 branch October 25, 2023 09:53
@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-3352-to-release-v3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5eb480b83b6f2dc3fc2a8547b3479184d32be943
# Push it to GitHub
git push --set-upstream origin backport-3352-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-3352-to-release-v3.

@sumo-backporter
Copy link
Contributor

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

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

@sumo-backporter
Copy link
Contributor

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

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

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

2 participants