Merge branch 'main' into test-serde-int64

.github/workflows/ci.yml

@@ -101,17 +101,21 @@ jobs:
  msrv:
  strategy:
  matrix:
- os: [ windows-latest, ubuntu-latest ]
+ os: [windows-latest, ubuntu-latest]
+ rust: [1.65.0, 1.70.0]
  runs-on: ${{ matrix.os }}
  steps:
- - uses: actions/checkout@v4
- with:
- submodules: true
- - uses: dtolnay/[email protected]
- - name: Patch dependencies versions # some dependencies bump MSRV without major version bump
- run: bash ./scripts/patch_dependencies.sh
- - name: Check MSRV for all crates
- run: bash ./scripts/msrv.sh
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ - name: Set up Rust ${{ matrix.rust }}
+ uses: dtolnay/rust-toolchain@master
+ with:
+ toolchain: ${{ matrix.rust }}
+ - name: Patch dependencies versions
+ run: bash ./scripts/patch_dependencies.sh
+ - name: Check MSRV for all crates
+ run: bash ./scripts/msrv.sh ${{ matrix.rust }}
  cargo-deny:
  runs-on: ubuntu-latest # This uses the step `EmbarkStudios/cargo-deny-action@v1` which is only supported on Linux
  continue-on-error: true # Prevent sudden announcement of a new advisory from failing ci

Cargo.toml

@@ -45,4 +45,4 @@ tokio-stream = "0.1.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.2", default-features = false }
+url = { version = "=2.5.0", default-features = false } #pinning the version supporting rustc 1.65

opentelemetry-jaeger-propagator/Cargo.toml

@@ -25,7 +25,7 @@ opentelemetry = { version = "0.23", default-features = false, features = [
 ], path = "../opentelemetry" }
 
 [dev-dependencies]
-opentelemetry_sdk = { features = ["testing"], path = "../opentelemetry-sdk" }
+opentelemetry = { features = ["testing"], path = "../opentelemetry" }
 
 [features]
 default = []

opentelemetry-otlp/examples/basic-otlp-http/otel-collector-config.yaml

@@ -11,17 +11,17 @@ receivers:
  http:
 
 exporters:
- logging:
- loglevel: debug
+ debug:
+ verbosity: detailed
 
 service:
  pipelines:
  traces:
  receivers: [otlp]
- exporters: [logging]
+ exporters: [debug]
  metrics:
  receivers: [otlp]
- exporters: [logging]
+ exporters: [debug]
  logs:
  receivers: [otlp]
- exporters: [logging]
+ exporters: [debug]

opentelemetry-otlp/examples/basic-otlp-http/src/main.rs

@@ -50,19 +50,15 @@ fn init_tracer_provider() -> Result<sdktrace::TracerProvider, TraceError> {
 }
 
 fn init_metrics() -> Result<opentelemetry_sdk::metrics::SdkMeterProvider, MetricsError> {
- let provider = opentelemetry_otlp::new_pipeline()
+ opentelemetry_otlp::new_pipeline()
  .metrics(opentelemetry_sdk::runtime::Tokio)
  .with_exporter(
  opentelemetry_otlp::new_exporter()
  .http()
  .with_endpoint("http://localhost:4318/v1/metrics"),
  )
  .with_resource(RESOURCE.clone())
- .build();
- match provider {
- Ok(provider) => Ok(provider),
- Err(err) => Err(err),
- }
+ .build()
 }
 
 #[tokio::main]
@@ -85,6 +81,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
  );
 
  let meter_provider = result.unwrap();
+ global::set_meter_provider(meter_provider.clone());
 
  // Opentelemetry will not provide a global API to manage the logger
  // provider. Application users must manage the lifecycle of the logger

opentelemetry-otlp/examples/basic-otlp/otel-collector-config.yaml

@@ -11,17 +11,17 @@ receivers:
  http:
 
 exporters:
- logging:
- loglevel: debug
+ debug:
+ verbosity: detailed
 
 service:
  pipelines:
  traces:
  receivers: [otlp]
- exporters: [logging]
+ exporters: [debug]
  metrics:
  receivers: [otlp]
- exporters: [logging]
+ exporters: [debug]
  logs:
  receivers: [otlp]
- exporters: [logging]
+ exporters: [debug]

opentelemetry-otlp/tests/integration_test/Cargo.toml

@@ -9,11 +9,13 @@ publish = false
 once_cell = { workspace = true }
 opentelemetry = { path = "../../../opentelemetry", features = ["metrics", "logs"] }
 opentelemetry_sdk = { path = "../../../opentelemetry-sdk", features = ["rt-tokio", "logs", "testing"] }
-opentelemetry-otlp = { path = "../../../opentelemetry-otlp", features = ["tonic", "metrics", "logs"] }
-opentelemetry-semantic-conventions = { path = "../../../opentelemetry-semantic-conventions" }
-opentelemetry-proto = { path = "../../../opentelemetry-proto", features = ["gen-tonic-messages", "trace", "with-serde"] }
-opentelemetry-appender-log = { path = "../../../opentelemetry-appender-log", default-features = false}
+opentelemetry-proto = { path = "../../../opentelemetry-proto", features = ["gen-tonic-messages", "trace", "logs", "with-serde"] }
 log = { workspace = true }
 tokio = { version = "1.0", features = ["full"] }
 serde_json = "1"
 testcontainers = "0.15.0"
+
+[target.'cfg(unix)'.dependencies]
+opentelemetry-appender-log = { path = "../../../opentelemetry-appender-log", default-features = false}
+opentelemetry-otlp = { path = "../../../opentelemetry-otlp", features = ["tonic", "metrics", "logs"] }
+opentelemetry-semantic-conventions = { path = "../../../opentelemetry-semantic-conventions" }

opentelemetry-otlp/tests/integration_test/otel-collector-config.yaml

@@ -5,8 +5,6 @@ receivers:
  http:
 
 exporters:
- logging:
- loglevel: debug
  file:
  path: /testresults/result.json
 

opentelemetry-proto/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## vNext
 
+- Bump MSRV to 1.70 [1864](https://github.com/open-telemetry/opentelemetry-rust/pull/1874)
+
 ## v0.6.0
 
 - Update protobuf definitions to v1.3.1 [#1721](https://github.com/open-telemetry/opentelemetry-rust/pull/1721)

opentelemetry-proto/Cargo.toml

@@ -13,7 +13,7 @@ categories = [
 keywords = ["opentelemetry", "otlp", "logging", "tracing", "metrics"]
 license = "Apache-2.0"
 edition = "2021"
-rust-version = "1.65"
+rust-version = "1.70"
 autotests = false
 
 [lib]

opentelemetry-proto/README.md

@@ -5,3 +5,6 @@
 # OpenTelemetry Proto
 This crate contains generated files from [opentelemetry-proto](https://github.com/open-telemetry/opentelemetry-proto)
 repository and transformation between types from generated files and types defined in [opentelemetry](https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry).
+
+
+*Compiler support: [requires `rustc` 1.70+]

opentelemetry-sdk/Cargo.toml

@@ -34,7 +34,6 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dev-dependencies]
-indexmap = "2.0"
 criterion = { version = "0.5", features = ["html_reports"] }
 temp-env = { workspace = true }
 

opentelemetry-sdk/src/logs/log_emitter.rs

@@ -77,7 +77,7 @@ impl opentelemetry::logs::LoggerProvider for LoggerProvider {
 
  fn library_logger(&self, library: Arc<InstrumentationLibrary>) -> Self::Logger {
  // If the provider is shutdown, new logger will refer a no-op logger provider.
- if self.is_shutdown.load(std::sync::atomic::Ordering::Relaxed) {
+ if self.is_shutdown.load(Ordering::Relaxed) {
  return Logger::new(library, NOOP_LOGGER_PROVIDER.clone());
  }
  Logger::new(library, self.clone())