Merge branch 'main' into better-otel-endpoint-construction

Author: lalitb

.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"

.github/workflows/ci.yml

@@ -21,29 +21,29 @@ jobs:
         sudo rm -rf /usr/local/lib/android
         sudo rm -rf /usr/share/dotnet
         df -h
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: ${{ matrix.rust }}
         components: rustfmt
         profile: minimal
-    - uses: arduino/setup-protoc@v1
+    - uses: arduino/setup-protoc@v3
     - name: Test
       run: ./scripts/test.sh
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
         components: rustfmt
         profile: minimal
-    - uses: arduino/setup-protoc@v1
+    - uses: arduino/setup-protoc@v3
     - uses: actions-rs/cargo@v1
       with:
         command: fmt
@@ -56,7 +56,7 @@ jobs:
         example: [opentelemetry, opentelemetry-sdk]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly-2024-02-07
@@ -73,23 +73,23 @@ jobs:
         example: [opentelemetry-otlp/examples/basic-otlp]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: stable
         components: rustfmt
         profile: minimal
-    - uses: arduino/setup-protoc@v1
+    - uses: arduino/setup-protoc@v3
     - name: Build
       run: |
         cd ${{ matrix.example }}
         cargo build --verbose
   msrv:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - uses: actions-rs/toolchain@v1
@@ -108,21 +108,21 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true # Prevent sudden announcement of a new advisory from failing ci
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: EmbarkStudios/cargo-deny-action@v1
         with:
           command: check advisories
   docs:
     continue-on-error: true
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly
           components: rustfmt
           override: true
-      - uses: arduino/setup-protoc@v1
+      - uses: arduino/setup-protoc@v3
       - name: doc
         run: cargo doc --no-deps --all-features
         env:
@@ -132,15 +132,15 @@ jobs:
     continue-on-error: true
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
           components: rustfmt,llvm-tools-preview
           override: true
-      - uses: arduino/setup-protoc@v1
+      - uses: arduino/setup-protoc@v3
       - name: cargo install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
       - name: cargo generate-lockfile

.github/workflows/integration_tests.yml

@@ -7,7 +7,6 @@ on:
 
 jobs:
   integration_tests:
-    rust: stable
     runs-on: ubuntu-latest
     timeout-minutes: 10
     if: ${{ github.event.label.name == 'integration tests' || contains(github.event.pull_request.labels.*.name, 'integration tests') }}
@@ -18,14 +17,14 @@ jobs:
           sudo rm -rf /usr/local/lib/android
           sudo rm -rf /usr/share/dotnet
           df -h
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: ${{ matrix.rust }}
+          toolchain: stable
           components: rustfmt
           profile: minimal
-      - uses: arduino/setup-protoc@v1
+      - uses: arduino/setup-protoc@v3
       - name: Run integration tests using docker compose
         run: ./scripts/integration_tests.sh

.github/workflows/markdown-link-check.yml

@@ -0,0 +1,25 @@
+name: Markdown link check
+
+on:
+  pull_request:
+  push:
+    branches:
+    - main
+    paths:
+      - '**/*.md'
+
+jobs:
+  markdown-link-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install markdown-link-check
+        run: npm install -g markdown-link-check
+
+      - name: Run markdown-link-check
+        run: |
+          find . -type f \
+                 -name '*.md' \
+                 -not -path '**/CHANGELOG.md' \
+               | xargs ./scripts/markdown-link-check-with-retry.sh

Cargo.toml

@@ -49,15 +49,17 @@ log = "0.4"
 once_cell = "1.13"
 ordered-float = "4.0"
 pin-project-lite = "0.2"
-prost = "0.11"
+prost = "0.12"
+prost-build = "0.12"
+prost-types = "0.12"
 rand = "0.8"
 reqwest = "0.11"
 serde = "1.0"
 serde_json = "1.0"
-surf = "2.0"
 temp-env = "0.3.6"
 thiserror = "1"
-tonic = "0.9"
+tonic = "0.11"
+tonic-build = "0.11"
 tokio = "1"
 tokio-stream = "0.1.1"
 tracing = "0.1"

examples/tracing-grpc/Cargo.toml

@@ -23,4 +23,4 @@ tonic = { workspace = true }
 serde_json = { workspace = true }
 
 [build-dependencies]
-tonic-build = "0.9.2"
+tonic-build = { workspace = true }

opentelemetry-http/CHANGELOG.md

@@ -4,9 +4,9 @@
 
 ### Changed
 
+- **Breaking** Remove built-in support for surf HTTP client [#1537](https://github.com/open-telemetry/opentelemetry-rust/pull/1537)
 - **Breaking** Surface non-2xx status codes as errors; change `ResponseExt` trait to return `HttpError` instead of `TraceError`[#1484](https://github.com/open-telemetry/opentelemetry-rust/pull/1484)
-     
-  
+
 ## v0.10.0
 
 ### Changed

opentelemetry-http/Cargo.toml

@@ -17,5 +17,4 @@ hyper = { workspace = true, features = ["http2", "client", "tcp"], optional = tr
 isahc = { workspace = true, optional = true }
 opentelemetry = { version = "0.21", path = "../opentelemetry", features = ["trace"] }
 reqwest = { workspace = true, features = ["blocking"], optional = true }
-surf = { workspace = true, optional = true }
 tokio = { workspace = true, features = ["time"], optional = true }

opentelemetry-http/src/lib.rs

@@ -100,66 +100,6 @@ mod reqwest {
     }
 }
 
-#[cfg(feature = "surf")]
-pub mod surf {
-    use std::str::FromStr;
-
-    use http::{header::HeaderName, HeaderMap, HeaderValue};
-
-    use super::{async_trait, Bytes, HttpClient, HttpError, Request, Response, ResponseExt};
-
-    #[derive(Debug)]
-    pub struct BasicAuthMiddleware(pub surf::http::auth::BasicAuth);
-
-    #[async_trait]
-    impl surf::middleware::Middleware for BasicAuthMiddleware {
-        async fn handle(
-            &self,
-            mut req: surf::Request,
-            client: surf::Client,
-            next: surf::middleware::Next<'_>,
-        ) -> surf::Result<surf::Response> {
-            req.insert_header(self.0.name(), self.0.value());
-            next.run(req, client).await
-        }
-    }
-
-    #[async_trait]
-    impl HttpClient for surf::Client {
-        async fn send(&self, request: Request<Vec<u8>>) -> Result<Response<Bytes>, HttpError> {
-            let (parts, body) = request.into_parts();
-            let method = parts.method.as_str().parse()?;
-            let uri = parts.uri.to_string().parse()?;
-
-            let mut request_builder = surf::Request::builder(method, uri).body(body);
-            let mut prev_name = None;
-            for (new_name, value) in parts.headers.into_iter() {
-                let name = new_name.or(prev_name).expect("the first time new_name should be set and from then on we always have a prev_name");
-                request_builder = request_builder.header(name.as_str(), value.to_str()?);
-                prev_name = Some(name);
-            }
-
-            let mut response = self.send(request_builder).await?;
-            let mut headers = HeaderMap::new();
-            for header_name in response.header_names() {
-                for header_value in &response[header_name.to_string().as_str()] {
-                    headers.append(
-                        HeaderName::from_str(&header_name.to_string())?,
-                        HeaderValue::from_str(header_value.as_str())?,
-                    );
-                }
-            }
-            let mut http_response = Response::builder()
-                .status(response.status() as u16)
-                .body(response.body_bytes().await?.into())?;
-
-            *http_response.headers_mut() = headers;
-
-            Ok(http_response.error_for_status()?)
-        }
-    }
-}
-
 #[cfg(feature = "isahc")]
 mod isahc {
     use crate::ResponseExt;

opentelemetry-jaeger-propagator/Cargo.toml

@@ -26,8 +26,8 @@ opentelemetry = { version = "0.21", default-features = false, features = [
 ], path = "../opentelemetry" }
 
 tonic = { workspace = true, optional = true }
-prost = { version = "0.11.6", optional = true }
-prost-types = { version = "0.11.6", optional = true }
+prost = { workspace = true, optional = true }
+prost-types = { workspace = true, optional = true }
 
 [dev-dependencies]
 opentelemetry_sdk = { features = ["testing"], path = "../opentelemetry-sdk" }

opentelemetry-jaeger/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## vNext
 
+### Changed
+
+- **Breaking** Remove support for surf HTTP client [#1537](https://github.com/open-telemetry/opentelemetry-rust/pull/1537)
+- Update to tonic 0.11 and prost 0.12 (#1536)
+
 ## v0.21.0
 
 ### Changed

opentelemetry-jaeger/Cargo.toml

@@ -35,15 +35,14 @@ opentelemetry-http = { version = "0.10", path = "../opentelemetry-http", optiona
 opentelemetry-semantic-conventions = { version = "0.13", path = "../opentelemetry-semantic-conventions" }
 pin-project-lite = { workspace = true, optional = true }
 reqwest = { workspace = true, optional = true }
-surf = { workspace = true, optional = true }
 thrift = "0.17.0"
 tokio = { workspace = true, features = ["net", "sync"], optional = true }
 wasm-bindgen = { version = "0.2", optional = true }
 wasm-bindgen-futures = { version = "0.4.18", optional = true }
 
 tonic = { workspace = true, optional = true }
-prost = { version = "0.11.6", optional = true }
-prost-types = { version = "0.11.6", optional = true }
+prost = { workspace = true, optional = true }
+prost-types = { workspace = true, optional = true }
 
 # Futures
 futures-executor = { workspace = true, features = ["std"], optional = true }
@@ -79,7 +78,6 @@ full = [
     "reqwest_collector_client",
     "reqwest_blocking_collector_client",
     "reqwest_rustls_collector_client",
-    "surf_collector_client",
     "wasm_collector_client",
     "rt-tokio",
     "rt-tokio-current-thread",
@@ -94,7 +92,6 @@ isahc_collector_client = ["isahc", "opentelemetry-http/isahc"]
 reqwest_blocking_collector_client = ["reqwest/blocking", "collector_client", "headers", "opentelemetry-http/reqwest"]
 reqwest_collector_client = ["reqwest", "collector_client", "headers", "opentelemetry-http/reqwest"]
 reqwest_rustls_collector_client = ["reqwest_collector_client", "reqwest/rustls-tls-native-roots"]
-surf_collector_client = ["surf", "collector_client", "opentelemetry-http/surf"]
 wasm_collector_client = [
     "base64",
     "http",
@@ -107,4 +104,4 @@ wasm_collector_client = [
 rt-tokio = ["tokio", "opentelemetry_sdk/rt-tokio"]
 rt-tokio-current-thread = ["tokio", "opentelemetry_sdk/rt-tokio-current-thread"]
 rt-async-std = ["async-std", "opentelemetry_sdk/rt-async-std"]
-integration_test = ["tonic", "prost", "prost-types", "rt-tokio", "collector_client", "hyper_collector_client", "hyper_tls_collector_client", "reqwest_collector_client", "surf_collector_client", "isahc_collector_client"]
+integration_test = ["tonic", "prost", "prost-types", "rt-tokio", "collector_client", "hyper_collector_client", "hyper_tls_collector_client", "reqwest_collector_client", "isahc_collector_client"]

opentelemetry-jaeger/README.md

@@ -108,12 +108,11 @@ opentelemetry-jaeger = { version = "..", features = ["isahc_collector_client"] }
 
 Then you can use the [`with_collector_endpoint`] method to specify the endpoint:
 
-[`with_collector_endpoint`]: https://docs.rs/opentelemetry-jaeger/latest/opentelemetry_jaeger/struct.PipelineBuilder.html#method.with_collector_endpoint
+[`with_collector_endpoint`]: https://docs.rs/opentelemetry-jaeger/latest/opentelemetry_jaeger/config/collector/struct.CollectorPipeline.html#method.with_endpoint
 
 ```rust
 // Note that this requires one of the following features enabled so that there is a default http client implementation
 // * hyper_collector_client
-// * surf_collector_client
 // * reqwest_collector_client
 // * reqwest_blocking_collector_client
 // * reqwest_rustls_collector_client
@@ -144,10 +143,11 @@ fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 
 ## Kitchen Sink Full Configuration
 
-[Example]((https://docs.rs/opentelemetry-jaeger/latest/opentelemetry_jaeger/#kitchen-sink-full-configuration)) showing how to override all configuration options. See the
-[`PipelineBuilder`] docs for details of each option.
+[`Example`] showing how to override all configuration options. See the
+[`AgentPipeline`] docs for details of each option.
 
-[`PipelineBuilder`]: https://docs.rs/opentelemetry-jaeger/latest/opentelemetry_jaeger/struct.PipelineBuilder.html
+[`Example`]: https://docs.rs/opentelemetry-jaeger/latest/opentelemetry_jaeger/#kitchen-sink-full-configuration
+[`AgentPipeline`]: https://docs.rs/opentelemetry-jaeger/latest/opentelemetry_jaeger/config/agent/struct.AgentPipeline.html
 
 ## Supported Rust Versions