chore: disable all dependencies (we need a better approach)

🚀 chore(Cargo.toml): update dependencies and add optional tracing-opentelemetry feature
✨ feat(Cargo.toml): add opentelemetry and opentelemetry-jaeger dependencies as optional features
🚀 chore(Cargo.toml): update tracing and tracing-subscriber dependencies
The dependencies in the Cargo.toml file have been updated to their latest versions. The tracing-opentelemetry feature has been added as an optional feature to the dagger-core and dagger-sdk crates. The opentelemetry and opentelemetry-jaeger dependencies have been added as optional features to the dagger-sdk crate. This allows for the use of OpenTelemetry tracing in the application.

.github/workflows/ci.yaml

@@ -8,7 +8,6 @@ env:
   CARGO_TERM_COLOR: always
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-  _EXPERIMENTAL_DAGGER_CACHE_CONFIG: type=gha;mode=max
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -28,5 +27,10 @@ jobs:
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2.0.0
+      -
+        name: Expose GitHub Runtime
+        uses: crazy-max/ghaction-github-runtime@v2
       - name: Run dagger [CI]
-        run: cargo run -p ci -- pr
+        run: |
+          export _EXPERIMENTAL_DAGGER_CACHE_CONFIG="type=gha,mode=max,url=$ACTIONS_CACHE_URL,token=$ACTIONS_RUNTIME_TOKEN"
+          cargo run -p ci -- pr

Cargo.toml

@@ -9,7 +9,7 @@ members = [
 
 [workspace.dependencies]
 dagger-codegen = { path = "crates/dagger-codegen", version = "^0.2.5" }
-dagger-core = { path = "crates/dagger-core", version = "^0.2.8" }
+dagger-core = { path = "crates/dagger-core", version = "^0.2.10" }
 dagger-bootstrap = { path = "crates/dagger-bootstrap", version = "^0.2.10" }
 dagger-sdk = { path = "crates/dagger-sdk", version = "^0.2.19" }
 
@@ -18,8 +18,19 @@ 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"] }
-tracing-subscriber = { version = "0.3.16", features = [
+tracing = { version = "0.1.37", features = ["log", "std"] }
+
+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

@@ -2,6 +2,20 @@
 
 A dagger sdk written in rust for rust.
 
+## Plan for next release
+
+- [x] Introduce [thiserror](https://docs.rs/thiserror/latest/thiserror/) for
+      better errors
+- [x] 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
+- [ ] Fix bugs
+  - [x] Run in conjunction with golang and other sdks
+  - [ ] Stabilize the initial `Arc<Query>` model into something more extensible
+
 ## Examples
 
 See [examples](./crates/dagger-sdk/examples/)

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.20" }
+dagger-sdk = { path = "../crates/dagger-sdk/", version = "^0.2.22" }
 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 mut field in t.full_type.fields.as_mut().into_iter().flatten() {
+        for 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,6 +43,7 @@ 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)))
     };
 
@@ -235,8 +236,10 @@ fn render_output_type(funcs: &CommonFunctions, type_ref: &TypeRef) -> rust::Toke
         };
     }
 
+    let dagger_error = rust::import("crate::errors", "DaggerError");
+
     quote! {
-        eyre::Result<$output_type>
+        Result<$output_type, $dagger_error>
     }
 }
 

crates/dagger-codegen/src/rust/templates/object_tmpl.rs

@@ -18,7 +18,7 @@ pub fn render_object(funcs: &CommonFunctions, t: &FullType) -> eyre::Result<rust
     Ok(quote! {
         #[derive(Clone)]
         pub struct $(t.name.pipe(|s| format_name(s))) {
-            pub proc: $arc<$child>,
+            pub proc: Option<$arc<$child>>,
             pub selection: $selection,
             pub graphql_client: $graphql_client
         }

crates/dagger-core/CHANGELOG.md

@@ -5,8 +5,63 @@ 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
+
+ - <csr-id-9d3c21d16b4a64eb7a7b1888365a4c4ea56d7225/> delete other files/folder in downloads: #57
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 2 commits 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
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<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>
+
 ## v0.2.9 (2023-04-03)
 
+<csr-id-b55bcc159ffc6a61ecfcc5e3aa3de00a1a73b5b8/>
+
 ### New Features
 
  - <csr-id-114f411cdb0e1043071c0ccc1768d344f78d4fcb/> with 0.4.2
@@ -27,7 +82,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <csr-read-only-do-not-edit/>
 
- - 7 commits contributed to the release over the course of 19 calendar days.
+ - 8 commits contributed to the release over the course of 19 calendar days.
  - 23 days passed between releases.
  - 7 commits were understood as [conventional](https://www.conventionalcommits.org).
  - 3 unique issues were worked on: [#46](https://github.com/kjuulh/dagger-sdk/issues/46), [#48](https://github.com/kjuulh/dagger-sdk/issues/48), [#51](https://github.com/kjuulh/dagger-sdk/issues/51)
@@ -45,6 +100,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
  * **[#51](https://github.com/kjuulh/dagger-sdk/issues/51)**
     - add musl ci ([`b094ae4`](https://github.com/kjuulh/dagger-sdk/commit/b094ae4f539a880b0bde12841b7db1fbfcc0f123))
  * **Uncategorized**
+    - Release dagger-core v0.2.9, dagger-sdk v0.2.20 ([`f82075c`](https://github.com/kjuulh/dagger-sdk/commit/f82075c23808073d9500df63c1cd347cd9b99cef))
     - with 0.4.2 ([`114f411`](https://github.com/kjuulh/dagger-sdk/commit/114f411cdb0e1043071c0ccc1768d344f78d4fcb))
     - rename projects to point to github/kjuulh/dagger-sdk ([`384294b`](https://github.com/kjuulh/dagger-sdk/commit/384294b39038123b02c406a1038105b111c3b9be))
     - with loggers ([`79d931e`](https://github.com/kjuulh/dagger-sdk/commit/79d931e908c58a0464fd9cf7d6ef02eb50f14c23))

crates/dagger-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dagger-core"
-version = "0.2.9"
+version = "0.2.11"
 edition = "2021"
 readme = "README.md"
 license-file = "LICENSE.MIT"
@@ -16,6 +16,8 @@ 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"
@@ -36,3 +38,8 @@ 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/cli_session.rs

@@ -89,6 +89,7 @@ impl InnerCliSession {
             while let Ok(Some(line)) = stdout_bufr.next_line().await {
                 if let Ok(conn) = serde_json::from_str::<ConnectParams>(&line) {
                     sender.send(conn).await.unwrap();
+                    continue;
                 }
 
                 if let Some(logger) = &logger {

crates/dagger-core/src/downloader.rs

@@ -135,20 +135,6 @@ impl Downloader {
                 .context("failed to download CLI from archive")?;
         }
 
-        for file in self.cache_dir()?.read_dir()? {
-            if let Ok(entry) = file {
-                let path = entry.path();
-                if path != cli_bin_path {
-                    tracing::debug!(
-                        path = path.display().to_string(),
-                        cli_bin_path = cli_bin_path.display().to_string(),
-                        "deleting existing dagger-engine"
-                    );
-                    std::fs::remove_file(path)?;
-                }
-            }
-        }
-
         Ok(cli_bin_path)
     }
 

crates/dagger-core/src/engine.rs

@@ -23,10 +23,25 @@ impl Engine {
     pub async fn start(
         &self,
         cfg: &Config,
-    ) -> eyre::Result<(ConnectParams, tokio::process::Child)> {
+    ) -> eyre::Result<(ConnectParams, Option<tokio::process::Child>)> {
         tracing::info!("starting dagger-engine");
 
-        // TODO: Add from existing session as well
-        self.from_cli(cfg).await
+        if let Ok(conn) = self.from_session_env().await {
+            return Ok((conn, None));
+        }
+
+        let (conn, proc) = self.from_cli(cfg).await?;
+
+        Ok((conn, Some(proc)))
+    }
+
+    async fn from_session_env(&self) -> eyre::Result<ConnectParams> {
+        let port = std::env::var("DAGGER_SESSION_PORT").map(|p| p.parse::<u64>())??;
+        let token = std::env::var("DAGGER_SESSION_TOKEN")?;
+
+        Ok(ConnectParams {
+            port,
+            session_token: token,
+        })
     }
 }

crates/dagger-core/src/gql_client.rs

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

crates/dagger-core/src/graphql_client.rs

@@ -4,13 +4,14 @@ 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) -> eyre::Result<Option<serde_json::Value>>;
+    async fn query(&self, query: &str) -> Result<Option<serde_json::Value>, GraphQLError>;
 }
 
 pub type DynGraphQLClient = Arc<dyn GraphQLClient + Send + Sync>;
@@ -40,13 +41,50 @@ impl DefaultGraphQLClient {
 
 #[async_trait]
 impl GraphQLClient for DefaultGraphQLClient {
-    async fn query(&self, query: &str) -> eyre::Result<Option<serde_json::Value>> {
-        let res: Option<serde_json::Value> = self
-            .client
-            .query(&query)
-            .await
-            .map_err(|r| eyre::anyhow!(r.to_string()))?;
+    async fn query(&self, query: &str) -> Result<Option<serde_json::Value>, GraphQLError> {
+        let res: Option<serde_json::Value> =
+            self.client.query(&query).await.map_err(map_graphql_error)?;
 
         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-core/src/lib.rs

@@ -1,6 +1,6 @@
 #![deny(warnings)]
 
-pub const DAGGER_ENGINE_VERSION: &'static str = "0.4.2";
+pub const DAGGER_ENGINE_VERSION: &'static str = "0.5.1";
 
 pub mod cli_session;
 pub mod config;

crates/dagger-sdk/CHANGELOG.md

@@ -6,8 +6,67 @@ 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
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 2 commits 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
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<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>
+
 ## v0.2.20 (2023-04-03)
 
+<csr-id-ea27fa8168cc54b20fac87c016f479061c6eda91/>
+<csr-id-6ef4bdf587e4aea290b722e7a0aed3184e72d6bb/>
+<csr-id-b55bcc159ffc6a61ecfcc5e3aa3de00a1a73b5b8/>
+
 ### Chore
 
  - <csr-id-ea27fa8168cc54b20fac87c016f479061c6eda91/> fmt
@@ -35,8 +94,8 @@ and this project adheres to
 
 <csr-read-only-do-not-edit/>
 
- - 10 commits contributed to the release over the course of 19 calendar days.
- - 19 days passed between releases.
+ - 11 commits contributed to the release over the course of 19 calendar days.
+ - 20 days passed between releases.
  - 10 commits were understood as [conventional](https://www.conventionalcommits.org).
  - 1 unique issue was worked on: [#48](https://github.com/kjuulh/dagger-sdk/issues/48)
 
@@ -49,6 +108,7 @@ and this project adheres to
  * **[#48](https://github.com/kjuulh/dagger-sdk/issues/48)**
     - extract client ([`11d2093`](https://github.com/kjuulh/dagger-sdk/commit/11d20935c697e28caaa671e8da0e70a99d4310fc))
  * **Uncategorized**
+    - Release dagger-core v0.2.9, dagger-sdk v0.2.20 ([`f82075c`](https://github.com/kjuulh/dagger-sdk/commit/f82075c23808073d9500df63c1cd347cd9b99cef))
     - with gen ([`9ea1870`](https://github.com/kjuulh/dagger-sdk/commit/9ea18700e78a7ee09f43e6976b0339dfc2747458))
     - update rust crate futures to 0.3.28 ([`696007c`](https://github.com/kjuulh/dagger-sdk/commit/696007cf45ccbdfc1b8eb45e726940a040f52494))
     - rename projects to point to github/kjuulh/dagger-sdk ([`384294b`](https://github.com/kjuulh/dagger-sdk/commit/384294b39038123b02c406a1038105b111c3b9be))

crates/dagger-sdk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dagger-sdk"
-version = "0.2.20"
+version = "0.2.22"
 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 }
+dagger-core = { workspace = true, version = "^0.2.11" }
 
 eyre = { workspace = true }
 tokio = { workspace = true }
@@ -19,6 +19,10 @@ 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"
@@ -28,3 +32,11 @@ 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,5 +1,6 @@
 use rand::Rng;
 
+#[tracing::instrument]
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
     let client = dagger_sdk::connect().await?;
@@ -7,7 +8,7 @@ async fn main() -> eyre::Result<()> {
     let host_source_dir = client.host().directory_opts(
         "./examples/caching/app",
         dagger_sdk::HostDirectoryOptsBuilder::default()
-            .exclude(vec!["node_modules", "ci/"])
+            .exclude(vec!["node_modules/", "ci/"])
             .build()?,
     );
 

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

@@ -0,0 +1,25 @@
+# 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

@@ -0,0 +1,17 @@
+# 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

@@ -0,0 +1,48 @@
+{
+  "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

@@ -0,0 +1,43 @@
+<!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

@@ -0,0 +1,25 @@
+{
+  "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

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

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

@@ -0,0 +1,38 @@
+.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

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,26 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1 @@
+<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

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

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

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,5 @@
+// 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

@@ -0,0 +1,26 @@
+{
+  "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

@@ -0,0 +1,54 @@
+#[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

@@ -0,0 +1,5 @@
+#!/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,23 +5,42 @@ 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;
+use crate::logging::{StdLogger, TracingLogger};
 use crate::querybuilder::query;
 
 pub type DaggerConn = Arc<Query>;
 
-pub async fn connect() -> eyre::Result<DaggerConn> {
-    let cfg = Config::new(None, None, None, None, Some(Arc::new(StdLogger::default())));
+pub async fn connect() -> Result<DaggerConn, ConnectError> {
+    let cfg = if cfg!(feature = "otel") {
+        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) -> eyre::Result<DaggerConn> {
-    let (conn, proc) = DaggerEngine::new().start(&cfg).await?;
+pub async fn connect_opts(cfg: Config) -> Result<DaggerConn, ConnectError> {
+    let (conn, proc) = DaggerEngine::new()
+        .start(&cfg)
+        .await
+        .map_err(ConnectError::FailedToConnect)?;
 
     Ok(Arc::new(Query {
-        proc: Arc::new(proc),
+        proc: proc.map(|p| Arc::new(p)),
         selection: query(),
         graphql_client: Arc::new(DefaultGraphQLClient::new(&conn)),
     }))

crates/dagger-sdk/src/errors.rs

@@ -0,0 +1,29 @@
+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,6 +1,7 @@
 #![deny(warnings)]
 
 mod client;
+pub mod errors;
 mod gen;
 pub mod logging;
 mod querybuilder;

crates/dagger-sdk/src/logging.rs

@@ -6,6 +6,29 @@ 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 {
@@ -38,13 +61,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,8 +1,10 @@
 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()
@@ -29,6 +31,7 @@ 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()),
@@ -38,6 +41,7 @@ impl Selection {
         }
     }
 
+    #[instrument(skip(self))]
     pub fn select(&self, name: &str) -> Selection {
         Self {
             name: Some(name.to_string()),
@@ -47,6 +51,7 @@ impl Selection {
         }
     }
 
+    #[instrument(skip(self, value))]
     pub fn arg<S>(&self, name: &str, value: S) -> Selection
     where
         S: Serialize,
@@ -69,6 +74,7 @@ impl Selection {
         s
     }
 
+    #[instrument(skip(self, value))]
     pub fn arg_enum<S>(&self, name: &str, value: S) -> Selection
     where
         S: Serialize,
@@ -92,7 +98,8 @@ impl Selection {
         s
     }
 
-    pub fn build(&self) -> eyre::Result<String> {
+    #[instrument(skip(self))]
+    pub fn build(&self) -> Result<String, DaggerError> {
         let mut fields = vec!["query".to_string()];
 
         for sel in self.path() {
@@ -117,17 +124,16 @@ impl Selection {
         Ok(fields.join("{") + &"}".repeat(fields.len() - 1))
     }
 
-    pub async fn execute<D>(&self, gql_client: DynGraphQLClient) -> eyre::Result<D>
+    #[instrument(skip(self, gql_client))]
+    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) => eyre::bail!(e),
+            Err(e) => return Err(DaggerError::Query(e)),
         };
 
         let resp: Option<D> = self.unpack_resp(resp)?;
@@ -135,6 +141,7 @@ impl Selection {
         Ok(resp.unwrap())
     }
 
+    #[instrument(skip(self))]
     fn path(&self) -> Vec<Selection> {
         let mut selections: Vec<Selection> = vec![];
         let mut cur = self;
@@ -151,7 +158,11 @@ impl Selection {
         selections
     }
 
-    pub(crate) fn unpack_resp<D>(&self, resp: Option<serde_json::Value>) -> eyre::Result<Option<D>>
+    #[instrument(skip(self, resp))]
+    pub(crate) fn unpack_resp<D>(
+        &self,
+        resp: Option<serde_json::Value>,
+    ) -> Result<Option<D>, DaggerError>
     where
         D: for<'de> Deserialize<'de>,
     {
@@ -161,21 +172,24 @@ impl Selection {
         }
     }
 
-    fn unpack_resp_value<D>(&self, r: serde_json::Value) -> eyre::Result<D>
+    #[instrument(skip(self, r))]
+    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 {
-                eyre::bail!("too many nested objects inside graphql response")
+                return Err(DaggerError::Unpack(DaggerUnpackError::TooManyNestedObjects));
             }
 
             let first = keys.into_iter().next().unwrap();
             return self.unpack_resp_value(o.get(first).unwrap().clone());
         }
 
-        serde_json::from_value::<D>(r).context("could not deserialize response")
+        serde_json::from_value::<D>(r)
+            .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#"
-GQLClient Error: Look at json field for more details
-Message: pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed
+    let error_msg = r#"failed to query dagger engine: domain 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
 "#;
 
     assert_eq!(err.to_string().as_str(), error_msg);