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

Kinetica exporter/pr 2 metrics - updated orderedmap version to v2 #30398

Merged

Conversation

am-kinetica
Copy link
Contributor

Description: Updated orderedmap version to v2

Link to tracking Issue: 24294

Testing: Existing tests were run

Documentation: None

am-kinetica and others added 30 commits September 27, 2023 12:42
@am-kinetica am-kinetica requested a review from a team January 10, 2024 18:06
@atoulme
Copy link
Contributor

atoulme commented Jan 10, 2024

hey, this PR is out of wack. Let me see if I can help.
Do this. First get a clean main branch with latest:

git checkout main
git pull origin main

Then create a new branch

git checkout -b kinetica-exporter/PR-2-metrics-2

Now merge squash your changes into it:

git merge --squash kinetica-exporter/PR-2-metrics

Commit the changes as you normally would.
Now push your changes to this branch:

git push am-kinetica kinetica-exporter/PR-2-metrics-2:kinetica-exporter/PR-2-metrics -f

Check if that looks good on this PR.
Now reset your local branch

git checkout kinetica-exporter/PR-2-metrics
git reset --hard am-kinetica/kinetica-exporter/PR-2-metrics

Copy link
Member

Choose a reason for hiding this comment

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

We can exclude the changelog since it is a dep bump

Copy link
Contributor Author

Choose a reason for hiding this comment

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

How did this even get changed ? I didn't add anything to this file.

Copy link
Member

Choose a reason for hiding this comment

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

Probably something messed up in your branch. We delete changelog files after a release and since we did a release on Tuesday this file no longer exists in main so your branch is adding it.

@TylerHelmuth TylerHelmuth added the Skip Changelog PRs that do not require a CHANGELOG.md entry label Jan 10, 2024
@TylerHelmuth TylerHelmuth merged commit b59acdd into open-telemetry:main Jan 11, 2024
85 checks passed
@github-actions github-actions bot added this to the next release milestone Jan 11, 2024
cparkins pushed a commit to AmadeusITGroup/opentelemetry-collector-contrib that referenced this pull request Feb 1, 2024
…en-telemetry#30398)

**Description:** Updated orderedmap version to v2 

**Link to tracking Issue:** 24294

**Testing:** Existing tests were run

**Documentation:** None
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
exporter/kinetica Skip Changelog PRs that do not require a CHANGELOG.md entry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants