-
Notifications
You must be signed in to change notification settings - Fork 972
Add Prometheus translation strategy support #8346
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
Draft
zeitlinger
wants to merge
10
commits into
open-telemetry:main
Choose a base branch
from
zeitlinger:codex/prometheus-translation-strategy
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
1ab1fc2
Add Prometheus translation strategy support
zeitlinger 2cc649c
Simplify Prometheus translation strategy mapping
zeitlinger 6986009
Restrict Prometheus strategy parsing to declared values
zeitlinger ae83c7e
Align Prometheus label translation
zeitlinger 6f1f18f
Document Prometheus label reservation
zeitlinger 7dfbab2
Clarify Prometheus translation ownership
zeitlinger 1ad3600
Own Prometheus name translation
zeitlinger c59b24d
Fix Prometheus test checkstyle
zeitlinger 671e437
Address Prometheus translation review comments
zeitlinger 957e2e7
Address Jack's Prometheus translation review nits
zeitlinger File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
344 changes: 274 additions & 70 deletions
344
...ometheus/src/main/java/io/opentelemetry/exporter/prometheus/Otel2PrometheusConverter.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
33 changes: 33 additions & 0 deletions
33
...rs/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/TranslationStrategy.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * Copyright The OpenTelemetry Authors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package io.opentelemetry.exporter.prometheus; | ||
|
|
||
| /** | ||
| * Controls how OpenTelemetry metric and label names are translated to Prometheus format. | ||
| * | ||
| * @see <a | ||
| * href="https://opentelemetry.io/docs/specs/otel/metrics/sdk_exporters/prometheus/">Prometheus | ||
| * exporter configuration</a> | ||
| */ | ||
| public enum TranslationStrategy { | ||
| /** | ||
| * Default. Non-standard characters are converted to underscores, and type / unit suffixes are | ||
| * attached. | ||
| */ | ||
| UNDERSCORE_ESCAPING_WITH_SUFFIXES, | ||
|
|
||
| /** | ||
| * Non-standard characters are converted to underscores, but type / unit suffixes are not attached | ||
| * by the exporter. | ||
| */ | ||
| UNDERSCORE_ESCAPING_WITHOUT_SUFFIXES, | ||
|
|
||
| /** UTF-8 metric and label names are preserved, while type / unit suffixes are still attached. */ | ||
| NO_UTF8_ESCAPING_WITH_SUFFIXES, | ||
|
|
||
| /** Metric and label names are passed through without translation. */ | ||
| NO_TRANSLATION; | ||
| } |
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Question: Based on the "Interaction with Translation Strategy" spec, I was expecting to see some content negotiation, basically reading accept headers somewhere.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
let's park this until open-telemetry/opentelemetry-specification#5062 is resolved.