Skip to content

Commit 72e8371

Browse files
authored
Merge branch 'main' into cijothomas/attributeset-2
2 parents 83c5ff8 + 21bc36c commit 72e8371

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

Cargo.toml

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ members = [
77
"examples/*",
88
"stress",
99
]
10-
# Crates temporarily excluded from the workspace
11-
exclude = ["opentelemetry-prometheus"]
1210
resolver = "2"
1311

1412
[profile.bench]

opentelemetry-prometheus/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ rustdoc-args = ["--cfg", "docsrs"]
2121

2222
[dependencies]
2323
once_cell = { workspace = true }
24-
opentelemetry = { version = "0.23", path = "../opentelemetry", default-features = false, features = ["metrics"] }
25-
opentelemetry_sdk = { version = "0.23", path = "../opentelemetry-sdk", default-features = false, features = ["metrics"] }
24+
opentelemetry = { version = "0.23", default-features = false, features = ["metrics"] }
25+
opentelemetry_sdk = { version = "0.23", default-features = false, features = ["metrics"] }
2626
prometheus = "0.13"
2727
protobuf = "2.14"
2828

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

opentelemetry-prometheus/README.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44

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

7-
[`Prometheus`] integration for applications instrumented with [`OpenTelemetry`].
7+
[`Prometheus`] integration for applications instrumented with [`OpenTelemetry`].
8+
9+
**The development of prometheus exporter has halt until the Opentelemetry metrics API and SDK reaches 1.0. Current
10+
implementation is based on Opentelemetry API and SDK 0.23**.
811

912
[![Crates.io: opentelemetry-prometheus](https://img.shields.io/crates/v/opentelemetry-prometheus.svg)](https://crates.io/crates/opentelemetry-prometheus)
1013
[![Documentation](https://docs.rs/opentelemetry-prometheus/badge.svg)](https://docs.rs/opentelemetry-prometheus)

opentelemetry-prometheus/src/lib.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
//! An OpenTelemetry exporter for [Prometheus] metrics.
22
//!
3+
//! <div class="warning"> The development of prometheus exporter has halt until the Opentelemetry metrics API and SDK reaches 1.0. Current
4+
//! implementation is based on Opentelemetry API and SDK 0.23.</div>
5+
//!
36
//! [Prometheus]: https://prometheus.io
47
//!
58
//! ```
@@ -17,7 +20,7 @@
1720
//! .with_registry(registry.clone())
1821
//! .build()?;
1922
//!
20-
//! // set up a meter meter to create instruments
23+
//! // set up a meter to create instruments
2124
//! let provider = SdkMeterProvider::builder().with_reader(exporter).build();
2225
//! let meter = provider.meter("my-app");
2326
//!

scripts/lint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if rustup component add clippy; then
1616
"opentelemetry-appender-log"
1717
"opentelemetry-appender-tracing"
1818
"opentelemetry-otlp"
19-
# "opentelemetry-prometheus" - temporarily exlude Prometheus from CI.
19+
"opentelemetry-prometheus"
2020
"opentelemetry-proto"
2121
"opentelemetry-sdk"
2222
"opentelemetry-semantic-conventions"

0 commit comments

Comments
 (0)