receiver/prometheus: add ToMetricPdata method #3695
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
odeke-em
force-pushed
the
receiver-prometheus-addPdata.ToMetric
branch
2 times, most recently
from
fbf3759
to
6addfa5
Compare
odeke-em
force-pushed
the
receiver-prometheus-addPdata.ToMetric
branch
2 times, most recently
from
b06d71d
to
e8c0b21
Compare
odeke-em
added a commit
to orijtech/opentelemetry-collector
that referenced
this pull request
Jul 30, 2021
Wire up and use the direct Prometheus->Pdata conversion end to end. With this change the receiver will no longer need OpenCensus. This change will involve more follow-ups that just migrate over the tests, because we don't want a super bloated/massive PR. Fixes open-telemetry#3691 Depends on PR open-telemetry#3694 Depends on PR open-telemetry#3695
odeke-em
force-pushed
the
receiver-prometheus-addPdata.ToMetric
branch
from
e8c0b21
to
0b8fd4a
Compare
odeke-em
added a commit
to orijtech/opentelemetry-collector
that referenced
this pull request
Jul 30, 2021
Wire up and use the direct Prometheus->Pdata conversion end to end. With this change the receiver will no longer need OpenCensus. This change will involve more follow-ups that just migrate over the tests, because we don't want a super bloated/massive PR. Fixes open-telemetry#3691 Depends on PR open-telemetry#3694 Depends on PR open-telemetry#3695
odeke-em
force-pushed
the
receiver-prometheus-addPdata.ToMetric
branch
from
0b8fd4a
to
9e1cef7
Compare
|
@Aneurysm9 @rakyll please review. |
odeke-em
added a commit
to orijtech/opentelemetry-collector
that referenced
this pull request
Jul 30, 2021
Wire up and use the direct Prometheus->Pdata conversion end to end. With this change the receiver will no longer need OpenCensus. This change will involve more follow-ups that just migrate over the tests, because we don't want a super bloated/massive PR. Fixes open-telemetry#3691 Depends on PR open-telemetry#3694 Depends on PR open-telemetry#3695
Aneurysm9
approved these changes
Jul 30, 2021
| } | ||
| pointCount = sdpL.Len() | ||
|
|
||
| default: |
There was a problem hiding this comment.
This is missing a case for counters, but that seems to be covered in #3741.
There was a problem hiding this comment.
Indeed, I added that case in the other PR but I've brought it in, please take a look again. Thank you @Aneurysm9!
odeke-em
added a commit
to orijtech/opentelemetry-collector
that referenced
this pull request
Jul 31, 2021
Wire up and use the direct Prometheus->Pdata conversion end to end. With this change the receiver will no longer need OpenCensus. This change will involve more follow-ups that just migrate over the tests, because we don't want a super bloated/massive PR. Fixes open-telemetry#3691 Depends on PR open-telemetry#3694 Depends on PR open-telemetry#3695
|
Please rebase |
odeke-em
force-pushed
the
receiver-prometheus-addPdata.ToMetric
branch
from
9e1cef7
to
d8b80e8
Compare
This change wires together the logic to convert the pdata converters into a method ToMetricPdata that appends converted metrics. The next change or two, will then hook everything up directly and will allow us to delete all the prior code!! Updates #3137 Updates PR open-telemetry#3674 Requires PR open-telemetry#3694 Updates open-telemetry#3691
odeke-em
force-pushed
the
receiver-prometheus-addPdata.ToMetric
branch
from
d8b80e8
to
8e005a1
Compare
Rebase completed, thank you and please take another look @bogdandrutu @tigrannajaryan. |
|
Per @Aneurysm9 approval, will merge this :) Rules of the reviewer: you are now the maintainer :) |
odeke-em
added a commit
to orijtech/opentelemetry-collector
that referenced
this pull request
Aug 4, 2021
Wire up and use the direct Prometheus->Pdata conversion end to end. With this change the receiver will no longer need OpenCensus. This change will involve more follow-ups that just migrate over the tests, because we don't want a super bloated/massive PR. Fixes open-telemetry#3691 Depends on PR open-telemetry#3694 Depends on PR open-telemetry#3695
odeke-em
added a commit
to orijtech/opentelemetry-collector
that referenced
this pull request
Aug 4, 2021
Wire up and use the direct Prometheus->Pdata conversion end to end. With this change the receiver will no longer need OpenCensus. This change will involve more follow-ups that just migrate over the tests, because we don't want a super bloated/massive PR. Fixes open-telemetry#3691 Depends on PR open-telemetry#3694 Depends on PR open-telemetry#3695
odeke-em
added a commit
to orijtech/opentelemetry-collector
that referenced
this pull request
Aug 12, 2021
Wire up and use the direct Prometheus->Pdata conversion end to end. With this change the receiver will no longer need OpenCensus. This change will involve more follow-ups that just migrate over the tests, because we don't want a super bloated/massive PR. Fixes open-telemetry#3691 Depends on PR open-telemetry#3694 Depends on PR open-telemetry#3695
odeke-em
added a commit
to orijtech/opentelemetry-collector
that referenced
this pull request
Aug 17, 2021
Wire up and use the direct Prometheus->Pdata conversion end to end. With this change the receiver will no longer need OpenCensus. This change will involve more follow-ups that just migrate over the tests, because we don't want a super bloated/massive PR. Fixes open-telemetry#3691 Depends on PR open-telemetry#3694 Depends on PR open-telemetry#3695
odeke-em
added a commit
to orijtech/opentelemetry-collector-contrib
that referenced
this pull request
Sep 21, 2021
…thout OpenCensus Wire up and use the direct Prometheus->Pdata conversion end to end. With this change the receiver will no longer need OpenCensus. This change will involve more follow-ups that just migrate over the tests, because we don't want a super bloated/massive PR. Fixes #4892 Depends on PR open-telemetry/opentelemetry-collector#3694 Depends on PR open-telemetry/opentelemetry-collector#3695
bogdandrutu
pushed a commit
to open-telemetry/opentelemetry-collector-contrib
that referenced
this pull request
Dec 8, 2021
* receiver/prometheus: roundtrip Prometheus->Pdata direct conversion without OpenCensus Wire up and use the direct Prometheus->Pdata conversion end to end. With this change the receiver will no longer need OpenCensus. This change will involve more follow-ups that just migrate over the tests, because we don't want a super bloated/massive PR. Fixes #4892 Depends on PR open-telemetry/opentelemetry-collector#3694 Depends on PR open-telemetry/opentelemetry-collector#3695 * Retrofit top level package for pdata comparisons * Reuse for pdata metrics creators from PR #5231 * Shed all in-code direct references to OpenCensus * receiver/prometheus: fix tests Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * receiver/prometheus: buffer metrics in builder to avoid issues with out-of-order exposition Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * receiver/prometheus: restore prom->OC->pdata pipeline Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * receiver/prometheus: add feature gate to control whether to use OpenCensus or pdata directly Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * receiver/prometheus: localize metrics test helpers Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * receiver/prometheus: store metrics in a map in metricbuilder to avoid issues with out-of-order exposition data Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * receiver/prometheus: run component tests against both OC and pdata export paths Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * receiver/prometheus: ensure OC metrics builder tests are deterministic Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * receiver/prometheus: restore replace directive to ensure use of local copy of opencensus translator during development Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * receiver/prometheus: fix lint issues Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * receiver/prometheus: fix lint issues Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * make porto Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * receiver/prometheus: run e2e tests in parallel to avoid doubling test suite runtime Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * Revert "receiver/prometheus: run e2e tests in parallel to avoid doubling test suite runtime" This reverts commit 7e04b44. * receiver/prometheus: address PR feedback Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * receiver/prometheus: ensure test helper can extract timestamp from metrics of any type Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * receiver/prometheus: tests should not be expecting empty label values Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * make porto Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * receiver/prometheus: remove gauge histogram pdata adjustment tests Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * receiver/prometheus: remove unused gauge histogram data generator helper Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * Fix lint errors Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> * receiver/prometheus: Add comments detailing use of locks in metrics adjuster. Signed-off-by: Anthony J Mirabella <a9@aneurysm9.com> Co-authored-by: Emmanuel T Odeke <emmanuel@orijtech.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change wires together the logic to convert
the pdata converters into a method ToMetricPdata
that appends converted metrics. The next change or two,
will then hook everything up directly and will
allow us to delete all the prior code!!
Updates #3137
Updates PR #3674
Requires PR #3694
Updates #3691