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.

Sign up for GitHub

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

Jump to bottom

Remove metrics from main branch #1568

Merged
merged 18 commits into from
Feb 8, 2021
Merged

Remove metrics from main branch #1568

merged 18 commits into from
Feb 8, 2021

Conversation

lzchen
Copy link
Contributor

@lzchen lzchen commented Feb 2, 2021

As part of the discussion here

@lzchen lzchen requested review from a team, ocelotl and hectorhdzg and removed request for a team February 2, 2021 23:34
@lzchen lzchen mentioned this pull request Feb 4, 2021
Merged
@lzchen lzchen changed the title [WIP] Remove metrics from main branch Remove metrics from main branch Feb 5, 2021
ocelotl
ocelotl reviewed Feb 5, 2021
View reviewed changes
Copy link
Contributor

@ocelotl ocelotl left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Disregard

codeboten
codeboten reviewed Feb 5, 2021
View reviewed changes
Copy link
Contributor

@codeboten codeboten left a comment

Choose a reason for hiding this comment

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

Thanks for doing all this work @lzchen, PR looks pretty good just a few questions i'd like answered before moving to approve.

CHANGELOG.md Outdated Show resolved Hide resolved
docs/shim/instrumentation.rst Show resolved Hide resolved
docs/getting_started/tests/test_flask.py Outdated Show resolved Hide resolved
opentelemetry-instrumentation/tests/test_run.py Show resolved Hide resolved
codeboten
codeboten approved these changes Feb 8, 2021
View reviewed changes
Copy link
Contributor

@codeboten codeboten left a comment

Choose a reason for hiding this comment

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

Thanks for addressing my comments!

@codeboten
Copy link
Contributor

Whats the plan for creating the metrics branch? are you just planning on creating the metrics branch immediately after these changes are merged and create a new change to apply these changes back?

@lzchen lzchen merged commit 24edd3d into open-telemetry:main Feb 8, 2021
@lzchen lzchen deleted the remove-metrics branch February 8, 2021 17:48
@lzchen lzchen mentioned this pull request Feb 8, 2021
Closed
lzchen added a commit that referenced this pull request Feb 23, 2021
@lzchen
Revert "Remove metrics from main branch (#1568)"
0b3fbe0 
This reverts commit 24edd3d.
ocelotl pushed a commit to ocelotl/opentelemetry-python that referenced this pull request Jun 10, 2021
@lzchen @ocelotl
Revert "Remove metrics from main branch (open-telemetry#1568)"
3a77391 
This reverts commit 24edd3d.
ocelotl pushed a commit to ocelotl/opentelemetry-python that referenced this pull request Jul 5, 2021
@lzchen @ocelotl
Revert "Remove metrics from main branch (open-telemetry#1568)"
f40955a 
This reverts commit 24edd3d.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@srikanthccv srikanthccv srikanthccv approved these changes

@ocelotl ocelotl ocelotl approved these changes

@codeboten codeboten codeboten approved these changes

@hectorhdzg hectorhdzg Awaiting requested review from hectorhdzg

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@lzchen @codeboten @ocelotl @srikanthccv