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

New Relic Micrometer Spring Legacy Updates #1635

Merged
merged 4 commits into from
Oct 30, 2019

Conversation

neiljpowell
Copy link
Contributor

@neiljpowell neiljpowell commented Oct 8, 2019

Updates for New Relic properties added in Micrometer v1.3.0 related to
spring-projects/spring-boot#18472 per @shakuzen comment

@shakuzen
Copy link
Member

Thanks for porting the changes back over here.
Could you rebase and target this at the 1.3.x branch? We'll actually be deleting the micrometer-spring-legacy module from master soon.

@shakuzen shakuzen added the spring-boot change Change is needed in Spring Boot for this issue label Oct 21, 2019
@shakuzen shakuzen added this to the 1.3.1 milestone Oct 21, 2019
@neiljpowell neiljpowell changed the base branch from master to 1.3.x October 22, 2019 01:32
@neiljpowell
Copy link
Contributor Author

@shakuzen Rebase showed no changes so I edited the target/base branch of the PR. Let me know if I need to do anything else.

@shakuzen
Copy link
Member

shakuzen commented Oct 30, 2019

Rebase showed no changes so I edited the target/base branch of the PR. Let me know if I need to do anything else.

After changing the target, there are commits and changed files added to the pull request. Just to share, the steps I take to rebase for the new target branch in this case are:

# on the branch for this pull request
# it was targeting master so make sure it has the latest
git rebase master
# move only pull request commits to 1.3.x
git rebase --onto 1.3.x master newrelic-spring-legacy
# resolve conflicts, if any

I'll go ahead and do that so this PR is unblocked.

@shakuzen shakuzen force-pushed the newrelic-spring-legacy branch from 4127e3a to 1a024e7 Compare October 30, 2019 12:45
@shakuzen shakuzen added the registry: new relic A New Relic Registry related issue label Oct 30, 2019
@shakuzen shakuzen merged commit cfe898e into micrometer-metrics:1.3.x Oct 30, 2019
@neiljpowell
Copy link
Contributor Author

@shakuzen Thank you for sharing. I have not had to do that before.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
registry: new relic A New Relic Registry related issue spring-boot change Change is needed in Spring Boot for this issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants