From b57ae0d34b4074b1e65e2fcdaadbe8384ef0df99 Mon Sep 17 00:00:00 2001 From: Harold Dost Date: Mon, 17 Jun 2024 18:41:58 +0200 Subject: [PATCH] Prepare for relate (most) contrib crates. (#81) --- opentelemetry-aws/Cargo.toml | 2 +- opentelemetry-contrib/Cargo.toml | 2 +- opentelemetry-datadog/Cargo.toml | 2 +- opentelemetry-resource-detectors/Cargo.toml | 2 +- opentelemetry-zpages/Cargo.toml | 3 ++- scripts/lint.sh | 8 ++++---- scripts/test.sh | 7 ++----- 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/opentelemetry-aws/Cargo.toml b/opentelemetry-aws/Cargo.toml index 220cab62..6298dff0 100644 --- a/opentelemetry-aws/Cargo.toml +++ b/opentelemetry-aws/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opentelemetry-aws" -version = "0.10.0" +version = "0.11.0" description = "AWS exporters and propagators for OpenTelemetry" homepage = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-aws" repository = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-aws" diff --git a/opentelemetry-contrib/Cargo.toml b/opentelemetry-contrib/Cargo.toml index 99423e0b..bcb4fb9c 100644 --- a/opentelemetry-contrib/Cargo.toml +++ b/opentelemetry-contrib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opentelemetry-contrib" -version = "0.14.0" +version = "0.15.0" description = "Rust contrib repo for OpenTelemetry" homepage = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-contrib" repository = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-contrib" diff --git a/opentelemetry-datadog/Cargo.toml b/opentelemetry-datadog/Cargo.toml index e2d6c435..03737696 100644 --- a/opentelemetry-datadog/Cargo.toml +++ b/opentelemetry-datadog/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opentelemetry-datadog" -version = "0.10.0" +version = "0.11.0" description = "Datadog exporters and propagators for OpenTelemetry" homepage = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-datadog" repository = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-datadog" diff --git a/opentelemetry-resource-detectors/Cargo.toml b/opentelemetry-resource-detectors/Cargo.toml index 835d6b7f..5ff68817 100644 --- a/opentelemetry-resource-detectors/Cargo.toml +++ b/opentelemetry-resource-detectors/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opentelemetry-resource-detectors" -version = "0.1.0" +version = "0.2.0" edition = "2021" description = "A collection of community supported resource detectors for OpenTelemetry" homepage = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-resource-detectors" diff --git a/opentelemetry-zpages/Cargo.toml b/opentelemetry-zpages/Cargo.toml index e33f97a5..ea8d467f 100644 --- a/opentelemetry-zpages/Cargo.toml +++ b/opentelemetry-zpages/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opentelemetry-zpages" -version = "0.7.0" +version = "0.8.0" description = "ZPages implementation for OpenTelemetry" homepage = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-zpages" repository = "https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-zpages" @@ -9,6 +9,7 @@ categories = [ "development-tools::debugging", "development-tools::profiling", "asynchronous", + "experimental", ] keywords = ["opentelemetry", "zipkin", "tracing", "async"] license = "Apache-2.0" diff --git a/scripts/lint.sh b/scripts/lint.sh index c825cc5f..5836b359 100755 --- a/scripts/lint.sh +++ b/scripts/lint.sh @@ -16,10 +16,10 @@ if rustup component add clippy; then cargo_feature opentelemetry-aws "default" -# TODO: Can re-enable once back in the workspace. -# cargo_feature opentelemetry-datadog "reqwest-blocking-client" -# cargo_feature opentelemetry-datadog "reqwest-client" -# cargo_feature opentelemetry-datadog "surf-client" + cargo_feature opentelemetry-datadog "reqwest-blocking-client,intern-std" + cargo_feature opentelemetry-datadog "reqwest-client,intern-std" +# TODO: Clippy doesn't seem to like surf client. +# cargo_feature opentelemetry-datadog "surf-client,intern-std" cargo_feature opentelemetry-contrib "default" cargo_feature opentelemetry-contrib "api" diff --git a/scripts/test.sh b/scripts/test.sh index 46837f3b..e553b199 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -8,11 +8,8 @@ cargo test --all --all-features "$@" -- --test-threads=1 cargo test --manifest-path=opentelemetry-aws/Cargo.toml --all-features cargo test --manifest-path=opentelemetry-contrib/Cargo.toml --all-features -#TODO enable below once datadog exporter is building fine -#cargo test --manifest-path=opentelemetry-datadog/Cargo.toml --all-features - -#TODO enable below once stackdriver exporter is building fine -#cargo test --manifest-path=opentelemetry-stackdriver/Cargo.toml --all-features +cargo test --manifest-path=opentelemetry-datadog/Cargo.toml --all-features +cargo test --manifest-path=opentelemetry-stackdriver/Cargo.toml --all-features cargo test --manifest-path=opentelemetry-user-events-logs/Cargo.toml --all-features cargo test --manifest-path=opentelemetry-user-events-metrics/Cargo.toml --all-features