Merge branch 'main' into feat/log-kvs

Author: TommyCpp

.github/workflows/ci.yml

@@ -24,11 +24,12 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
-    - uses: actions-rs/toolchain@v1
+    - uses: dtolnay/rust-toolchain@master
       with:
         toolchain: ${{ matrix.rust }}
         components: rustfmt
-        profile: minimal
+    - name: "Set rustup profile"
+      run: rustup set profile minimal
     - uses: arduino/setup-protoc@v3
     - name: Test
       run: ./scripts/test.sh
@@ -38,11 +39,9 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
-    - uses: actions-rs/toolchain@v1
+    - uses: dtolnay/rust-toolchain@stable
       with:
-        toolchain: stable
         components: rustfmt
-        profile: minimal
     - uses: arduino/setup-protoc@v3
     - uses: actions-rs/cargo@v1
       with:
@@ -57,11 +56,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@nightly
         with:
           toolchain: nightly-2024-02-07
           components: rustfmt
-          override: true
       - name: external-type-check
         run: |
           cargo install cargo-check-external-types
@@ -76,11 +74,9 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
-    - uses: actions-rs/toolchain@v1
+    - uses: dtolnay/rust-toolchain@stable
       with:
-        toolchain: stable
         components: rustfmt
-        profile: minimal
     - uses: arduino/setup-protoc@v3
     - name: Build
       run: |
@@ -92,11 +88,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
-    - uses: actions-rs/toolchain@v1
-      with:
-        profile: minimal
-        toolchain: 1.65.0
-        override: true
+    - uses: dtolnay/rust-toolchain@1.65.0
     - name: Patch dependencies versions # some dependencies bump MSRV without major version bump
       run: ./scripts/patch_dependencies.sh
     - name: Run tests
@@ -117,11 +109,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly
           components: rustfmt
-          override: true
       - uses: arduino/setup-protoc@v3
       - name: doc
         run: cargo doc --no-deps --all-features
@@ -136,11 +126,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
           components: rustfmt,llvm-tools-preview
-          override: true
       - uses: arduino/setup-protoc@v3
       - name: cargo install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov

.github/workflows/integration_tests.yml

@@ -20,11 +20,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
           components: rustfmt
-          profile: minimal
       - uses: arduino/setup-protoc@v3
       - name: Run integration tests using docker compose
         run: ./scripts/integration_tests.sh

Cargo.toml

@@ -1,31 +1,14 @@
 [workspace]
 members = [
     "opentelemetry",
-    "opentelemetry-http",
-    "opentelemetry-jaeger",
-    "opentelemetry-jaeger/examples/actix-udp",
-    "opentelemetry-jaeger/examples/remote-sampler",
-    "opentelemetry-jaeger-propagator",
-    "opentelemetry-appender-log",
-    "opentelemetry-appender-tracing",
-    "opentelemetry-otlp",
-    "opentelemetry-prometheus",
-    "opentelemetry-proto",
-    "opentelemetry-sdk",
-    "opentelemetry-semantic-conventions",
-    "opentelemetry-stdout",
-    "opentelemetry-zipkin",
-    "opentelemetry-otlp/examples/basic-otlp",
-    "opentelemetry-otlp/examples/basic-otlp-http",
-    "opentelemetry-otlp/tests/integration_test",
-    "examples/metrics-basic",
-    "examples/metrics-advanced",
-    "examples/logs-basic",
-    "examples/tracing-grpc",
-    "examples/tracing-http-propagator",
-    "examples/tracing-jaeger",
+    "opentelemetry-*",
+    "opentelemetry-*/examples/*",
+    "opentelemetry-otlp/tests/*",
+    "examples/*",
     "stress",
 ]
+# Any deleted crates with remaining README
+exclude = []
 resolver = "2"
 
 [profile.bench]

RELEASING.md

@@ -24,24 +24,33 @@ A draft PR can be created, but before releasing consider the following:
 ## Steps to Release
 
 1. Create a release PR
-  - For each crate
-    - Bump appropriate version
-    - Update change logs to reflect release version.
-    - Update API/SDK version as necessary
-    - Attach `integration test` label to the PR to run integration tests
-  - If there's a large enough set of changes, consider writing a migration guide.
+
+* For each crate
+  * Bump appropriate version
+  * Update change logs to reflect release version.
+  * Update API/SDK version as necessary
+  * Attach `integration test` label to the PR to run integration tests
+* If there's a large enough set of changes, consider writing a migration guide.
+
 2. Merge the PR
-  - Get reviews from other Maintainers
-  - Ensure that there haven't been any interfering PRs
+
+* Get reviews from other Maintainers
+* Ensure that there haven't been any interfering PRs
+
 3. Tag the release commit based on the [tagging convention](#tagging-convention). It should usually be a bump on minor version before 1.0
 4. Create Github Release
 5. [Publish](#publishing-crates) to crates.io using the version as of the release commit
 6. Post to [#otel-rust](https://cloud-native.slack.com/archives/C03GDP0H023) on CNCF Slack.
 
-
 ## Tagging Convention
 
 For each crate: it should be `<crate-name>-<version>` `<version>` being the simple `X.Y.Z`.
+For example:
+
+```sh
+git tag -a opentelemetry-http-0.11.1 -m "opentelemetry-http 0.11.1 release"
+git push origin opentelemetry-http-0.11.1
+```
 
 ## Publishing Crates
 

examples/logs-basic/Cargo.toml

@@ -10,5 +10,6 @@ opentelemetry = { path = "../../opentelemetry", features = ["logs"] }
 opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["logs"] }
 opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["logs"]}
 opentelemetry-appender-log = { path = "../../opentelemetry-appender-log", default-features = false}
+opentelemetry-semantic-conventions = { path = "../../opentelemetry-semantic-conventions" }
 log = { workspace = true }
 serde_json = { workspace = true }

examples/logs-basic/src/main.rs

@@ -3,6 +3,7 @@ use opentelemetry::KeyValue;
 use opentelemetry_appender_log::OpenTelemetryLogBridge;
 use opentelemetry_sdk::logs::{Config, LoggerProvider};
 use opentelemetry_sdk::Resource;
+use opentelemetry_semantic_conventions::resource::SERVICE_NAME;
 
 fn main() {
     // Setup LoggerProvider with a stdout exporter
@@ -14,7 +15,7 @@ fn main() {
     let logger_provider = LoggerProvider::builder()
         .with_config(
             Config::default().with_resource(Resource::new(vec![KeyValue::new(
-                "service.name",
+                SERVICE_NAME,
                 "logs-basic-example",
             )])),
         )

examples/metrics-advanced/src/main.rs

@@ -1,7 +1,7 @@
 use opentelemetry::global;
 use opentelemetry::metrics::Unit;
 use opentelemetry::Key;
-use opentelemetry::{metrics::MeterProvider as _, KeyValue};
+use opentelemetry::KeyValue;
 use opentelemetry_sdk::metrics::{
     Aggregation, Instrument, PeriodicReader, SdkMeterProvider, Stream,
 };

examples/metrics-basic/src/main.rs

@@ -1,6 +1,6 @@
 use opentelemetry::global;
 use opentelemetry::metrics::Unit;
-use opentelemetry::{metrics::MeterProvider as _, KeyValue};
+use opentelemetry::KeyValue;
 use opentelemetry_sdk::metrics::{PeriodicReader, SdkMeterProvider};
 use opentelemetry_sdk::{runtime, Resource};
 use std::error::Error;

examples/tracing-jaeger/Cargo.toml

@@ -9,4 +9,5 @@ publish = false
 opentelemetry = { path = "../../opentelemetry" }
 opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio"] }
 opentelemetry-otlp = { path = "../../opentelemetry-otlp", features = ["tonic"] }
+opentelemetry-semantic-conventions = { path = "../../opentelemetry-semantic-conventions" }
 tokio = { workspace = true, features = ["full"] }

examples/tracing-jaeger/src/main.rs

@@ -6,6 +6,8 @@ use opentelemetry::{
 };
 use opentelemetry_otlp::WithExportConfig;
 use opentelemetry_sdk::{runtime, trace as sdktrace, Resource};
+use opentelemetry_semantic_conventions::resource::SERVICE_NAME;
+
 use std::error::Error;
 
 fn init_tracer() -> Result<opentelemetry_sdk::trace::Tracer, TraceError> {
@@ -18,7 +20,7 @@ fn init_tracer() -> Result<opentelemetry_sdk::trace::Tracer, TraceError> {
         )
         .with_trace_config(
             sdktrace::config().with_resource(Resource::new(vec![KeyValue::new(
-                "service.name",
+                SERVICE_NAME,
                 "tracing-jaeger",
             )])),
         )

opentelemetry-appender-tracing/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## vNext
 
+- Removed unwanted dependency on opentelemetry-sdk.
+
 ## v0.3.0
 
 ### Added

opentelemetry-appender-tracing/Cargo.toml

@@ -14,7 +14,6 @@ rust-version = "1.65"
 log = { workspace = true, optional = true }
 once_cell = { workspace = true }
 opentelemetry = { version = "0.22", path = "../opentelemetry", features = ["logs"] }
-opentelemetry_sdk = { version = "0.22", path = "../opentelemetry-sdk", features = ["logs"] }
 tracing = { workspace = true, features = ["std"]}
 tracing-core = { workspace = true }
 tracing-log = { version = "0.2", optional = true }
@@ -25,8 +24,16 @@ log = { workspace = true }
 opentelemetry-stdout = { path = "../opentelemetry-stdout", features = ["logs"] }
 opentelemetry_sdk = { path = "../opentelemetry-sdk", features = ["logs", "testing"]  }
 tracing-log = "0.2"
+async-trait = "0.1"
+criterion = "0.5.1"
 
 [features]
 experimental_metadata_attributes = ["dep:tracing-log"]
 logs_level_enabled = ["opentelemetry/logs_level_enabled", "opentelemetry_sdk/logs_level_enabled"]
 default = ["logs_level_enabled"]
+
+
+[[bench]]
+name = "logs"
+harness = false
+required-features = ["logs_level_enabled"]