Add preliminary wasm32-unknown-unknown support

Author: brendanhay

.cargo/config.toml

@@ -1,3 +1,7 @@
 [resolver]
 # https://doc.rust-lang.org/cargo/reference/config.html#resolverincompatible-rust-versions
 incompatible-rust-versions = "fallback"
+
+[build]
+[target.'cfg(all(target_arch = "wasm32", not(target_os = "wasi")))']
+rustflags = ["--cfg", "getrandom_backend=\"wasm_js\""]

Cargo.toml

@@ -29,6 +29,7 @@ http = { version = "1.1", default-features = false, features = ["std"] }
 http-body-util = "0.1"
 hyper = { version = "1.3", default-features = false }
 hyper-util = "0.1"
+getrandom = { version = "0.3", default-features = false }
 log = "0.4.21"
 once_cell = "1.13"
 pin-project-lite = "0.2"

opentelemetry-otlp/src/exporter/http/mod.rs

@@ -4,7 +4,9 @@ use super::{
 };
 use crate::{ExportConfig, Protocol, OTEL_EXPORTER_OTLP_ENDPOINT, OTEL_EXPORTER_OTLP_HEADERS};
 use http::{HeaderName, HeaderValue, Uri};
+use opentelemetry::env;
 use opentelemetry::otel_debug;
+use opentelemetry::time::Duration;
 use opentelemetry_http::HttpClient;
 use opentelemetry_proto::transform::common::tonic::ResourceAttributesWithSchema;
 #[cfg(feature = "logs")]
@@ -17,10 +19,8 @@ use opentelemetry_sdk::logs::LogBatch;
 use opentelemetry_sdk::trace::SpanData;
 use prost::Message;
 use std::collections::HashMap;
-use std::env;
 use std::str::FromStr;
 use std::sync::{Arc, Mutex};
-use std::time::Duration;
 
 #[cfg(feature = "metrics")]
 mod metrics;
@@ -859,7 +859,7 @@ mod tests {
                 "http://localhost:4318".parse().unwrap(),
                 std::collections::HashMap::new(),
                 crate::Protocol::HttpBinary,
-                std::time::Duration::from_secs(10),
+                opentelemetry::time::Duration::from_secs(10),
                 Some(crate::Compression::Gzip),
             );
 
@@ -890,7 +890,7 @@ mod tests {
                 "http://localhost:4318".parse().unwrap(),
                 std::collections::HashMap::new(),
                 crate::Protocol::HttpBinary,
-                std::time::Duration::from_secs(10),
+                opentelemetry::time::Duration::from_secs(10),
                 Some(crate::Compression::Zstd),
             );
 
@@ -918,7 +918,7 @@ mod tests {
                 "http://localhost:4318".parse().unwrap(),
                 std::collections::HashMap::new(),
                 crate::Protocol::HttpBinary,
-                std::time::Duration::from_secs(10),
+                opentelemetry::time::Duration::from_secs(10),
                 None, // No compression
             );
 
@@ -939,7 +939,7 @@ mod tests {
                 "http://localhost:4318".parse().unwrap(),
                 std::collections::HashMap::new(),
                 crate::Protocol::HttpBinary,
-                std::time::Duration::from_secs(10),
+                opentelemetry::time::Duration::from_secs(10),
                 Some(crate::Compression::Gzip),
             );
 
@@ -961,7 +961,7 @@ mod tests {
                 "http://localhost:4318".parse().unwrap(),
                 std::collections::HashMap::new(),
                 crate::Protocol::HttpBinary,
-                std::time::Duration::from_secs(10),
+                opentelemetry::time::Duration::from_secs(10),
                 Some(crate::Compression::Zstd),
             );
 
@@ -1023,19 +1023,19 @@ mod tests {
                 "http://localhost:4318".parse().unwrap(),
                 HashMap::new(),
                 protocol,
-                std::time::Duration::from_secs(10),
+                opentelemetry::time::Duration::from_secs(10),
                 compression,
             )
         }
 
         fn create_test_span_data() -> opentelemetry_sdk::trace::SpanData {
+            use opentelemetry::time::{Duration, SystemTime};
             use opentelemetry::trace::Status;
             use opentelemetry::trace::{
                 SpanContext, SpanId, SpanKind, TraceFlags, TraceId, TraceState,
             };
             use opentelemetry_sdk::trace::{SpanData, SpanEvents, SpanLinks};
             use std::borrow::Cow;
-            use std::time::{Duration, SystemTime};
 
             let span_context = SpanContext::new(
                 TraceId::from(123),

opentelemetry-otlp/src/exporter/mod.rs

@@ -11,7 +11,7 @@ use crate::Protocol;
 use serde::{Deserialize, Serialize};
 use std::fmt::{Display, Formatter};
 use std::str::FromStr;
-use std::time::Duration;
+use opentelemetry::time::Duration;
 use thiserror::Error;
 
 /// Target to which the exporter is going to send signals, defaults to https://localhost:4317.
@@ -181,9 +181,9 @@ fn resolve_compression_from_env(
 ) -> Result<Option<Compression>, ExporterBuildError> {
     if let Some(compression) = config_compression {
         Ok(Some(compression))
-    } else if let Ok(compression) = std::env::var(signal_env_var) {
+    } else if let Ok(compression) = opentelemetry::env::var(signal_env_var) {
         Ok(Some(compression.parse::<Compression>()?))
-    } else if let Ok(compression) = std::env::var(OTEL_EXPORTER_OTLP_COMPRESSION) {
+    } else if let Ok(compression) = opentelemetry::env::var(OTEL_EXPORTER_OTLP_COMPRESSION) {
         Ok(Some(compression.parse::<Compression>()?))
     } else {
         Ok(None)
@@ -299,13 +299,13 @@ fn resolve_timeout(signal_timeout_var: &str, provided_timeout: Option<&Duration>
     // programmatic configuration overrides any value set via environment variables
     if let Some(timeout) = provided_timeout {
         *timeout
-    } else if let Some(timeout) = std::env::var(signal_timeout_var)
+    } else if let Some(timeout) = opentelemetry::env::var(signal_timeout_var)
         .ok()
         .and_then(|s| s.parse().ok())
     {
         // per signal env var is not modified
         Duration::from_millis(timeout)
-    } else if let Some(timeout) = std::env::var(OTEL_EXPORTER_OTLP_TIMEOUT)
+    } else if let Some(timeout) = opentelemetry::env::var(OTEL_EXPORTER_OTLP_TIMEOUT)
         .ok()
         .and_then(|s| s.parse().ok())
     {
@@ -397,7 +397,7 @@ mod tests {
     #[cfg(any(feature = "http-proto", feature = "http-json"))]
     #[test]
     fn export_builder_error_invalid_http_endpoint() {
-        use std::time::Duration;
+        use opentelemetry::time::Duration;
 
         use crate::{ExportConfig, LogExporter, Protocol, WithExportConfig};
 
@@ -424,7 +424,7 @@ mod tests {
     #[cfg(feature = "grpc-tonic")]
     #[tokio::test]
     async fn export_builder_error_invalid_grpc_endpoint() {
-        use std::time::Duration;
+        use opentelemetry::time::Duration;
 
         use crate::{ExportConfig, LogExporter, Protocol, WithExportConfig};
 
@@ -577,7 +577,7 @@ mod tests {
             || {
                 let timeout = super::resolve_timeout(
                     crate::OTEL_EXPORTER_OTLP_TRACES_TIMEOUT,
-                    Some(&std::time::Duration::from_millis(1000)),
+                    Some(&opentelemetry::time::Duration::from_millis(1000)),
                 );
                 assert_eq!(timeout.as_millis(), 1000);
             },

opentelemetry-otlp/src/exporter/tonic/mod.rs

@@ -1,8 +1,8 @@
-use std::env;
 use std::fmt::{Debug, Formatter};
 use std::str::FromStr;
 
 use http::{HeaderMap, HeaderName, HeaderValue};
+use opentelemetry::env;
 use opentelemetry::otel_debug;
 use tonic::codec::CompressionEncoding;
 use tonic::metadata::{KeyAndValueRef, MetadataMap};

opentelemetry-otlp/src/lib.rs

@@ -254,7 +254,7 @@
 //! use opentelemetry_otlp::WithTonicConfig;
 //! # #[cfg(any(feature = "http-proto", feature = "http-json"))]
 //! use opentelemetry_otlp::WithHttpConfig;
-//! use std::time::Duration;
+//! use opentelemetry::time::Duration;
 //! # #[cfg(feature = "grpc-tonic")]
 //! use tonic::metadata::*;
 //!

opentelemetry-otlp/src/metric.rs

@@ -21,7 +21,7 @@ use opentelemetry_sdk::metrics::{
     data::ResourceMetrics, exporter::PushMetricExporter, Temporality,
 };
 use std::fmt::{Debug, Formatter};
-use std::time::Duration;
+use opentelemetry::time::Duration;
 
 /// Target to which the exporter is going to send metrics, defaults to https://localhost:4317/v1/metrics.
 /// Learn about the relationship between this constant and default/spans/logs at
@@ -174,7 +174,7 @@ impl PushMetricExporter for MetricExporter {
         self.shutdown_with_timeout(Duration::from_secs(5))
     }
 
-    fn shutdown_with_timeout(&self, _timeout: std::time::Duration) -> OTelSdkResult {
+    fn shutdown_with_timeout(&self, _timeout: opentelemetry::time::Duration) -> OTelSdkResult {
         match &self.client {
             #[cfg(feature = "grpc-tonic")]
             SupportedTransportClient::Tonic(client) => client.shutdown(),

opentelemetry-proto/src/transform/common.rs

@@ -2,7 +2,7 @@
     feature = "gen-tonic-messages",
     any(feature = "trace", feature = "metrics", feature = "logs")
 ))]
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
+use opentelemetry::time::{Duration, SystemTime, UNIX_EPOCH};
 
 #[cfg(all(
     feature = "gen-tonic-messages",

opentelemetry-sdk/Cargo.toml

@@ -26,6 +26,9 @@ tokio = { workspace = true, default-features = false, optional = true }
 tokio-stream = { workspace = true, optional = true }
 http = { workspace = true, optional = true }
 
+[target.'cfg(all(target_arch = "wasm32", not(target_os = "wasi")))'.dependencies]
+getrandom = { workspace = true, features = ["wasm_js"] }
+
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]

opentelemetry-sdk/src/logs/batch_log_processor.rs

@@ -107,7 +107,7 @@ type LogsData = Box<(SdkLogRecord, InstrumentationScope)>;
 /// ```rust
 /// use opentelemetry_sdk::logs::{BatchLogProcessor, BatchConfigBuilder, SdkLoggerProvider};
 /// use opentelemetry::global;
-/// use std::time::Duration;
+/// use opentelemetry::time::Duration;
 /// use opentelemetry_sdk::logs::InMemoryLogExporter;
 ///
 /// let exporter = InMemoryLogExporter::default(); // Replace with an actual exporter
@@ -751,7 +751,7 @@ mod tests {
     use opentelemetry::InstrumentationScope;
     use opentelemetry::KeyValue;
     use std::sync::{Arc, Mutex};
-    use std::time::Duration;
+    use opentelemetry::time::Duration;
 
     #[test]
     fn test_default_const_values() {