-
Notifications
You must be signed in to change notification settings - Fork 830
Add OTel support module and make examples standalone #1868
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
a9cb65d
Make example projects standalone (no parent POM)
zeitlinger eb58b80
add bom
zeitlinger 67e1e3e
add pom
zeitlinger 00b0456
Address PR review comments
zeitlinger f7b98b9
Replace hardcoded OTel version with $otelVersion-alpha marker
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,12 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| #MISE description="Set release version in GitHub Pages quickstart.md" | ||
| #MISE description="Set release version in all GitHub Pages docs" | ||
|
|
||
| set -euox pipefail | ||
|
|
||
| version=$(git tag -l | grep 'v' | sort | tail -1 | sed 's/v//') | ||
| marker="\$version" | ||
| sed -i "s/$marker/$version/g" docs/content/getting-started/quickstart.md | ||
| otelVersion=$(grep -oP '<otel.instrumentation.version>\K[^<]+' pom.xml | sed 's/-alpha$//') | ||
|
|
||
| find ./docs/content -name '*.md' \ | ||
| -exec sed -i "s/\$version/$version/g" {} + \ | ||
| -exec sed -i "s/\$otelVersion/$otelVersion/g" {} + |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| --- | ||
| title: OTel Support | ||
| weight: 2 | ||
| --- | ||
|
|
||
| The `prometheus-metrics-otel-support` module bundles the | ||
| OpenTelemetry SDK and the Prometheus exporter into a single | ||
| POM dependency. | ||
|
|
||
| Use this module when you want to combine OpenTelemetry | ||
| instrumentations (e.g. JVM runtime metrics) with the | ||
| Prometheus Java client on one `/metrics` endpoint. | ||
|
|
||
| ## Dependencies | ||
|
|
||
| {{< tabs "otel-support-deps" >}} | ||
| {{< tab "Gradle" >}} | ||
|
|
||
| ```groovy | ||
| implementation 'io.prometheus:prometheus-metrics-otel-support:$version' | ||
| ``` | ||
|
|
||
| {{< /tab >}} | ||
| {{< tab "Maven" >}} | ||
|
|
||
| ```xml | ||
| <dependency> | ||
| <groupId>io.prometheus</groupId> | ||
| <artifactId>prometheus-metrics-otel-support</artifactId> | ||
| <version>$version</version> | ||
| <type>pom</type> | ||
| </dependency> | ||
| ``` | ||
|
|
||
| {{< /tab >}} | ||
| {{< /tabs >}} | ||
|
|
||
| This single dependency replaces: | ||
|
|
||
| - `io.opentelemetry:opentelemetry-sdk` | ||
| - `io.opentelemetry:opentelemetry-exporter-prometheus` | ||
|
|
||
| ## Use Cases | ||
|
|
||
| See [JVM Runtime Metrics]({{< relref "jvm-runtime-metrics.md" >}}) | ||
| for a concrete example of combining OTel JVM metrics with | ||
| the Prometheus Java client. |
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
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.
Uh oh!
There was an error while loading. Please reload this page.