Merge branch 'main' into feat/add-resource-builder

lalitb · web-flow · commit 093afe261611 · 2024-12-13T00:09:29.000-08:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -88,7 +88,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest]
-        rust: [1.70.0, 1.71.1]
+        rust: [1.75.0]
     runs-on: ${{ matrix.os }}
     continue-on-error: true
     steps:
diff --git a/Cargo.toml b/Cargo.toml
@@ -47,4 +47,4 @@ tokio-stream = "0.1"
 tracing = { version = "0.1", default-features = false }
 tracing-core = { version = "0.1", default-features = false }
 tracing-subscriber = { version = "0.3", default-features = false }
-url = { version = "2.5.2", default-features = false } #https://github.com/servo/rust-url/issues/992
+url = { version = "2.5", default-features = false }
diff --git a/README.md b/README.md
@@ -162,7 +162,7 @@ Registry](https://opentelemetry.io/ecosystem/registry/?language=rust).
 ## Supported Rust Versions
 
 OpenTelemetry is built against the latest stable release. The minimum supported
-version is 1.70. The current OpenTelemetry version is not guaranteed to build
+version is 1.75. The current OpenTelemetry version is not guaranteed to build
 on Rust versions earlier than the minimum supported version.
 
 The current stable Rust compiler and the three most recent minor versions
diff --git a/deny.toml b/deny.toml
@@ -29,10 +29,5 @@ license-files = [
 ]
 
 [advisories]
-ignore = [
-    # unsoundness in indirect dependencies without a safe upgrade below
-    "RUSTSEC-2021-0145",
-    "RUSTSEC-2019-0036"
-]
 unmaintained = "allow"
 yanked = "allow"
diff --git a/opentelemetry-appender-log/CHANGELOG.md b/opentelemetry-appender-log/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## vNext
 
+- Bump msrv to 1.75.0.
+
+
 ## 0.27.0
 
 Released 2024-Nov-11
diff --git a/opentelemetry-appender-log/Cargo.toml b/opentelemetry-appender-log/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/ope
 readme = "README.md"
 keywords = ["opentelemetry", "log", "logs"]
 license = "Apache-2.0"
-rust-version = "1.70"
+rust-version = "1.75.0"
 edition = "2021"
 
 [dependencies]
diff --git a/opentelemetry-appender-tracing/CHANGELOG.md b/opentelemetry-appender-tracing/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## vNext
 
+- Bump msrv to 1.75.0.
+
+
 ## 0.27.0
 
 Released 2024-Nov-11
diff --git a/opentelemetry-appender-tracing/Cargo.toml b/opentelemetry-appender-tracing/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/ope
 readme = "README.md"
 keywords = ["opentelemetry", "log", "logs", "tracing"]
 license = "Apache-2.0"
-rust-version = "1.70"
+rust-version = "1.75.0"
 
 [dependencies]
 log = { workspace = true, optional = true }
diff --git a/opentelemetry-appender-tracing/README.md b/opentelemetry-appender-tracing/README.md
@@ -38,7 +38,7 @@ of telemetry is intentionally left to other tools.
 ## Supported Rust Versions
 
 OpenTelemetry is built against the latest stable release. The minimum supported
-version is 1.70. The current OpenTelemetry version is not guaranteed to build
+version is 1.75.0. The current OpenTelemetry version is not guaranteed to build
 on Rust versions earlier than the minimum supported version.
 
 The current stable Rust compiler and the three most recent minor versions
diff --git a/opentelemetry-http/CHANGELOG.md b/opentelemetry-http/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## vNext
 
+- Bump msrv to 1.75.0.
+
+
 ## 0.27.0
 
 Released 2024-Nov-08
diff --git a/opentelemetry-http/Cargo.toml b/opentelemetry-http/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/open-telemetry/opentelemetry-rust"
 keywords = ["opentelemetry", "tracing", "context", "propagation"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.75.0"
 
 [features]
 hyper = ["dep:http-body-util", "dep:hyper", "dep:hyper-util", "dep:tokio"]
diff --git a/opentelemetry-http/README.md b/opentelemetry-http/README.md
@@ -34,7 +34,7 @@ of telemetry is intentionally left to other tools.
 ## Supported Rust Versions
 
 OpenTelemetry is built against the latest stable release. The minimum supported
-version is 1.70. The current OpenTelemetry version is not guaranteed to build
+version is 1.75.0. The current OpenTelemetry version is not guaranteed to build
 on Rust versions earlier than the minimum supported version.
 
 The current stable Rust compiler and the three most recent minor versions
diff --git a/opentelemetry-jaeger-propagator/CHANGELOG.md b/opentelemetry-jaeger-propagator/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## vNext
 
+- Bump msrv to 1.75.0.
+
+
 ## 0.27.0
 
 Released 2024-Nov-11
diff --git a/opentelemetry-jaeger-propagator/Cargo.toml b/opentelemetry-jaeger-propagator/Cargo.toml
@@ -13,7 +13,7 @@ categories = [
 keywords = ["opentelemetry", "jaeger", "propagator"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.75.0"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/opentelemetry-jaeger-propagator/README.md b/opentelemetry-jaeger-propagator/README.md
@@ -34,7 +34,7 @@ of telemetry is intentionally left to other tools.
 ## Supported Rust Versions
 
 OpenTelemetry is built against the latest stable release. The minimum supported
-version is 1.70. The current OpenTelemetry version is not guaranteed to build
+version is 1.75.0. The current OpenTelemetry version is not guaranteed to build
 on Rust versions earlier than the minimum supported version.
 
 The current stable Rust compiler and the three most recent minor versions
diff --git a/opentelemetry-otlp/CHANGELOG.md b/opentelemetry-otlp/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## vNext
 
+- Bump msrv to 1.75.0.
+
+
 ## 0.27.0
 
 Released 2024-Nov-11
diff --git a/opentelemetry-otlp/Cargo.toml b/opentelemetry-otlp/Cargo.toml
@@ -13,7 +13,7 @@ categories = [
 keywords = ["opentelemetry", "otlp", "logging", "tracing", "metrics"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.71.1"
+rust-version = "1.75.0"
 autotests = false
 
 [[test]]
diff --git a/opentelemetry-otlp/README.md b/opentelemetry-otlp/README.md
@@ -42,7 +42,7 @@ See [docs](https://docs.rs/opentelemetry-otlp).
 ## Supported Rust Versions
 
 OpenTelemetry is built against the latest stable release. The minimum supported
-version is 1.71.1. The current OpenTelemetry version is not guaranteed to build
+version is 1.75.0. The current OpenTelemetry version is not guaranteed to build
 on Rust versions earlier than the minimum supported version.
 
 The current stable Rust compiler and the three most recent minor versions
diff --git a/opentelemetry-otlp/examples/basic-otlp-http/Cargo.toml b/opentelemetry-otlp/examples/basic-otlp-http/Cargo.toml
@@ -6,7 +6,7 @@ license = "Apache-2.0"
 publish = false
 
 [features]
-default = ["reqwest"]
+default = ["reqwest", "experimental_metrics_periodicreader_with_async_runtime"]
 reqwest = ["opentelemetry-otlp/reqwest-client"]
 hyper = ["opentelemetry-otlp/hyper-client"]
 experimental_metrics_periodicreader_with_async_runtime = ["opentelemetry_sdk/experimental_metrics_periodicreader_with_async_runtime"]
diff --git a/opentelemetry-prometheus/CHANGELOG.md b/opentelemetry-prometheus/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## vNext
 
+- Bump msrv to 1.75.0.
+
+
 ## v0.27.0
 
 - Update `opentelemetry` dependency version to 0.27
diff --git a/opentelemetry-prometheus/Cargo.toml b/opentelemetry-prometheus/Cargo.toml
@@ -13,7 +13,7 @@ categories = [
 keywords = ["opentelemetry", "prometheus", "metrics", "async"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.75.0"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/opentelemetry-proto/CHANGELOG.md b/opentelemetry-proto/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## vNext
 
 - Update proto definitions to v1.4.0 [#2315](https://github.com/open-telemetry/opentelemetry-rust/pull/2315)
-
+- Bump msrv to 1.75.0.
 
 ## 0.27.0
 
diff --git a/opentelemetry-proto/Cargo.toml b/opentelemetry-proto/Cargo.toml
@@ -13,7 +13,7 @@ categories = [
 keywords = ["opentelemetry", "otlp", "logging", "tracing", "metrics"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.71.1"
+rust-version = "1.75.0"
 autotests = false
 
 [lib]
diff --git a/opentelemetry-proto/README.md b/opentelemetry-proto/README.md
@@ -11,7 +11,7 @@ repository and transformation between types from generated files and types defin
 ## Supported Rust Versions
 
 OpenTelemetry is built against the latest stable release. The minimum supported
-version is 1.71.1. The current OpenTelemetry version is not guaranteed to build
+version is 1.75.0. The current OpenTelemetry version is not guaranteed to build
 on Rust versions earlier than the minimum supported version.
 
 The current stable Rust compiler and the three most recent minor versions
diff --git a/opentelemetry-sdk/CHANGELOG.md b/opentelemetry-sdk/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## vNext
 
+- *Breaking(Affects custom metric exporter authors only)* `start_time` and `time` is moved from DataPoints to aggregations (Sum, Gauge, Histogram, ExpoHistogram) see [#2377](https://github.com/open-telemetry/opentelemetry-rust/pull/2377) and [#2411](https://github.com/open-telemetry/opentelemetry-rust/pull/2411), to reduce memory.
+
+- *Breaking* `start_time` is no longer optional for `Sum` aggregation, see [#2367](https://github.com/open-telemetry/opentelemetry-rust/pull/2367), but is still optional for `Gauge` aggregation see [#2389](https://github.com/open-telemetry/opentelemetry-rust/pull/2389).
+
 - *Breaking*
   - SimpleLogProcessor modified to be generic over `LogExporter` to
     avoid dynamic dispatch to invoke exporter. If you were using
@@ -88,6 +92,9 @@
       `experimental_metrics_periodicreader_with_async_runtime`.  
     - Continue enabling one of the async runtime feature flags: `rt-tokio`,
       `rt-tokio-current-thread`, or `rt-async-std`.
+      
+  - Bump msrv to 1.75.0.
+
 
 ## 0.27.1
 
diff --git a/opentelemetry-sdk/Cargo.toml b/opentelemetry-sdk/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/open-telemetry/opentelemetry-rust"
 readme = "README.md"
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.75.0"
 
 [dependencies]
 opentelemetry = { version = "0.27", path = "../opentelemetry/" }
diff --git a/opentelemetry-sdk/README.md b/opentelemetry-sdk/README.md
@@ -103,7 +103,7 @@ See [docs](https://docs.rs/opentelemetry-sdk).
 ## Supported Rust Versions
 
 OpenTelemetry is built against the latest stable release. The minimum supported
-version is 1.70. The current OpenTelemetry version is not guaranteed to build
+version is 1.75.0. The current OpenTelemetry version is not guaranteed to build
 on Rust versions earlier than the minimum supported version.
 
 The current stable Rust compiler and the three most recent minor versions
diff --git a/opentelemetry-semantic-conventions/CHANGELOG.md b/opentelemetry-semantic-conventions/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 - Update to [v1.29.0](https://github.com/open-telemetry/semantic-conventions/releases/tag/v1.29.0) of the semantic conventions.
 - Update to [v0.11.0](https://github.com/open-telemetry/weaver/releases/tag/v0.11.0) of the semantic conventions.
+- Bump msrv to 1.75.0.
+
 
 ## 0.27.0
 
diff --git a/opentelemetry-semantic-conventions/Cargo.toml b/opentelemetry-semantic-conventions/Cargo.toml
@@ -13,7 +13,7 @@ categories = [
 keywords = ["opentelemetry", "tracing", "async"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.75.0"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/opentelemetry-semantic-conventions/README.md b/opentelemetry-semantic-conventions/README.md
@@ -28,7 +28,7 @@ and visualization tools.
 ## Supported Rust Versions
 
 OpenTelemetry is built against the latest stable release. The minimum supported
-version is 1.70. The current OpenTelemetry version is not guaranteed to build
+version is 1.75.0. The current OpenTelemetry version is not guaranteed to build
 on Rust versions earlier than the minimum supported version.
 
 The current stable Rust compiler and the three most recent minor versions
diff --git a/opentelemetry-stdout/CHANGELOG.md b/opentelemetry-stdout/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## vNext
 
+- Bump msrv to 1.75.0.
+- *Breaking* time fields, `StartTime` and `EndTime` is printed on aggregation (Sum, Gauge, Histogram, ExpoHistogram) with 2 tabs, previously it was on aggregation data point, with 3 tabs, see [#2377](https://github.com/open-telemetry/opentelemetry-rust/pull/2377) and [#2411](https://github.com/open-telemetry/opentelemetry-rust/pull/2411).
+
 ## 0.27.0
 
 Released 2024-Nov-11
diff --git a/opentelemetry-stdout/Cargo.toml b/opentelemetry-stdout/Cargo.toml
@@ -13,7 +13,7 @@ categories = [
 keywords = ["opentelemetry", "tracing", "metrics", "logs"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.75.0"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/opentelemetry-stdout/README.md b/opentelemetry-stdout/README.md
@@ -49,7 +49,7 @@ See [docs](https://docs.rs/opentelemetry-stdout).
 ## Supported Rust Versions
 
 OpenTelemetry is built against the latest stable release. The minimum supported
-version is 1.70. The current OpenTelemetry version is not guaranteed to build
+version is 1.75.0. The current OpenTelemetry version is not guaranteed to build
 on Rust versions earlier than the minimum supported version.
 
 The current stable Rust compiler and the three most recent minor versions
diff --git a/opentelemetry-zipkin/CHANGELOG.md b/opentelemetry-zipkin/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## vNext
 
+- Bump msrv to 1.75.0.
+
 ## 0.27.0
 
 Released 2024-Nov-11
diff --git a/opentelemetry-zipkin/Cargo.toml b/opentelemetry-zipkin/Cargo.toml
@@ -13,7 +13,7 @@ categories = [
 keywords = ["opentelemetry", "zipkin", "tracing", "async"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.75.0"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/opentelemetry-zipkin/README.md b/opentelemetry-zipkin/README.md
@@ -110,7 +110,7 @@ available so be sure to match them appropriately.
 ## Supported Rust Versions
 
 OpenTelemetry is built against the latest stable release. The minimum supported
-version is 1.70. The current OpenTelemetry version is not guaranteed to build on
+version is 1.75.0. The current OpenTelemetry version is not guaranteed to build on
 Rust versions earlier than the minimum supported version.
 
 The current stable Rust compiler and the three most recent minor versions before
diff --git a/opentelemetry/CHANGELOG.md b/opentelemetry/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## vNext
 
+- Bump msrv to 1.75.0.
+
 ## 0.27.1
 
 Released 2024-Nov-27
diff --git a/opentelemetry/Cargo.toml b/opentelemetry/Cargo.toml
@@ -14,7 +14,7 @@ categories = [
 keywords = ["opentelemetry", "logging", "tracing", "metrics"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.75.0"
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/opentelemetry/README.md b/opentelemetry/README.md
@@ -133,7 +133,7 @@ See [docs](https://docs.rs/opentelemetry).
 ## Supported Rust Versions
 
 OpenTelemetry is built against the latest stable release. The minimum supported
-version is 1.70. The current OpenTelemetry version is not guaranteed to build
+version is 1.75.0. The current OpenTelemetry version is not guaranteed to build
 on Rust versions earlier than the minimum supported version.
 
 The current stable Rust compiler and the three most recent minor versions
diff --git a/opentelemetry/src/context.rs b/opentelemetry/src/context.rs
@@ -327,9 +327,19 @@ impl Context {
 
 impl fmt::Debug for Context {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Context")
-            .field("entries", &self.entries.len())
-            .finish()
+        let mut dbg = f.debug_struct("Context");
+        let mut entries = self.entries.len();
+        #[cfg(feature = "trace")]
+        {
+            if let Some(span) = &self.span {
+                dbg.field("span", &span.span_context());
+                entries += 1;
+            } else {
+                dbg.field("span", &"None");
+            }
+        }
+
+        dbg.field("entries", &entries).finish()
     }
 }
 
diff --git a/opentelemetry/src/trace/context.rs b/opentelemetry/src/trace/context.rs
diff --git a/opentelemetry/src/trace/span_context.rs b/opentelemetry/src/trace/span_context.rs
diff --git a/scripts/msrv_config.json b/scripts/msrv_config.json
diff --git a/scripts/patch_dependencies.sh b/scripts/patch_dependencies.sh
diff --git a/stress/Cargo.toml b/stress/Cargo.toml
