Merge branch 'main' into chore/remove-redundant-test-logs

Author: lalitb

deny.toml

@@ -10,7 +10,7 @@ allow = [
 ]
 
 exceptions = [
-    { allow = ["MPL-2.0"], crate = "webpki-roots" }, # This crate is a dependency of `reqwest`.
+    { allow = ["CDLA-Permissive-2.0"], crate = "webpki-roots" }, # This crate is a dependency of `reqwest`.
     { allow = ["Unicode-3.0"], crate = "icu_collections" }, # This crate gets used transitively by `reqwest`.
     { allow = ["Unicode-3.0"], crate = "icu_locid" }, # This crate gets used transitively by `reqwest`.
     { allow = ["Unicode-3.0"], crate = "icu_locid_transform" }, # This crate gets used transitively by `reqwest`.

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

@@ -10,7 +10,7 @@
 //! The [metric semantic conventions] define a set of standardized attributes to
 //! be used in `Meter`s.
 //!
-//! [metric semantic conventions]: https://github.com/open-telemetry/semantic-conventions/tree/main/model/metric
+//! [metric semantic conventions]: https://opentelemetry.io/docs/specs/semconv/general/metrics/
 //!
 //! ## Usage
 //!

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

@@ -10,7 +10,7 @@
 //! The [resource semantic conventions] define a set of standardized attributes
 //! to be used in `Resource`s.
 //!
-//! [resource semantic conventions]: https://github.com/open-telemetry/semantic-conventions/tree/main/model/resource
+//! [resource semantic conventions]: https://opentelemetry.io/docs/specs/semconv/resource/
 //!
 //! ## Usage
 //!

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

@@ -10,7 +10,7 @@
 //! The [trace semantic conventions] define a set of standardized attributes to
 //! be used in `Span`s.
 //!
-//! [trace semantic conventions]: https://github.com/open-telemetry/semantic-conventions/tree/main/model/trace
+//! [trace semantic conventions]: https://opentelemetry.io/docs/specs/semconv/general/trace/
 //!
 //! ## Usage
 //!

opentelemetry-semantic-conventions/src/metric.rs

@@ -9,7 +9,7 @@
 //! The [metric semantic conventions] define a set of standardized attributes to
 //! be used in `Meter`s.
 //!
-//! [metric semantic conventions]: https://github.com/open-telemetry/semantic-conventions/tree/main/model/metric
+//! [metric semantic conventions]: https://opentelemetry.io/docs/specs/semconv/general/metrics/
 //!
 //! ## Usage
 //!

opentelemetry-semantic-conventions/src/resource.rs

@@ -9,7 +9,7 @@
 //! The [resource semantic conventions] define a set of standardized attributes
 //! to be used in `Resource`s.
 //!
-//! [resource semantic conventions]: https://github.com/open-telemetry/semantic-conventions/tree/main/model/resource
+//! [resource semantic conventions]: https://opentelemetry.io/docs/specs/semconv/resource/
 //!
 //! ## Usage
 //!

opentelemetry-semantic-conventions/src/trace.rs

@@ -9,7 +9,7 @@
 //! The [trace semantic conventions] define a set of standardized attributes to
 //! be used in `Span`s.
 //!
-//! [trace semantic conventions]: https://github.com/open-telemetry/semantic-conventions/tree/main/model/trace
+//! [trace semantic conventions]: https://opentelemetry.io/docs/specs/semconv/general/trace/
 //!
 //! ## Usage
 //!