feat: dagger-run support

Cargo.lock

@@ -99,7 +99,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide 0.6.2",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
 ]
@@ -168,18 +168,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.2.5"
+version = "4.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a1f23fa97e1d1641371b51f35535cb26959b8e27ab50d167a8b996b5bada819"
+checksum = "956ac1f6381d8d82ab4684768f89c0ea3afe66925ceadb4eeb3fc452ffc55d62"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.2.5"
+version = "4.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdc5d93c358224b4d6867ef1356d740de2303e9892edc06c5340daeccd96bab"
+checksum = "84080e799e54cff944f4b4a4b0e71630b0e0443b25b985175c7dddc1a859b749"
 dependencies = [
  "anstream",
  "anstyle",
@@ -267,25 +267,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -336,7 +317,7 @@ dependencies = [
 
 [[package]]
 name = "dagger-core"
-version = "0.2.11"
+version = "0.2.10"
 dependencies = [
  "async-trait",
  "base64",
@@ -353,32 +334,26 @@ dependencies = [
  "sha2",
  "tar",
  "tempfile",
- "thiserror",
  "tokio",
  "tracing",
- "tracing-opentelemetry",
  "tracing-subscriber",
 ]
 
 [[package]]
 name = "dagger-sdk"
-version = "0.2.22"
+version = "0.2.21"
 dependencies = [
  "dagger-core",
  "derive_builder",
  "eyre",
  "futures",
  "genco",
- "opentelemetry",
- "opentelemetry-jaeger",
  "pretty_assertions",
  "rand",
  "serde",
  "serde_json",
- "thiserror",
  "tokio",
  "tracing",
- "tracing-opentelemetry",
  "tracing-subscriber",
  "tracing-test",
 ]
@@ -418,19 +393,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "dashmap"
-version = "5.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
-dependencies = [
- "cfg-if",
- "hashbrown",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
-
 [[package]]
 name = "derive_builder"
 version = "0.12.0"
@@ -567,12 +529,12 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.26"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
+checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -957,12 +919,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "integer-encoding"
-version = "3.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02"
-
 [[package]]
 name = "io-lifetimes"
 version = "1.0.10"
@@ -1030,9 +986,9 @@ checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.6"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c"
+checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf"
 
 [[package]]
 name = "lock_api"
@@ -1083,15 +1039,6 @@ dependencies = [
  "adler",
 ]
 
-[[package]]
-name = "miniz_oxide"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
-dependencies = [
- "adler",
-]
-
 [[package]]
 name = "mio"
 version = "0.8.6"
@@ -1114,15 +1061,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "num-traits"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "num_cpus"
 version = "1.15.0"
@@ -1148,89 +1086,6 @@ version = "1.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
 
-[[package]]
-name = "opentelemetry"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e"
-dependencies = [
- "opentelemetry_api",
- "opentelemetry_sdk",
-]
-
-[[package]]
-name = "opentelemetry-jaeger"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e785d273968748578931e4dc3b4f5ec86b26e09d9e0d66b55adda7fce742f7a"
-dependencies = [
- "async-trait",
- "futures",
- "futures-executor",
- "once_cell",
- "opentelemetry",
- "opentelemetry-semantic-conventions",
- "thiserror",
- "thrift",
- "tokio",
-]
-
-[[package]]
-name = "opentelemetry-semantic-conventions"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b02e0230abb0ab6636d18e2ba8fa02903ea63772281340ccac18e0af3ec9eeb"
-dependencies = [
- "opentelemetry",
-]
-
-[[package]]
-name = "opentelemetry_api"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22"
-dependencies = [
- "fnv",
- "futures-channel",
- "futures-util",
- "indexmap",
- "js-sys",
- "once_cell",
- "pin-project-lite",
- "thiserror",
-]
-
-[[package]]
-name = "opentelemetry_sdk"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113"
-dependencies = [
- "async-trait",
- "crossbeam-channel",
- "dashmap",
- "fnv",
- "futures-channel",
- "futures-executor",
- "futures-util",
- "once_cell",
- "opentelemetry_api",
- "percent-encoding",
- "rand",
- "thiserror",
- "tokio",
- "tokio-stream",
-]
-
-[[package]]
-name = "ordered-float"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "output_vt100"
 version = "0.1.3"
@@ -1436,9 +1291,9 @@ checksum = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698"
 
 [[package]]
 name = "reqwest"
-version = "0.11.17"
+version = "0.11.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91"
+checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254"
 dependencies = [
  "base64",
  "bytes",
@@ -1498,9 +1353,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustix"
-version = "0.37.18"
+version = "0.37.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433"
+checksum = "d9b864d3c18a5785a05953adeed93e2dca37ed30f18e69bba9f30079d51f363f"
 dependencies = [
  "bitflags",
  "errno",
@@ -1738,28 +1593,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "threadpool"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
-dependencies = [
- "num_cpus",
-]
-
-[[package]]
-name = "thrift"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09678c4cdbb4eed72e18b7c2af1329c69825ed16fcbac62d083fc3e2b0590ff0"
-dependencies = [
- "byteorder",
- "integer-encoding",
- "log",
- "ordered-float",
- "threadpool",
-]
-
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@@ -1777,9 +1610,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.28.0"
+version = "1.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f"
+checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
 dependencies = [
  "autocfg",
  "bytes",
@@ -1791,14 +1624,14 @@ dependencies = [
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.1.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1816,22 +1649,11 @@ dependencies = [
  "webpki",
 ]
 
-[[package]]
-name = "tokio-stream"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
-]
-
 [[package]]
 name = "tokio-util"
-version = "0.7.8"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
+checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2"
 dependencies = [
  "bytes",
  "futures-core",
@@ -1902,20 +1724,6 @@ dependencies = [
  "tracing-core",
 ]
 
-[[package]]
-name = "tracing-opentelemetry"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de"
-dependencies = [
- "once_cell",
- "opentelemetry",
- "tracing",
- "tracing-core",
- "tracing-log",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "tracing-subscriber"
 version = "0.3.17"

Cargo.toml

@@ -18,19 +18,8 @@ color-eyre = "0.6.2"
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.93"
 tokio = { version = "1.25.0", features = ["full"] }
-tracing = { version = "0.1.37", features = ["log", "std"] }
+tracing = { version = "0.1.37", features = ["log"] }
-
+tracing-subscriber = { version = "0.3.16", features = [
-tracing-subscriber = { version = "0.3.17", features = [
   "tracing-log",
   "tracing",
-  "registry",
-  "std",
 ] }
-tracing-opentelemetry = { version = "0.18.0" }
-opentelemetry = { version = "0.18.0", default-features = false, features = [
-  "trace",
-  "rt-tokio",
-] }
-opentelemetry-jaeger = { version = "0.17.0", features = ["rt-tokio"] }
-
-thiserror = "1.0.40"

README.md

@@ -4,14 +4,14 @@ A dagger sdk written in rust for rust.
 
 ## Plan for next release
 
-- [x] Introduce [thiserror](https://docs.rs/thiserror/latest/thiserror/) for
+- [ ] Introduce [thiserror](https://docs.rs/thiserror/latest/thiserror/) for
       better errors
-- [x] Add compatibility with `dagger run`
+- [ ] Add compatibility with `dagger run`
 - [ ] Add open telemetry tracing to the sdk
 - [ ] Remove `id().await?` from passing to other dagger graphs, this should make
       the design much cleaner
 - [ ] Start MkBook on how to actually use the sdk
-- [x] Update to newest upstream release
+- [ ] Update to newest upstream release
 - [ ] Fix bugs
   - [x] Run in conjunction with golang and other sdks
   - [ ] Stabilize the initial `Arc<Query>` model into something more extensible

ci/Cargo.toml

@@ -8,6 +8,6 @@ edition = "2021"
 [dependencies]
 clap = "4.1.6"
 color-eyre = "0.6.2"
-dagger-sdk = { path = "../crates/dagger-sdk/", version = "^0.2.22" }
+dagger-sdk = { path = "../crates/dagger-sdk/", version = "^0.2.21" }
 eyre = "0.6.8"
 tokio = { version = "1.25.0", features = ["full"] }

crates/dagger-codegen/src/lib.rs

@@ -13,7 +13,7 @@ use self::generator::DynGenerator;
 fn set_schema_parents(mut schema: Schema) -> Schema {
     for t in schema.types.as_mut().into_iter().flatten().flatten() {
         let t_parent = t.full_type.clone();
-        for field in t.full_type.fields.as_mut().into_iter().flatten() {
+        for mut field in t.full_type.fields.as_mut().into_iter().flatten() {
             field.parent_type = Some(t_parent.clone());
         }
     }

crates/dagger-codegen/src/rust/functions.rs

@@ -43,7 +43,6 @@ pub fn format_function(funcs: &CommonFunctions, field: &FullTypeFields) -> Optio
     });
 
     let signature = quote! {
-        #[tracing::instrument(skip_all)]
         pub $(is_async) fn $(field.name.pipe(|n | format_struct_name(n)))
     };
 
@@ -236,10 +235,8 @@ fn render_output_type(funcs: &CommonFunctions, type_ref: &TypeRef) -> rust::Toke
         };
     }
 
-    let dagger_error = rust::import("crate::errors", "DaggerError");
-
     quote! {
-        Result<$output_type, $dagger_error>
+        eyre::Result<$output_type>
     }
 }
 

crates/dagger-core/CHANGELOG.md

@@ -5,33 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## v0.2.11 (2023-04-29)
-
-### New Features
-
- - <csr-id-2a29a66217fa4d6c530ea1ce670c8836383e7051/> dagger-run support
- - <csr-id-eb7470c604169d1a15976078c0889d5cc7011257/> update to dagger-5.1
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 2 commits contributed to the release.
- - 4 days passed between releases.
- - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - dagger-run support ([`2a29a66`](https://github.com/kjuulh/dagger-sdk/commit/2a29a66217fa4d6c530ea1ce670c8836383e7051))
-    - update to dagger-5.1 ([`eb7470c`](https://github.com/kjuulh/dagger-sdk/commit/eb7470c604169d1a15976078c0889d5cc7011257))
-</details>
-
 ## v0.2.10 (2023-04-25)
 
 ### Bug Fixes
@@ -42,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <csr-read-only-do-not-edit/>
 
- - 2 commits contributed to the release.
+ - 1 commit contributed to the release.
  - 21 days passed between releases.
  - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
  - 0 issues like '(#ID)' were seen in commit messages
@@ -54,7 +27,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <details><summary>view details</summary>
 
  * **Uncategorized**
-    - Release dagger-core v0.2.10 ([`8011c42`](https://github.com/kjuulh/dagger-sdk/commit/8011c42dc077d101b1bccaf231fac17636dd249d))
     - delete other files/folder in downloads: #57 ([`9d3c21d`](https://github.com/kjuulh/dagger-sdk/commit/9d3c21d16b4a64eb7a7b1888365a4c4ea56d7225))
 </details>
 

crates/dagger-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dagger-core"
-version = "0.2.11"
+version = "0.2.10"
 edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"
@@ -16,8 +16,6 @@ serde_json = { workspace = true }
 tokio = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
-thiserror.workspace = true
-tracing-opentelemetry = { workspace = true, optional = true }
 
 base64 = "0.21.0"
 dirs = "4.0.0"
@@ -38,8 +36,3 @@ sha2 = "0.10.6"
 tar = "0.4.38"
 tempfile = "3.3.0"
 async-trait = "0.1.67"
-
-
-[features]
-default = []
-otel = ["dep:tracing-opentelemetry"]

crates/dagger-core/src/gql_client.rs

@@ -15,7 +15,7 @@ pub struct GraphQLError {
 #[derive(Deserialize, Debug, Clone)]
 #[allow(dead_code)]
 pub struct GraphQLErrorMessage {
-    pub message: String,
+    message: String,
     locations: Option<Vec<GraphQLErrorLocation>>,
     extensions: Option<HashMap<String, String>>,
     path: Option<Vec<GraphQLErrorPathParam>>,

crates/dagger-core/src/graphql_client.rs

@@ -4,14 +4,13 @@ use std::sync::Arc;
 use async_trait::async_trait;
 use base64::engine::general_purpose;
 use base64::Engine;
-use thiserror::Error;
 
 use crate::connect_params::ConnectParams;
 use crate::gql_client::{ClientConfig, GQLClient};
 
 #[async_trait]
 pub trait GraphQLClient {
-    async fn query(&self, query: &str) -> Result<Option<serde_json::Value>, GraphQLError>;
+    async fn query(&self, query: &str) -> eyre::Result<Option<serde_json::Value>>;
 }
 
 pub type DynGraphQLClient = Arc<dyn GraphQLClient + Send + Sync>;
@@ -41,50 +40,13 @@ impl DefaultGraphQLClient {
 
 #[async_trait]
 impl GraphQLClient for DefaultGraphQLClient {
-    async fn query(&self, query: &str) -> Result<Option<serde_json::Value>, GraphQLError> {
+    async fn query(&self, query: &str) -> eyre::Result<Option<serde_json::Value>> {
-        let res: Option<serde_json::Value> =
+        let res: Option<serde_json::Value> = self
-            self.client.query(&query).await.map_err(map_graphql_error)?;
+            .client
+            .query(&query)
+            .await
+            .map_err(|r| eyre::anyhow!(r.to_string()))?;
 
         return Ok(res);
     }
 }
-
-fn map_graphql_error(gql_error: crate::gql_client::GraphQLError) -> GraphQLError {
-    let message = gql_error.message().to_string();
-    let json = gql_error.json();
-
-    if let Some(json) = json {
-        if !json.is_empty() {
-            return GraphQLError::DomainError {
-                message,
-                fields: GraphqlErrorMessages(json.into_iter().map(|e| e.message).collect()),
-            };
-        }
-    }
-
-    GraphQLError::HttpError(message)
-}
-
-#[derive(Error, Debug)]
-pub enum GraphQLError {
-    #[error("http error: {0}")]
-    HttpError(String),
-    #[error("domain error:\n{message}\n{fields}")]
-    DomainError {
-        message: String,
-        fields: GraphqlErrorMessages,
-    },
-}
-
-#[derive(Debug, Clone)]
-pub struct GraphqlErrorMessages(Vec<String>);
-
-impl std::fmt::Display for GraphqlErrorMessages {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        for error in self.0.iter() {
-            f.write_fmt(format_args!("{error}\n"))?;
-        }
-
-        Ok(())
-    }
-}

crates/dagger-sdk/CHANGELOG.md

@@ -6,37 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## v0.2.22 (2023-04-29)
-
-### New Features
-
- - <csr-id-2a29a66217fa4d6c530ea1ce670c8836383e7051/> dagger-run support
- - <csr-id-eb7470c604169d1a15976078c0889d5cc7011257/> update to dagger-5.1
-
-### Commit Statistics
-
-<csr-read-only-do-not-edit/>
-
- - 2 commits contributed to the release.
- - 4 days passed between releases.
- - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
- - 0 issues like '(#ID)' were seen in commit messages
-
-### Commit Details
-
-<csr-read-only-do-not-edit/>
-
-<details><summary>view details</summary>
-
- * **Uncategorized**
-    - dagger-run support ([`2a29a66`](https://github.com/kjuulh/dagger-sdk/commit/2a29a66217fa4d6c530ea1ce670c8836383e7051))
-    - update to dagger-5.1 ([`eb7470c`](https://github.com/kjuulh/dagger-sdk/commit/eb7470c604169d1a15976078c0889d5cc7011257))
-</details>
-
 ## v0.2.21 (2023-04-25)
 
-<csr-id-09881ee39bdfb9201d104e4679a51c3b76b5fe27/>
-
 ### Chore
 
  - <csr-id-09881ee39bdfb9201d104e4679a51c3b76b5fe27/> add new dagger-core-version
@@ -45,7 +16,7 @@ and this project adheres to
 
 <csr-read-only-do-not-edit/>
 
- - 2 commits contributed to the release.
+ - 1 commit contributed to the release.
  - 21 days passed between releases.
  - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
  - 0 issues like '(#ID)' were seen in commit messages
@@ -57,7 +28,6 @@ and this project adheres to
 <details><summary>view details</summary>
 
  * **Uncategorized**
-    - Release dagger-sdk v0.2.21 ([`6937ef0`](https://github.com/kjuulh/dagger-sdk/commit/6937ef0ace797315013513aa7e2af39a9206a738))
     - add new dagger-core-version ([`09881ee`](https://github.com/kjuulh/dagger-sdk/commit/09881ee39bdfb9201d104e4679a51c3b76b5fe27))
 </details>
 

crates/dagger-sdk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dagger-sdk"
-version = "0.2.22"
+version = "0.2.21"
 edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"
@@ -11,7 +11,7 @@ publish = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dagger-core = { workspace = true, version = "^0.2.11" }
+dagger-core = { workspace = true, version = "0.2.10" }
 
 eyre = { workspace = true }
 tokio = { workspace = true }
@@ -19,10 +19,6 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 tracing.workspace = true
 tracing-subscriber.workspace = true
-thiserror.workspace = true
-tracing-opentelemetry = { workspace = true, optional = true }
-opentelemetry = { workspace = true, optional = true }
-opentelemetry-jaeger = { workspace = true, optional = true }
 
 futures = "0.3.28"
 derive_builder = "0.12.0"
@@ -32,11 +28,3 @@ pretty_assertions = "1.3.0"
 rand = "0.8.5"
 genco = "0.17.3"
 tracing-test = "0.2.4"
-
-[features]
-default = []
-otel = [
-  "dep:tracing-opentelemetry",
-  "dep:opentelemetry",
-  "dep:opentelemetry-jaeger",
-]

crates/dagger-sdk/examples/caching/main.rs

@@ -1,6 +1,5 @@
 use rand::Rng;
 
-#[tracing::instrument]
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
     let client = dagger_sdk::connect().await?;

crates/dagger-sdk/examples/tracing/app/.gitignore

@@ -1,25 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-build-*

crates/dagger-sdk/examples/tracing/app/README.md

@@ -1,17 +0,0 @@
-# React Build
-
-This is based on the [Getting Started guide for Nodejs](https://docs.dagger.io/sdk/nodejs/783645/get-started#step-5-test-against-multiple-nodejs-versions)
-
-A simple react app is created with `create-react-app` which is built and tested by `build.js` or `build.ts`.
-
-Run:
-
-`npm install`
-
-and then:
-
-`node --loader ts-node/esm ./build.ts`
-
-or
-
-`node ./build.js`

crates/dagger-sdk/examples/tracing/app/package.json

@@ -1,48 +0,0 @@
-{
-  "name": "react-build",
-  "version": "0.1.0",
-  "private": true,
-  "dependencies": {
-    "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/react": "^13.4.0",
-    "@testing-library/user-event": "^13.5.0",
-    "@types/jest": "^27.5.2",
-    "@types/node": "^16.18.6",
-    "@types/react": "^18.0.26",
-    "@types/react-dom": "^18.0.9",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-scripts": "5.0.1",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.9.3",
-    "web-vitals": "^2.1.4"
-  },
-  "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject"
-  },
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ]
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  },
-  "type": "module",
-  "devDependencies": {
-    "@dagger.io/dagger": "^0.3.2"
-  }
-}

crates/dagger-sdk/examples/tracing/app/public/index.html

@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>React App</title>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-  </body>
-</html>

crates/dagger-sdk/examples/tracing/app/public/manifest.json

@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}

crates/dagger-sdk/examples/tracing/app/public/robots.txt

@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:

crates/dagger-sdk/examples/tracing/app/src/App.css

@@ -1,38 +0,0 @@
-.App {
-  text-align: center;
-}
-
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
-}
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}

crates/dagger-sdk/examples/tracing/app/src/App.test.tsx

@@ -1,9 +0,0 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import App from './App';
-
-test('renders learn react link', () => {
-  render(<App />);
-  const linkElement = screen.getByText(/learn react/i);
-  expect(linkElement).toBeInTheDocument();
-});

crates/dagger-sdk/examples/tracing/app/src/App.tsx

@@ -1,26 +0,0 @@
-import React from 'react';
-import logo from './logo.svg';
-import './App.css';
-
-function App() {
-  return (
-    <div className="App">
-      <header className="App-header">
-        <img src={logo} className="App-logo" alt="logo" />
-        <p>
-          Edit <code>src/App.tsx</code> and save to reload.
-        </p>
-        <a
-          className="App-link"
-          href="https://reactjs.org"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Learn React
-        </a>
-      </header>
-    </div>
-  );
-}
-
-export default App;

crates/dagger-sdk/examples/tracing/app/src/index.css

@@ -1,13 +0,0 @@
-body {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
-}

crates/dagger-sdk/examples/tracing/app/src/index.tsx

@@ -1,19 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom/client';
-import './index.css';
-import App from './App';
-import reportWebVitals from './reportWebVitals';
-
-const root = ReactDOM.createRoot(
-  document.getElementById('root') as HTMLElement
-);
-root.render(
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>
-);
-
-// If you want to start measuring performance in your app, pass a function
-// to log results (for example: reportWebVitals(console.log))
-// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
-reportWebVitals();

crates/dagger-sdk/examples/tracing/app/src/logo.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>

crates/dagger-sdk/examples/tracing/app/src/react-app-env.d.ts

@@ -1 +0,0 @@
-/// <reference types="react-scripts" />

crates/dagger-sdk/examples/tracing/app/src/reportWebVitals.ts

@@ -1,15 +0,0 @@
-import { ReportHandler } from 'web-vitals';
-
-const reportWebVitals = (onPerfEntry?: ReportHandler) => {
-  if (onPerfEntry && onPerfEntry instanceof Function) {
-    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
-      getCLS(onPerfEntry);
-      getFID(onPerfEntry);
-      getFCP(onPerfEntry);
-      getLCP(onPerfEntry);
-      getTTFB(onPerfEntry);
-    });
-  }
-};
-
-export default reportWebVitals;

crates/dagger-sdk/examples/tracing/app/src/setupTests.ts

@@ -1,5 +0,0 @@
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom';

crates/dagger-sdk/examples/tracing/app/tsconfig.json

@@ -1,26 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "noFallthroughCasesInSwitch": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "jsx": "react-jsx"
-  },
-  "include": [
-    "src"
-  ]
-}

crates/dagger-sdk/examples/tracing/main.rs

@@ -1,54 +0,0 @@
-#[cfg(feature = "otel")]
-use dagger_sdk::HostDirectoryOpts;
-#[cfg(feature = "otel")]
-use opentelemetry::global;
-#[cfg(feature = "otel")]
-use tracing::Level;
-
-#[cfg(not(feature = "otel"))]
-fn main() {}
-
-#[cfg(feature = "otel")]
-#[tracing::instrument]
-#[tokio::main]
-async fn main() -> eyre::Result<()> {
-    let client = dagger_sdk::connect().await?;
-    global::set_text_map_propagator(opentelemetry_jaeger::Propagator::new());
-    let span = tracing::span!(Level::INFO, "start main");
-    let _enter = span.enter();
-
-    let host_source_dir = client.host().directory_opts(
-        "examples/build-the-application/app",
-        HostDirectoryOpts {
-            exclude: Some(vec!["node_modules".into(), "ci/".into()]),
-            include: None,
-        },
-    );
-
-    let source = client
-        .container()
-        .from("node:16")
-        .with_mounted_directory("/src", host_source_dir.id().await?);
-
-    let runner = source
-        .with_workdir("/src")
-        .with_exec(vec!["npm", "install"]);
-
-    let test = runner.with_exec(vec!["npm", "test", "--", "--watchAll=false"]);
-
-    let build_dir = test
-        .with_exec(vec!["npm", "run", "build"])
-        .directory("./build");
-
-    let _ = build_dir.export("./build");
-
-    let entries = build_dir.entries().await;
-
-    println!("build dir contents: \n {:?}", entries);
-
-    drop(_enter);
-
-    global::shutdown_tracer_provider(); // sending remaining spans
-
-    Ok(())
-}

crates/dagger-sdk/examples/tracing/start-jaeger.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -e
-
-docker run --name jaeger -d -p6831:6831/udp -p6832:6832/udp -p16686:16686 jaegertracing/all-in-one:latest

crates/dagger-sdk/src/client.rs

@@ -5,39 +5,20 @@ use dagger_core::graphql_client::DefaultGraphQLClient;
 use dagger_core::config::Config;
 use dagger_core::engine::Engine as DaggerEngine;
 
-use crate::errors::ConnectError;
 use crate::gen::Query;
-use crate::logging::{StdLogger, TracingLogger};
+use crate::logging::StdLogger;
 use crate::querybuilder::query;
 
 pub type DaggerConn = Arc<Query>;
 
-pub async fn connect() -> Result<DaggerConn, ConnectError> {
+pub async fn connect() -> eyre::Result<DaggerConn> {
-    let cfg = if cfg!(feature = "otel") {
+    let cfg = Config::new(None, None, None, None, Some(Arc::new(StdLogger::default())));
-        let cfg = Config::new(
-            None,
-            None,
-            None,
-            None,
-            Some(Arc::new(TracingLogger::default())),
-        );
-
-        #[cfg(feature = "otel")]
-        crate::logging::otel_logging().map_err(ConnectError::FailedToInstallOtelTracer)?;
-
-        cfg
-    } else {
-        Config::new(None, None, None, None, Some(Arc::new(StdLogger::default())))
-    };
 
     connect_opts(cfg).await
 }
 
-pub async fn connect_opts(cfg: Config) -> Result<DaggerConn, ConnectError> {
+pub async fn connect_opts(cfg: Config) -> eyre::Result<DaggerConn> {
-    let (conn, proc) = DaggerEngine::new()
+    let (conn, proc) = DaggerEngine::new().start(&cfg).await?;
-        .start(&cfg)
-        .await
-        .map_err(ConnectError::FailedToConnect)?;
 
     Ok(Arc::new(Query {
         proc: proc.map(|p| Arc::new(p)),

crates/dagger-sdk/src/errors.rs

@@ -1,29 +0,0 @@
-use thiserror::Error;
-
-#[derive(Error, Debug)]
-pub enum ConnectError {
-    #[error("failed to connect to dagger engine")]
-    FailedToConnect(#[source] eyre::Error),
-    #[error("failed to install otel: {0}")]
-    FailedToInstallOtelTracer(#[source] eyre::Error),
-}
-
-#[derive(Error, Debug)]
-pub enum DaggerError {
-    #[error("failed to build dagger internal graph")]
-    Build(#[source] eyre::Error),
-    #[error("failed to parse input type")]
-    Serialize(#[source] eyre::Error),
-    #[error("failed to query dagger engine: {0}")]
-    Query(#[source] dagger_core::graphql_client::GraphQLError),
-    #[error("failed to unpack response")]
-    Unpack(#[source] DaggerUnpackError),
-}
-
-#[derive(Error, Debug)]
-pub enum DaggerUnpackError {
-    #[error("Too many nested objects inside graphql response")]
-    TooManyNestedObjects,
-    #[error("failed to deserialize response")]
-    Deserialize(#[source] serde_json::Error),
-}

crates/dagger-sdk/src/lib.rs

@@ -1,7 +1,6 @@
 #![deny(warnings)]
 
 mod client;
-pub mod errors;
 mod gen;
 pub mod logging;
 mod querybuilder;

crates/dagger-sdk/src/logging.rs

@@ -6,29 +6,6 @@ pub fn default_logging() -> eyre::Result<()> {
     Ok(())
 }
 
-#[cfg(feature = "otel")]
-pub fn otel_logging() -> eyre::Result<()> {
-    use tracing_subscriber::layer::SubscriberExt;
-    use tracing_subscriber::Registry;
-
-    std::env::set_var("OTEL_BSP_MAX_EXPORT_BATCH_SIZE", "25");
-
-    let tracer = opentelemetry_jaeger::new_agent_pipeline()
-        .with_service_name("dagger_sdk")
-        .with_max_packet_size(9216)
-        .with_auto_split_batch(true)
-        .install_batch(opentelemetry::runtime::Tokio)?;
-
-    let telemetry = tracing_opentelemetry::layer().with_tracer(tracer);
-
-    let subscriber = Registry::default().with(telemetry);
-
-    if let Err(e) = tracing::subscriber::set_global_default(subscriber) {
-        tracing::error!("failed to install global tracer: {}", e)
-    }
-    Ok(())
-}
-
 pub struct StdLogger {}
 
 impl Default for StdLogger {
@@ -61,13 +38,13 @@ impl Default for TracingLogger {
 
 impl Logger for TracingLogger {
     fn stdout(&self, output: &str) -> eyre::Result<()> {
-        tracing::info!(output = output, "dagger_sdk");
+        tracing::info!(output = output, "dagger-sdk");
 
         Ok(())
     }
 
     fn stderr(&self, output: &str) -> eyre::Result<()> {
-        tracing::warn!(output = output, "dagger_sdk");
+        tracing::warn!(output = output, "dagger-sdk");
 
         Ok(())
     }

crates/dagger-sdk/src/querybuilder.rs

@@ -1,10 +1,8 @@
 use std::{collections::HashMap, ops::Add, sync::Arc};
 
 use dagger_core::graphql_client::DynGraphQLClient;
+use eyre::Context;
 use serde::{Deserialize, Serialize};
-use tracing::instrument;
-
-use crate::errors::{DaggerError, DaggerUnpackError};
 
 pub fn query() -> Selection {
     Selection::default()
@@ -31,7 +29,6 @@ pub struct Selection {
 }
 
 impl Selection {
-    #[instrument(skip(self))]
     pub fn select_with_alias(&self, alias: &str, name: &str) -> Selection {
         Self {
             name: Some(name.to_string()),
@@ -41,7 +38,6 @@ impl Selection {
         }
     }
 
-    #[instrument(skip(self))]
     pub fn select(&self, name: &str) -> Selection {
         Self {
             name: Some(name.to_string()),
@@ -51,7 +47,6 @@ impl Selection {
         }
     }
 
-    #[instrument(skip(self, value))]
     pub fn arg<S>(&self, name: &str, value: S) -> Selection
     where
         S: Serialize,
@@ -74,7 +69,6 @@ impl Selection {
         s
     }
 
-    #[instrument(skip(self, value))]
     pub fn arg_enum<S>(&self, name: &str, value: S) -> Selection
     where
         S: Serialize,
@@ -98,8 +92,7 @@ impl Selection {
         s
     }
 
-    #[instrument(skip(self))]
+    pub fn build(&self) -> eyre::Result<String> {
-    pub fn build(&self) -> Result<String, DaggerError> {
         let mut fields = vec!["query".to_string()];
 
         for sel in self.path() {
@@ -124,16 +117,17 @@ impl Selection {
         Ok(fields.join("{") + &"}".repeat(fields.len() - 1))
     }
 
-    #[instrument(skip(self, gql_client))]
+    pub async fn execute<D>(&self, gql_client: DynGraphQLClient) -> eyre::Result<D>
-    pub async fn execute<D>(&self, gql_client: DynGraphQLClient) -> Result<D, DaggerError>
     where
         D: for<'de> Deserialize<'de>,
     {
         let query = self.build()?;
 
+        tracing::trace!(query = query.as_str(), "dagger-query");
+
         let resp: Option<serde_json::Value> = match gql_client.query(&query).await {
             Ok(r) => r,
-            Err(e) => return Err(DaggerError::Query(e)),
+            Err(e) => eyre::bail!(e),
         };
 
         let resp: Option<D> = self.unpack_resp(resp)?;
@@ -141,7 +135,6 @@ impl Selection {
         Ok(resp.unwrap())
     }
 
-    #[instrument(skip(self))]
     fn path(&self) -> Vec<Selection> {
         let mut selections: Vec<Selection> = vec![];
         let mut cur = self;
@@ -158,11 +151,7 @@ impl Selection {
         selections
     }
 
-    #[instrument(skip(self, resp))]
+    pub(crate) fn unpack_resp<D>(&self, resp: Option<serde_json::Value>) -> eyre::Result<Option<D>>
-    pub(crate) fn unpack_resp<D>(
-        &self,
-        resp: Option<serde_json::Value>,
-    ) -> Result<Option<D>, DaggerError>
     where
         D: for<'de> Deserialize<'de>,
     {
@@ -172,24 +161,21 @@ impl Selection {
         }
     }
 
-    #[instrument(skip(self, r))]
+    fn unpack_resp_value<D>(&self, r: serde_json::Value) -> eyre::Result<D>
-    fn unpack_resp_value<D>(&self, r: serde_json::Value) -> Result<D, DaggerError>
     where
         D: for<'de> Deserialize<'de>,
     {
         if let Some(o) = r.as_object() {
             let keys = o.keys();
             if keys.len() != 1 {
-                return Err(DaggerError::Unpack(DaggerUnpackError::TooManyNestedObjects));
+                eyre::bail!("too many nested objects inside graphql response")
             }
 
             let first = keys.into_iter().next().unwrap();
             return self.unpack_resp_value(o.get(first).unwrap().clone());
         }
 
-        serde_json::from_value::<D>(r)
+        serde_json::from_value::<D>(r).context("could not deserialize response")
-            .map_err(DaggerUnpackError::Deserialize)
-            .map_err(DaggerError::Unpack)
     }
 }
 

crates/dagger-sdk/tests/mod.rs

@@ -111,9 +111,9 @@ async fn test_err_message() {
     assert_eq!(alpine.is_err(), true);
     let err = alpine.expect_err("Tests expect err");
 
-    let error_msg = r#"failed to query dagger engine: domain error:
+    let error_msg = r#"
-Look at json field for more details
+GQLClient Error: Look at json field for more details
-pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
+Message: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
 "#;
 
     assert_eq!(err.to_string().as_str(), error_msg);