Skip to content

Commit

Permalink
chore: add prometheus back with API and SDK pinned at 0.23 (open-tele…
Browse files Browse the repository at this point in the history
  • Loading branch information
TommyCpp authored May 21, 2024
1 parent 66b00d6 commit 21bc36c
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ members = [
"examples/*",
"stress",
]
# Crates temporarily excluded from the workspace
exclude = ["opentelemetry-prometheus"]
resolver = "2"

[profile.bench]
Expand Down
6 changes: 3 additions & 3 deletions opentelemetry-prometheus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ rustdoc-args = ["--cfg", "docsrs"]

[dependencies]
once_cell = { workspace = true }
opentelemetry = { version = "0.23", path = "../opentelemetry", default-features = false, features = ["metrics"] }
opentelemetry_sdk = { version = "0.23", path = "../opentelemetry-sdk", default-features = false, features = ["metrics"] }
opentelemetry = { version = "0.23", default-features = false, features = ["metrics"] }
opentelemetry_sdk = { version = "0.23", default-features = false, features = ["metrics"] }
prometheus = "0.13"
protobuf = "2.14"

[dev-dependencies]
opentelemetry-semantic-conventions = { path = "../opentelemetry-semantic-conventions" }
opentelemetry-semantic-conventions = { version = "0.15" }
hyper = { workspace = true, features = ["full"] }
tokio = { workspace = true, features = ["full"] }

Expand Down
5 changes: 4 additions & 1 deletion opentelemetry-prometheus/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@

[splash]: https://raw.githubusercontent.com/open-telemetry/opentelemetry-rust/main/assets/logo-text.png

[`Prometheus`] integration for applications instrumented with [`OpenTelemetry`].
[`Prometheus`] integration for applications instrumented with [`OpenTelemetry`].

**The development of prometheus exporter has halt until the Opentelemetry metrics API and SDK reaches 1.0. Current
implementation is based on Opentelemetry API and SDK 0.23**.

[![Crates.io: opentelemetry-prometheus](https://img.shields.io/crates/v/opentelemetry-prometheus.svg)](https://crates.io/crates/opentelemetry-prometheus)
[![Documentation](https://docs.rs/opentelemetry-prometheus/badge.svg)](https://docs.rs/opentelemetry-prometheus)
Expand Down
5 changes: 4 additions & 1 deletion opentelemetry-prometheus/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
//! An OpenTelemetry exporter for [Prometheus] metrics.
//!
//! <div class="warning"> The development of prometheus exporter has halt until the Opentelemetry metrics API and SDK reaches 1.0. Current
//! implementation is based on Opentelemetry API and SDK 0.23.</div>
//!
//! [Prometheus]: https://prometheus.io
//!
//! ```
Expand All @@ -17,7 +20,7 @@
//! .with_registry(registry.clone())
//! .build()?;
//!
//! // set up a meter meter to create instruments
//! // set up a meter to create instruments
//! let provider = SdkMeterProvider::builder().with_reader(exporter).build();
//! let meter = provider.meter("my-app");
//!
Expand Down
2 changes: 1 addition & 1 deletion scripts/lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if rustup component add clippy; then
"opentelemetry-appender-log"
"opentelemetry-appender-tracing"
"opentelemetry-otlp"
# "opentelemetry-prometheus" - temporarily exlude Prometheus from CI.
"opentelemetry-prometheus"
"opentelemetry-proto"
"opentelemetry-sdk"
"opentelemetry-semantic-conventions"
Expand Down

0 comments on commit 21bc36c

Please sign in to comment.