From c1b24aec8a3ec9b43790e7de72109b8af4d80537 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 08:35:15 +0000 Subject: [PATCH 1/5] Update opentelemetry-semantic-conventions requirement from 0.27 to 0.29 Updates the requirements on [opentelemetry-semantic-conventions](https://github.com/open-telemetry/opentelemetry-rust) to permit the latest version. - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/opentelemetry-semantic-conventions-0.27.0...opentelemetry-semantic-conventions-0.29.0) --- updated-dependencies: - dependency-name: opentelemetry-semantic-conventions dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- lambda-runtime/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lambda-runtime/Cargo.toml b/lambda-runtime/Cargo.toml index b4a7ad3d..5cf67ae2 100644 --- a/lambda-runtime/Cargo.toml +++ b/lambda-runtime/Cargo.toml @@ -41,7 +41,7 @@ hyper-util = { workspace = true, features = [ ] } lambda_runtime_api_client = { version = "0.11.1", path = "../lambda-runtime-api-client", default-features = false } miette = { version = "7.2.0", optional = true } -opentelemetry-semantic-conventions = { version = "0.27", optional = true, features = ["semconv_experimental"] } +opentelemetry-semantic-conventions = { version = "0.29", optional = true, features = ["semconv_experimental"] } pin-project = "1" serde = { version = "1", features = ["derive", "rc"] } serde_json = "^1" From 519a92c711c684b38d5853704d37aa6a46c65aed Mon Sep 17 00:00:00 2001 From: Maxime David Date: Thu, 1 May 2025 00:27:46 +0000 Subject: [PATCH 2/5] fix: otel example --- lambda-runtime/src/layers/otel.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lambda-runtime/src/layers/otel.rs b/lambda-runtime/src/layers/otel.rs index f50f36f7..b5436431 100644 --- a/lambda-runtime/src/layers/otel.rs +++ b/lambda-runtime/src/layers/otel.rs @@ -1,7 +1,7 @@ use std::{fmt::Display, future::Future, pin::Pin, task}; use crate::LambdaInvocation; -use opentelemetry_semantic_conventions::trace as traceconv; +use opentelemetry_semantic_conventions::attribute as attribute; use pin_project::pin_project; use tower::{Layer, Service}; use tracing::{field, instrument::Instrumented, Instrument}; @@ -76,9 +76,9 @@ where "Lambda function invocation", "otel.name" = req.context.env_config.function_name, "otel.kind" = field::Empty, - { traceconv::FAAS_TRIGGER } = &self.otel_attribute_trigger, - { traceconv::FAAS_INVOCATION_ID } = req.context.request_id, - { traceconv::FAAS_COLDSTART } = self.coldstart + { attribute::FAAS_TRIGGER } = &self.otel_attribute_trigger, + { attribute::FAAS_INVOCATION_ID } = req.context.request_id, + { attribute::FAAS_COLDSTART } = self.coldstart ); // After the first execution, we can set 'coldstart' to false From 781556779b7b0db8bfd5e990dd9108c18d86721c Mon Sep 17 00:00:00 2001 From: Maxime David Date: Thu, 1 May 2025 00:30:36 +0000 Subject: [PATCH 3/5] bump: MSRV to 1.75.0 --- .github/workflows/build-events.yml | 2 +- .github/workflows/build-extension.yml | 2 +- .github/workflows/build-runtime.yml | 2 +- README.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-events.yml b/.github/workflows/build-events.yml index 6894e331..68f3c1c2 100644 --- a/.github/workflows/build-events.yml +++ b/.github/workflows/build-events.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: toolchain: - - "1.71.1" # Current MSRV + - "1.75.0" # Current MSRV - stable env: RUST_BACKTRACE: 1 diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index cb23c289..39487f25 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: toolchain: - - "1.71.1" # Current MSRV + - "1.75.0" # Current MSRV - stable env: RUST_BACKTRACE: 1 diff --git a/.github/workflows/build-runtime.yml b/.github/workflows/build-runtime.yml index dfc59ee8..08c90179 100644 --- a/.github/workflows/build-runtime.yml +++ b/.github/workflows/build-runtime.yml @@ -21,7 +21,7 @@ jobs: strategy: matrix: toolchain: - - "1.71.1" # Current MSRV + - "1.75.0" # Current MSRV - stable env: RUST_BACKTRACE: 1 diff --git a/README.md b/README.md index 1a93d85c..01e5f045 100644 --- a/README.md +++ b/README.md @@ -409,7 +409,7 @@ fn main() -> Result<(), Box> { ## Supported Rust Versions (MSRV) -The AWS Lambda Rust Runtime requires a minimum of Rust 1.71.1, and is not guaranteed to build on compiler versions earlier than that. +The AWS Lambda Rust Runtime requires a minimum of Rust 1.75.0, and is not guaranteed to build on compiler versions earlier than that. ## Security From fb64fd54f6d14af6524ac4fb0664ebbf7c974c9d Mon Sep 17 00:00:00 2001 From: Maxime David Date: Thu, 1 May 2025 00:32:55 +0000 Subject: [PATCH 4/5] bump: MSRV to 1.81.0 --- .github/workflows/build-events.yml | 2 +- .github/workflows/build-extension.yml | 2 +- .github/workflows/build-runtime.yml | 2 +- README.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-events.yml b/.github/workflows/build-events.yml index 68f3c1c2..172bcdd8 100644 --- a/.github/workflows/build-events.yml +++ b/.github/workflows/build-events.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: toolchain: - - "1.75.0" # Current MSRV + - "1.81.0" # Current MSRV - stable env: RUST_BACKTRACE: 1 diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml index 39487f25..0f151f43 100644 --- a/.github/workflows/build-extension.yml +++ b/.github/workflows/build-extension.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: toolchain: - - "1.75.0" # Current MSRV + - "1.81.0" # Current MSRV - stable env: RUST_BACKTRACE: 1 diff --git a/.github/workflows/build-runtime.yml b/.github/workflows/build-runtime.yml index 08c90179..8720af17 100644 --- a/.github/workflows/build-runtime.yml +++ b/.github/workflows/build-runtime.yml @@ -21,7 +21,7 @@ jobs: strategy: matrix: toolchain: - - "1.75.0" # Current MSRV + - "1.81.0" # Current MSRV - stable env: RUST_BACKTRACE: 1 diff --git a/README.md b/README.md index 01e5f045..c7ce093f 100644 --- a/README.md +++ b/README.md @@ -409,7 +409,7 @@ fn main() -> Result<(), Box> { ## Supported Rust Versions (MSRV) -The AWS Lambda Rust Runtime requires a minimum of Rust 1.75.0, and is not guaranteed to build on compiler versions earlier than that. +The AWS Lambda Rust Runtime requires a minimum of Rust 1.81.0, and is not guaranteed to build on compiler versions earlier than that. ## Security From 59a0f4ee97ea6e990c057965a6073789f2f1ebb6 Mon Sep 17 00:00:00 2001 From: Maxime David Date: Thu, 1 May 2025 00:34:27 +0000 Subject: [PATCH 5/5] fix: cargo fmt --- lambda-runtime/src/layers/otel.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lambda-runtime/src/layers/otel.rs b/lambda-runtime/src/layers/otel.rs index b5436431..42b507f8 100644 --- a/lambda-runtime/src/layers/otel.rs +++ b/lambda-runtime/src/layers/otel.rs @@ -1,7 +1,7 @@ use std::{fmt::Display, future::Future, pin::Pin, task}; use crate::LambdaInvocation; -use opentelemetry_semantic_conventions::attribute as attribute; +use opentelemetry_semantic_conventions::attribute; use pin_project::pin_project; use tower::{Layer, Service}; use tracing::{field, instrument::Instrumented, Instrument};