From c2c1d0a010e1eb030805798a33e143838fb0b457 Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Mon, 13 May 2024 07:51:30 -0700 Subject: [PATCH 1/4] Minor clarifications to docs for log module --- opentelemetry/src/lib.rs | 10 ++++++++++ opentelemetry/src/logs/mod.rs | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/opentelemetry/src/lib.rs b/opentelemetry/src/lib.rs index 2b61b62602..11e8ffa3d9 100644 --- a/opentelemetry/src/lib.rs +++ b/opentelemetry/src/lib.rs @@ -88,6 +88,16 @@ //! See the [`metrics`] module docs for more information on creating and //! managing instruments. //! +//! +//! //! # Logs +//! +//! The [`logs`] module contains the Logs Bridge API. It is not intended to be +//! called by application developers directly. It is provided for logging +//! library authors to build log appenders, that bridges existing logging +//! systems with OpenTelemetry. OpenTelemetry. Bridges for `log` and `tracing` +//! libraries are provided via the `opentelemetry-log` and +//! `tracing-opentelemetry` crates. +//! //! ## Crate Feature Flags //! //! The following core crate feature flags are available: diff --git a/opentelemetry/src/logs/mod.rs b/opentelemetry/src/logs/mod.rs index e061bf2400..f0bbe0d660 100644 --- a/opentelemetry/src/logs/mod.rs +++ b/opentelemetry/src/logs/mod.rs @@ -1,6 +1,7 @@ //! # OpenTelemetry Logs Bridge API -/// This API is not intended to be called by application developers directly. It -/// is provided for logging library authors to build log appenders. +/// This API is not intended to be called by application developers directly. +/// It is provided for logging library authors to build log appenders, that +/// bridges existing logging systems with OpenTelemetry. use crate::ExportError; use std::{sync::PoisonError, time::Duration}; From 97c0f2ded317e809384616bc8bbb4692fd8afe92 Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Mon, 13 May 2024 09:06:42 -0700 Subject: [PATCH 2/4] more cleanups --- opentelemetry/src/lib.rs | 62 +++++++++------------------------------- 1 file changed, 13 insertions(+), 49 deletions(-) diff --git a/opentelemetry/src/lib.rs b/opentelemetry/src/lib.rs index 11e8ffa3d9..c71cf26887 100644 --- a/opentelemetry/src/lib.rs +++ b/opentelemetry/src/lib.rs @@ -116,74 +116,38 @@ //! //! In addition to `opentelemetry`, the [`open-telemetry/opentelemetry-rust`] //! repository contains several additional crates designed to be used with the -//! `opentelemetry` ecosystem. This includes a collection of trace -//! `SpanExporter` and metrics pull and push controller implementations, as well -//! as utility and adapter crates to assist in propagating state and +//! `opentelemetry` ecosystem. This includes exporters, samplers, as well as +//! utility and adapter crates to assist in propagating context and //! instrumenting applications. //! //! In particular, the following crates are likely to be of interest: //! -//! - [`opentelemetry_sdk`] provides the SDK used to configure providers. +//! - [`opentelemetry_sdk`] provides the OpenTelemetry SDK used to configure providers. //! - [`opentelemetry-http`] provides an interface for injecting and extracting //! trace information from [`http`] headers. -//! - [`opentelemetry-jaeger`] provides a pipeline and exporter for sending -//! trace information to [`Jaeger`]. -//! - [`opentelemetry-otlp`] exporter for sending trace and metric data in the -//! OTLP format to the OpenTelemetry collector. +//! - [`opentelemetry-otlp`] exporter for sending telemetry in the +//! OTLP format. //! - [`opentelemetry-prometheus`] provides a pipeline and exporter for sending //! metrics information to [`Prometheus`]. //! - [`opentelemetry-zipkin`] provides a pipeline and exporter for sending //! trace information to [`Zipkin`]. -//! - [`opentelemetry-datadog`] provides additional exporters to [`Datadog`]. -//! - [`opentelemetry-aws`] provides unofficial propagators for AWS X-ray. -//! - [`opentelemetry-contrib`] provides additional exporters and propagators that are -//! experimental. -//! - [`opentelemetry-semantic-conventions`] provides standard names and -//! semantic otel conventions. -//! - [`opentelemetry-stackdriver`] provides an exporter for Google's [Cloud Trace] -//! (which used to be called StackDriver). -//! -//! Additionally, there are also several third-party crates which are not -//! maintained by the `opentelemetry` project. These include: -//! -//! - [`tracing-opentelemetry`] provides integration for applications -//! instrumented using the [`tracing`] API and ecosystem. -//! - [`actix-web-opentelemetry`] provides integration for the [`actix-web`] web -//! server and ecosystem. -//! - [`opentelemetry-application-insights`] provides an unofficial [Azure -//! Application Insights] exporter. -//! - [`opentelemetry-tide`] provides integration for the [`Tide`] web server -//! and ecosystem. -//! -//! If you're the maintainer of an `opentelemetry` ecosystem crate not listed -//! above, please let us know! We'd love to add your project to the list! -//! -//! [`actix-web-opentelemetry`]: https://crates.io/crates/actix-web-opentelemetry -//! [`actix-web`]: https://crates.io/crates/actix-web -//! [`Datadog`]: https://www.datadoghq.com +//! +//! In addition, there are several other useful crates in the [OTel Rust +//! Contrib +//! repo](https://github.com/open-telemetry/opentelemetry-rust-contrib). A lot +//! of crates maintained outside OpenTelemetry owned repos can be found in the +//! [OpenTelemetry +//! Registry](https://opentelemetry.io/ecosystem/registry/?language=rust). +//! //! [`http`]: https://crates.io/crates/http -//! [`Jaeger`]: https://www.jaegertracing.io //! [`open-telemetry/opentelemetry-rust`]: https://github.com/open-telemetry/opentelemetry-rust //! [`opentelemetry_sdk`]: https://crates.io/crates/opentelemetry_sdk -//! [`opentelemetry-application-insights`]: https://crates.io/crates/opentelemetry-application-insights -//! [`opentelemetry-aws`]: https://crates.io/crates/opentelemetry-aws -//! [`opentelemetry-contrib`]: https://crates.io/crates/opentelemetry-contrib -//! [`opentelemetry-datadog`]: https://crates.io/crates/opentelemetry-datadog //! [`opentelemetry-http`]: https://crates.io/crates/opentelemetry-http -//! [`opentelemetry-jaeger`]: https://crates.io/crates/opentelemetry-jaeger //! [`opentelemetry-otlp`]: https://crates.io/crates/opentelemetry-otlp //! [`opentelemetry-prometheus`]: https://crates.io/crates/opentelemetry-prometheus -//! [`opentelemetry-semantic-conventions`]: https://crates.io/crates/opentelemetry-semantic-conventions -//! [`opentelemetry-stackdriver`]: https://crates.io/crates/opentelemetry-stackdriver -//! [`opentelemetry-tide`]: https://crates.io/crates/opentelemetry-tide //! [`opentelemetry-zipkin`]: https://crates.io/crates/opentelemetry-zipkin //! [`Prometheus`]: https://prometheus.io -//! [`Tide`]: https://crates.io/crates/tide -//! [`tracing-opentelemetry`]: https://crates.io/crates/tracing-opentelemetry -//! [`tracing`]: https://crates.io/crates/tracing //! [`Zipkin`]: https://zipkin.io -//! [Azure Application Insights]: https://docs.microsoft.com/en-us/azure/azure-monitor/app/app-insights-overview -//! [Cloud Trace]: https://cloud.google.com/trace/ //! //! ## Supported Rust Versions //! From f2d279365340a2b08132bbced903bb086f6fa286 Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Mon, 13 May 2024 09:15:09 -0700 Subject: [PATCH 3/4] fix comments --- opentelemetry/src/lib.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/opentelemetry/src/lib.rs b/opentelemetry/src/lib.rs index c71cf26887..9f37e6388e 100644 --- a/opentelemetry/src/lib.rs +++ b/opentelemetry/src/lib.rs @@ -88,16 +88,17 @@ //! See the [`metrics`] module docs for more information on creating and //! managing instruments. //! -//! +//! //! //! # Logs //! //! The [`logs`] module contains the Logs Bridge API. It is not intended to be //! called by application developers directly. It is provided for logging //! library authors to build log appenders, that bridges existing logging -//! systems with OpenTelemetry. OpenTelemetry. Bridges for `log` and `tracing` -//! libraries are provided via the `opentelemetry-log` and -//! `tracing-opentelemetry` crates. -//! +//! systems with OpenTelemetry. OpenTelemetry. Bridges for +//! [`log`](https://crates.io/crates/log) and +//! [`tracing`](https://crates.io/crates/tracing) libraries are provided via the +//! `opentelemetry-log` and `tracing-opentelemetry` crates. +//! //! ## Crate Feature Flags //! //! The following core crate feature flags are available: From 9acd9ba35906960e4659ee85bb9fea46f28082ee Mon Sep 17 00:00:00 2001 From: Cijo Thomas Date: Mon, 13 May 2024 09:21:51 -0700 Subject: [PATCH 4/4] really fix this time --- opentelemetry/src/lib.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/opentelemetry/src/lib.rs b/opentelemetry/src/lib.rs index 9f37e6388e..d1283e3f09 100644 --- a/opentelemetry/src/lib.rs +++ b/opentelemetry/src/lib.rs @@ -94,10 +94,14 @@ //! The [`logs`] module contains the Logs Bridge API. It is not intended to be //! called by application developers directly. It is provided for logging //! library authors to build log appenders, that bridges existing logging -//! systems with OpenTelemetry. OpenTelemetry. Bridges for +//! systems with OpenTelemetry. Bridges for //! [`log`](https://crates.io/crates/log) and -//! [`tracing`](https://crates.io/crates/tracing) libraries are provided via the -//! `opentelemetry-log` and `tracing-opentelemetry` crates. +//! [`tracing`](https://crates.io/crates/tracing) libraries are provided via +//! the +//! [`opentelemetry-appender-log`](https://crates.io/crates/opentelemetry-appender-log) +//! and +//! [`opentelemetry-appender-tracing`](https://crates.io/crates/opentelemetry-appender-tracing) +//! crates. //! //! ## Crate Feature Flags //!