Skip to content

Commit a64b611

Browse files
authored
Merge branch 'main' into cijothomas/doc-2
2 parents 650caeb + 9a85ce1 commit a64b611

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

opentelemetry-semantic-conventions/scripts/templates/registry/rust/metric.rs.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
//! .u64_histogram(semconv::metric::HTTP_SERVER_REQUEST_DURATION)
2727
//! .with_unit("By")
2828
//! .with_description("Duration of HTTP server requests.")
29-
//! .init();
29+
//! .build();
3030
//! ```
3131

3232
{% for root_ns in ctx %}

opentelemetry-semantic-conventions/scripts/templates/registry/rust/resource.rs.j2

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
//! let _tracer = TracerProvider::builder()
2323
//! .with_config(config().with_resource(Resource::new(vec![
2424
//! KeyValue::new(semconv::resource::SERVICE_NAME, "my-service"),
25-
//! KeyValue::new(semconv::resource::SERVICE_NAMESPACE, "my-namespace"),
2625
//! ])))
2726
//! .build();
2827
//! ```

opentelemetry-semantic-conventions/src/resource.rs

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
//! let _tracer = TracerProvider::builder()
2222
//! .with_config(config().with_resource(Resource::new(vec![
2323
//! KeyValue::new(semconv::resource::SERVICE_NAME, "my-service"),
24-
//! KeyValue::new(semconv::resource::SERVICE_NAMESPACE, "my-namespace"),
2524
//! ])))
2625
//! .build();
2726
//! ```

stress/Cargo.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ rand = { version = "0.8.4", features = ["small_rng"] }
5050
tracing = { workspace = true, features = ["std"]}
5151
tracing-subscriber = { workspace = true, features = ["registry", "std"] }
5252
num-format = "0.4.4"
53-
sysinfo = { version = "0.30.12", optional = true }
53+
sysinfo = { version = "0.32", optional = true }
54+
libc = "=0.2.164" # https://github.com/GuillaumeGomez/sysinfo/issues/1392
5455

5556
[features]
56-
stats = ["sysinfo"]
57+
stats = ["sysinfo"]

0 commit comments

Comments
 (0)