Merge remote-tracking branch 'origin/main' into feature/parametrized-version

Author: Empty2k12

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,9 +4,7 @@
 
 ### Checklist
 - [ ] Formatted code using `cargo fmt --all`
-- [ ] Linted code using clippy
-  - [ ] with reqwest feature: `cargo clippy --manifest-path influxdb/Cargo.toml --all-targets --no-default-features --features serde,derive,reqwest-client-rustls -- -D warnings`
-  - [ ] with surf feature: `cargo clippy --manifest-path influxdb/Cargo.toml --all-targets --no-default-features --features serde,derive,hyper-client -- -D warnings`
+- [ ] Linted code using clippy with reqwest feature: `cargo clippy --manifest-path influxdb/Cargo.toml --all-targets --no-default-features --features chrono,time,serde,derive,reqwest-client-rustls -- -D warnings`
 - [ ] Updated README.md using `cargo doc2readme -p influxdb --expand-macros`
 - [ ] Reviewed the diff. Did you leave any print statements or unnecessary comments?
 - [ ] Any unfinished work that warrants a separate issue captured in an issue with a TODO code comment

.github/workflows/rust.yml

@@ -12,7 +12,7 @@ jobs:
     name: README Format Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: docker://codeberg.org/msrd0/cargo-doc2readme:nightly
         with:
           entrypoint: cargo
@@ -23,23 +23,21 @@ jobs:
     name: Style Check (clippy)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@1.88.0
         with:
           components: clippy
       - name: Update Cargo.lock
         run: cargo --config 'resolver.incompatible-rust-versions="fallback"' update
       - name: Check Clippy lints (reqwest)
-        run: cargo clippy --manifest-path influxdb/Cargo.toml --locked --all-targets --no-default-features --features serde,derive,reqwest-client-rustls -- -D warnings
-      - name: Check Clippy lints (surf)
-        run: cargo clippy --manifest-path influxdb/Cargo.toml --locked --all-targets --no-default-features --features serde,derive,hyper-client -- -D warnings
+        run: cargo clippy --manifest-path influxdb/Cargo.toml --locked --all-targets --no-default-features --features chrono,time,serde,derive,reqwest-client-rustls -- -D warnings
 
   # this checks that the code is formatted with rustfmt
   rustfmt:
     name: Style Checks (rustfmt)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@nightly
         with:
           components: rustfmt
@@ -72,7 +70,7 @@ jobs:
               nightly: false
             os: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{matrix.rust.toolchain}}
@@ -108,8 +106,8 @@ jobs:
           key: "${{runner.os}} Rust ${{steps.msrv-toolchain.outputs.cachekey}}"
         if: matrix.rust.name == 'MSRV'
       # finally we can run tests
-      - run: cargo test --lib --locked
-      - run: cargo test --doc --locked
+      - run: cargo test --lib --locked --features 'chrono time serde derive'
+      - run: cargo test --doc --locked --features 'chrono time serde derive'
 
   # this tests that all integration tests are successful
   integration_tests:
@@ -124,10 +122,6 @@ jobs:
             toolchain: stable
             nightly: false
         http-backend:
-          - curl-client
-          - h1-client
-          - h1-client-rustls
-          - hyper-client
           - reqwest-client-rustls
           - reqwest-client-native-tls
           - reqwest-client-native-tls-vendored
@@ -158,7 +152,7 @@ jobs:
           DOCKER_INFLUXDB_INIT_BUCKET: mydb
           DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: admintoken
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{matrix.rust.toolchain}}
@@ -172,10 +166,12 @@ jobs:
           key: "${{runner.os}} Rust ${{steps.rust-toolchain.outputs.cachekey}}"
       - name: Run tests
         run: |
-          for test in integration_tests{,_v2}
-          do
-            cargo test -p influxdb --no-default-features --features 'serde derive ${{matrix.http-backend}}' --no-fail-fast --test $test
-          done
+          cargo test -p influxdb \
+            --no-default-features \
+            --features "serde derive chrono time ${{matrix.http-backend}}" \
+            --no-fail-fast \
+            --test integration_tests \
+            --test integration_tests_v2
 
   # this uses cargo-tarpaulin to inspect the code coverage
   coverage:
@@ -198,7 +194,7 @@ jobs:
           INFLUXDB_USER_PASSWORD: password
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
         id: rust-toolchain
       - name: Get Tarpaulin Version
@@ -221,7 +217,7 @@ jobs:
           cargo tarpaulin -v \
             --target-dir target/tarpaulin \
             --workspace \
-            --features serde,derive \
+            --features chrono,time,serde,derive \
             --exclude-files 'derive/*' \
             --exclude-files 'target/*' \
             --ignore-panics --ignore-tests \
@@ -243,10 +239,10 @@ jobs:
       - coverage
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: gh-pages
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: tarpaulin-report
       - run: |
@@ -256,6 +252,6 @@ jobs:
 
           git add coverage.svg tarpaulin-report.html
           git status
-      - uses: stefanzweifel/git-auto-commit-action@v5
+      - uses: stefanzweifel/git-auto-commit-action@v6
         with:
           commit_message: "GitHub Pages for ${{ github.sha }}"

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Removed
+ - `<dyn Query>::raw_read_query`, deprecated in 0.5.0, was removed
+
 ## [0.7.2] - 2024-02-14
 
 ### Fixed

Cargo.toml

@@ -6,8 +6,8 @@ resolver = "2"
 
 [workspace.package]
 authors = ["Gero Gerke <git@gero.dev>", "Dominic <git@msrd0.de>"]
-edition = "2018"
-rust-version = "1.65"
+edition = "2021"
+rust-version = "1.67.1"
 license = "MIT"
 repository = "https://github.com/influxdb-rs/influxdb-rust"
 

README.md

@@ -25,8 +25,8 @@
     <a href="https://www.rust-lang.org/en-US/">
         <img src="https://img.shields.io/badge/Made%20with-Rust-orange.svg" alt='Build with Rust' />
     </a>
-    <a href="https://github.com/rust-lang/rust/releases/tag/1.65.0">
-        <img src="https://img.shields.io/badge/rustc-1.65.0+-yellow.svg" alt='Minimum Rust Version: 1.65.0' />
+    <a href="https://github.com/rust-lang/rust/releases/tag/1.67.1">
+        <img src="https://img.shields.io/badge/rustc-1.67.1+-yellow.svg" alt='Minimum Rust Version: 1.67.1' />
     </a>
 </p>
 
@@ -60,7 +60,6 @@ use chrono::{DateTime, Utc};
 use influxdb::{Client, Error, InfluxDbWriteable, ReadQuery, Timestamp};
 
 #[tokio::main]
-// or #[async_std::main] if you prefer
 async fn main() -> Result<(), Error> {
     // Connect to db `test` on `http://localhost:8086`
     let client = Client::new("http://localhost:8086", "test");
@@ -122,55 +121,23 @@ To communicate with InfluxDB, you can choose the HTTP backend to be used configu
   influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "reqwest-client-native-tls-vendored"] }
   ```
 
-* **[hyper][__link9]** (through surf), use this if you need tokio 0.2 compatibility
-  ```toml
-  influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "hyper-client"] }
-  ```
-
-* **[curl][__link10]**, using [libcurl][__link11]
-  ```toml
-  influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "curl-client"] }
-  ```
-
-* **[async-h1][__link12]** with native TLS (OpenSSL)
-  ```toml
-  influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "h1-client"] }
-  ```
-
-* **[async-h1][__link13]** with [rustls][__link14]
-  ```toml
-  influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "h1-client-rustls"] }
-  ```
-
-* WebAssembly’s `window.fetch`, via `web-sys` and **[wasm-bindgen][__link15]**
-  ```toml
-  influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "wasm-client"] }
-  ```
-
 ## License
 
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)][__link16]
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)][__link9]
 
 
 @ 2020-2024 Gero Gerke, msrd0 and [contributors].
 
  [contributors]: https://github.com/influxdb-rs/influxdb-rust/graphs/contributors
- [__cargo_doc2readme_dependencies_info]: ggGkYW0BYXSEGzJ_QpW55zB1G0S-TER-rIfLG2gXv8EYBG3jG1nuXXn-kdx-YXKEG1LaAVLASZMqG5J2qfpyCvbMG_Rohh5BobOmG0DqLv5454SZYWSBgmhpbmZsdXhkYmUwLjcuMg
+ [__cargo_doc2readme_dependencies_info]: ggGkYW0CYXSEGzJ_QpW55zB1G0S-TER-rIfLG2gXv8EYBG3jG1nuXXn-kdx-YXKEG8LHWNBBuXgSGz-2Lrx4E_kTG0bJiXb6A8zNG9GhXhvU8L0xYWSBgmhpbmZsdXhkYmUwLjcuMg
  [__link0]: https://github.com/influxdb-rs/influxdb-rust/blob/main/CONTRIBUTING.md
  [__link1]: https://github.com/influxdb-rs/influxdb-rust/blob/main/CODE_OF_CONDUCT.md
- [__link10]: https://github.com/alexcrichton/curl-rust
- [__link11]: https://curl.se/libcurl/
- [__link12]: https://github.com/http-rs/async-h1
- [__link13]: https://github.com/http-rs/async-h1
- [__link14]: https://github.com/ctz/rustls
- [__link15]: https://github.com/rustwasm/wasm-bindgen
- [__link16]: https://opensource.org/licenses/MIT
  [__link2]: https://github.com/influxdb-rs/influxdb-rust/blob/main/CHANGELOG.md
  [__link3]: https://github.com/influxdb-rs/influxdb-rust/blob/main/influxdb/Cargo.toml
  [__link4]: https://docs.rs/influxdb/0.7.2/influxdb/?search=integrations::serde_integration
  [__link5]: https://github.com/hyperium/hyper
  [__link6]: https://github.com/ctz/rustls
  [__link7]: https://github.com/hyperium/hyper
  [__link8]: https://github.com/hyperium/hyper
- [__link9]: https://github.com/hyperium/hyper
+ [__link9]: https://opensource.org/licenses/MIT
 

benches/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2018"
 chrono = { version = "0.4.11", features = ["serde"] }
 futures = "0.3.4"
 influxdb = { path = "../influxdb", features = ["derive"] }
-tokio = { version =  "0.2.22", features = ["macros", "rt-threaded", "sync"] }
+tokio = { version =  "1.38.0", features = ["macros", "rt-multi-thread", "sync"] }
 
 [[bench]]
 name = "client"

influxdb/Cargo.toml

@@ -16,35 +16,39 @@ repository.workspace = true
 [lints]
 workspace = true
 
+[[test]]
+name = "derive_integration_tests"
+path = "tests/derive_integration_tests.rs"
+required-features = ["chrono"]
+
 [dependencies]
-chrono = { version = "0.4.23", features = ["serde"], default-features = false }
+chrono = { version = "0.4.23", features = ["serde"], default-features = false, optional = true }
 futures-util = "0.3.17"
-http = "0.2.4"
+http = "1.3.1"
 influxdb_derive = { version = "0.5.1", optional = true }
 lazy-regex = "3.1"
-reqwest = { version = "0.11.4", default-features = false, optional = true }
-surf = { version = "2.2.0", default-features = false, optional = true }
+reqwest = { version = "0.12.23", default-features = false }
 serde = { version = "1.0.186", optional = true }
 serde_derive = { version = "1.0.186", optional = true }
 serde_json = { version = "1.0.48", optional = true }
-thiserror = "1.0"
+surf = { version = "2.2.0", default-features = false, optional = true }
+thiserror = "2.0.16"
+time = { version = "0.3.39", optional = true }
 
 [features]
 default = ["serde", "reqwest-client-rustls"]
 derive = ["dep:influxdb_derive"]
 serde = ["dep:serde", "dep:serde_derive", "dep:serde_json"]
 
 # http clients
-curl-client = ["surf", "surf/curl-client"]
-h1-client = ["surf", "surf/h1-client"]
-h1-client-rustls = ["surf", "surf/h1-client-rustls"]
-hyper-client = ["surf", "surf/hyper-client"]
-reqwest-client-rustls = ["reqwest", "reqwest/rustls-tls-webpki-roots"]
-reqwest-client-native-tls = ["reqwest", "reqwest/native-tls-alpn"]
-reqwest-client-native-tls-vendored = ["reqwest", "reqwest/native-tls-vendored"]
-wasm-client = ["surf", "surf/wasm-client"]
+reqwest-client-rustls = ["reqwest/rustls-tls-webpki-roots"]
+reqwest-client-native-tls = ["reqwest/native-tls-alpn"]
+reqwest-client-native-tls-vendored = ["reqwest/native-tls-vendored"]
+
+# etc
+time = ["dep:time"]
+chrono = ["dep:chrono"]
 
 [dev-dependencies]
-async-std = { version = "1.6.5", features = ["attributes", "tokio02", "tokio1"] }
-indoc = "1.0"
+indoc = "2.0.6"
 tokio = { version = "1.7", features = ["macros", "rt-multi-thread"] }

influxdb/src/client/mod.rs

@@ -16,14 +16,11 @@
 //! ```
 
 use futures_util::TryFutureExt;
-#[cfg(feature = "reqwest")]
 use reqwest::{Client as HttpClient, RequestBuilder, Response as HttpResponse};
 use std::collections::{BTreeMap, HashMap};
 use std::fmt::{self, Debug, Formatter};
-use std::sync::Arc;
-#[cfg(feature = "surf")]
-use surf::{Client as HttpClient, RequestBuilder, Response as HttpResponse};
 use std::marker::PhantomData;
+use std::sync::Arc;
 
 use crate::query::QueryType;
 use crate::Error;
@@ -181,7 +178,6 @@ impl<V> Client<V, reqwest::Client> {
         const BUILD_HEADER: &str = "X-Influxdb-Build";
         const VERSION_HEADER: &str = "X-Influxdb-Version";
 
-        #[cfg(feature = "reqwest")]
         let (build, version) = {
             let hdrs = res.headers();
             (
@@ -191,11 +187,6 @@ impl<V> Client<V, reqwest::Client> {
             )
         };
 
-        #[cfg(feature = "surf")]
-        let build = res.header(BUILD_HEADER).map(|value| value.as_str());
-        #[cfg(feature = "surf")]
-        let version = res.header(VERSION_HEADER).map(|value| value.as_str());
-
         Ok((build.unwrap().to_owned(), version.unwrap().to_owned()))
     }
 
@@ -214,7 +205,7 @@ impl<V> Client<V, reqwest::Client> {
     /// use influxdb::InfluxDbWriteable;
     /// use std::time::{SystemTime, UNIX_EPOCH};
     ///
-    /// # #[async_std::main]
+    /// # #[tokio::main]
     /// # async fn main() -> Result<(), influxdb::Error> {
     /// let start = SystemTime::now();
     /// let since_the_epoch = start
@@ -267,11 +258,6 @@ impl<V> Client<V, reqwest::Client> {
             }
         };
 
-        #[cfg(feature = "surf")]
-        let request_builder = request_builder.map_err(|err| Error::UrlConstructionError {
-            error: err.to_string(),
-        })?;
-
         let res = self
             .auth_if_needed(request_builder)
             .send()
@@ -281,12 +267,7 @@ impl<V> Client<V, reqwest::Client> {
             .await?;
         check_status(&res)?;
 
-        #[cfg(feature = "reqwest")]
         let body = res.text();
-        #[cfg(feature = "surf")]
-        let mut res = res;
-        #[cfg(feature = "surf")]
-        let body = res.body_string();
 
         let s = body.await.map_err(|_| Error::DeserializationError {
             error: "response could not be converted to UTF-8".into(),
@@ -329,7 +310,8 @@ mod tests {
 
     #[test]
     fn test_client_debug_redacted_password() {
-        let client: Client<InfluxVersion1> = Client::new("https://localhost:8086", "db").with_auth("user", "pass");
+        let client: Client<InfluxVersion1> =
+            Client::new("https://localhost:8086", "db").with_auth("user", "pass");
         let actual = format!("{client:#?}");
         let expected = indoc! { r#"
             Client {