feat: with loggers

Cargo.lock

@@ -277,6 +277,8 @@ dependencies = [
  "tar",
  "tempfile",
  "tokio",
+ "tracing",
+ "tracing-subscriber",
 ]
 
 [[package]]
@@ -320,6 +322,9 @@ dependencies = [
  "serde",
  "serde_json",
  "tokio",
+ "tracing",
+ "tracing-subscriber",
+ "tracing-test",
 ]
 
 [[package]]
@@ -1011,6 +1016,15 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata",
+]
+
 [[package]]
 name = "memchr"
 version = "2.5.0"
@@ -1062,6 +1076,16 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
 [[package]]
 name = "num_cpus"
 version = "1.15.0"
@@ -1147,6 +1171,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
 [[package]]
 name = "owo-colors"
 version = "3.5.0"
@@ -1296,6 +1326,30 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "regex"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
+dependencies = [
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+
 [[package]]
 name = "relative-path"
 version = "1.8.0"
@@ -1666,10 +1720,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
  "cfg-if",
+ "log",
  "pin-project-lite",
+ "tracing-attributes",
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-attributes"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "tracing-core"
 version = "0.1.30"
@@ -1690,15 +1757,56 @@ dependencies = [
  "tracing-subscriber",
 ]
 
+[[package]]
+name = "tracing-log"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+dependencies = [
+ "lazy_static",
+ "log",
+ "tracing-core",
+]
+
 [[package]]
 name = "tracing-subscriber"
 version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
 dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
  "sharded-slab",
+ "smallvec",
  "thread_local",
+ "tracing",
  "tracing-core",
+ "tracing-log",
+]
+
+[[package]]
+name = "tracing-test"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a2c0ff408fe918a94c428a3f2ad04e4afd5c95bbc08fcf868eff750c15728a4"
+dependencies = [
+ "lazy_static",
+ "tracing-core",
+ "tracing-subscriber",
+ "tracing-test-macro",
+]
+
+[[package]]
+name = "tracing-test-macro"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08"
+dependencies = [
+ "lazy_static",
+ "quote",
+ "syn",
 ]
 
 [[package]]

Cargo.toml

@@ -18,3 +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"] }
+tracing-subscriber = { version = "0.3.16", features = [
+  "tracing-log",
+  "tracing",
+] }

crates/dagger-core/Cargo.toml

@@ -14,6 +14,8 @@ eyre = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tokio = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
 
 dirs = "4.0.0"
 flate2 = { version = "1.0.25", features = ["zlib"] }

crates/dagger-core/src/cli_session.rs

@@ -35,7 +35,7 @@ impl InnerCliSession {
         cli_path: &PathBuf,
     ) -> eyre::Result<(ConnectParams, tokio::process::Child)> {
         let proc = self.start(config, cli_path)?;
-        let params = self.get_conn(proc).await?;
+        let params = self.get_conn(proc, config).await?;
         Ok(params)
     }
 
@@ -69,6 +69,7 @@ impl InnerCliSession {
     async fn get_conn(
         &self,
         mut proc: tokio::process::Child,
+        config: &Config,
     ) -> eyre::Result<(ConnectParams, tokio::process::Child)> {
         let stdout = proc
             .stdout
@@ -82,6 +83,7 @@ impl InnerCliSession {
 
         let (sender, mut receiver) = tokio::sync::mpsc::channel(1);
 
+        let logger = config.logger.as_ref().map(|p| p.clone());
         tokio::spawn(async move {
             let mut stdout_bufr = tokio::io::BufReader::new(stdout).lines();
             while let Ok(Some(line)) = stdout_bufr.next_line().await {
@@ -89,14 +91,19 @@ impl InnerCliSession {
                     sender.send(conn).await.unwrap();
                 }
 
-                println!("dagger: {}", line);
+                if let Some(logger) = &logger {
+                    logger.stdout(&line).unwrap();
+                }
             }
         });
 
+        let logger = config.logger.as_ref().map(|p| p.clone());
         tokio::spawn(async move {
-            let mut stdout_bufr = tokio::io::BufReader::new(stderr).lines();
+            let mut stderr_bufr = tokio::io::BufReader::new(stderr).lines();
-            while let Ok(Some(line)) = stdout_bufr.next_line().await {
+            while let Ok(Some(line)) = stderr_bufr.next_line().await {
-                println!("dagger: {}", line);
+                if let Some(logger) = &logger {
+                    logger.stdout(&line).unwrap();
+                }
             }
         });
 

crates/dagger-core/src/config.rs

@@ -1,15 +1,18 @@
 use std::path::PathBuf;
 
+use crate::logger::DynLogger;
+
 pub struct Config {
     pub workdir_path: Option<PathBuf>,
     pub config_path: Option<PathBuf>,
     pub timeout_ms: u64,
     pub execute_timeout_ms: Option<u64>,
+    pub logger: Option<DynLogger>,
 }
 
 impl Default for Config {
     fn default() -> Self {
-        Self::new(None, None, None, None)
+        Self::new(None, None, None, None, None)
     }
 }
 
@@ -19,12 +22,14 @@ impl Config {
         config_path: Option<PathBuf>,
         timeout_ms: Option<u64>,
         execute_timeout_ms: Option<u64>,
+        logger: Option<DynLogger>,
     ) -> Self {
         Self {
             workdir_path,
             config_path,
             timeout_ms: timeout_ms.unwrap_or(10 * 1000),
             execute_timeout_ms,
+            logger,
         }
     }
 }

crates/dagger-core/src/downloader.rs

@@ -139,9 +139,10 @@ impl Downloader {
             if let Ok(entry) = file {
                 let path = entry.path();
                 if path != cli_bin_path {
-                    println!(
+                    tracing::debug!(
-                        "deleting client: path: {:?} vs cli_bin_path: {:?}",
+                        path = path.display().to_string(),
-                        path, cli_bin_path
+                        cli_bin_path = cli_bin_path.display().to_string(),
+                        "deleting existing dagger-engine"
                     );
                     std::fs::remove_file(path)?;
                 }

crates/dagger-core/src/engine.rs

@@ -24,6 +24,8 @@ impl Engine {
         &self,
         cfg: &Config,
     ) -> eyre::Result<(ConnectParams, tokio::process::Child)> {
+        tracing::info!("starting dagger-engine");
+
         // TODO: Add from existing session as well
         self.from_cli(cfg).await
     }

crates/dagger-core/src/lib.rs

@@ -8,6 +8,7 @@ pub mod connect_params;
 pub mod downloader;
 pub mod engine;
 pub mod introspection;
+pub mod logger;
 pub mod schema;
 pub mod session;
 

crates/dagger-core/src/logger.rs

@@ -0,0 +1,8 @@
+use std::sync::Arc;
+
+pub trait Logger {
+    fn stdout(&self, output: &str) -> eyre::Result<()>;
+    fn stderr(&self, output: &str) -> eyre::Result<()>;
+}
+
+pub type DynLogger = Arc<dyn Logger + Send + Sync>;

crates/dagger-core/src/schema.rs

@@ -2,7 +2,7 @@ use crate::introspection::IntrospectionResponse;
 use crate::{config::Config, engine::Engine, session::Session};
 
 pub async fn get_schema() -> eyre::Result<IntrospectionResponse> {
-    let cfg = Config::new(None, None, None, None);
+    let cfg = Config::default();
 
     //TODO: Implement context for proc
     let (conn, _proc) = Engine::new().start(&cfg).await?;

crates/dagger-sdk/Cargo.toml

@@ -17,6 +17,8 @@ eyre = { workspace = true }
 tokio = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
+tracing.workspace = true
+tracing-subscriber.workspace = true
 
 base64 = "0.21.0"
 futures = "0.3.27"
@@ -27,3 +29,4 @@ derive_builder = "0.12.0"
 pretty_assertions = "1.3.0"
 rand = "0.8.5"
 genco = "0.17.3"
+tracing-test = "0.2.4"

crates/dagger-sdk/examples/logging/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/logging/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/logging/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/logging/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/logging/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/logging/app/public/robots.txt

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

crates/dagger-sdk/examples/logging/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/logging/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/logging/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/logging/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/logging/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/logging/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/logging/app/src/react-app-env.d.ts

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

crates/dagger-sdk/examples/logging/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/logging/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/logging/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/logging/main.rs

@@ -0,0 +1,49 @@
+use std::sync::Arc;
+
+use dagger_sdk::logging::TracingLogger;
+use dagger_sdk::HostDirectoryOpts;
+
+#[tokio::main]
+async fn main() -> eyre::Result<()> {
+    dagger_sdk::logging::default_logging()?;
+
+    let client = dagger_sdk::connect_opts(dagger_sdk::Config {
+        workdir_path: None,
+        config_path: None,
+        timeout_ms: 1000,
+        execute_timeout_ms: None,
+        logger: Some(Arc::new(TracingLogger::default())),
+    })
+    .await?;
+
+    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);
+
+    Ok(())
+}

crates/dagger-sdk/src/client.rs

@@ -3,18 +3,25 @@ use std::sync::Arc;
 
 use base64::engine::general_purpose;
 use base64::Engine;
+use gql_client::ClientConfig;
+
 use dagger_core::config::Config;
 use dagger_core::connect_params::ConnectParams;
 use dagger_core::engine::Engine as DaggerEngine;
-use gql_client::ClientConfig;
 
 use crate::gen::Query;
+use crate::logging::StdLogger;
 use crate::querybuilder::query;
 
 pub type DaggerConn = Arc<Query>;
 
 pub async fn connect() -> eyre::Result<DaggerConn> {
-    let cfg = Config::default();
+    let cfg = 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?;
 
     Ok(Arc::new(Query {

crates/dagger-sdk/src/lib.rs

@@ -2,7 +2,9 @@
 
 mod client;
 mod gen;
+pub mod logging;
 mod querybuilder;
 
 pub use client::*;
+pub use dagger_core::config::Config;
 pub use gen::*;

crates/dagger-sdk/src/logging.rs

@@ -0,0 +1,81 @@
+use dagger_core::logger::{DynLogger, Logger};
+use tracing::Level;
+
+pub fn default_logging() -> eyre::Result<()> {
+    tracing_subscriber::fmt().with_max_level(Level::INFO).init();
+    Ok(())
+}
+
+pub struct StdLogger {}
+
+impl Default for StdLogger {
+    fn default() -> Self {
+        Self {}
+    }
+}
+
+impl Logger for StdLogger {
+    fn stdout(&self, output: &str) -> eyre::Result<()> {
+        println!("{}", output);
+
+        Ok(())
+    }
+
+    fn stderr(&self, output: &str) -> eyre::Result<()> {
+        eprintln!("{}", output);
+
+        Ok(())
+    }
+}
+
+pub struct TracingLogger {}
+
+impl Default for TracingLogger {
+    fn default() -> Self {
+        Self {}
+    }
+}
+
+impl Logger for TracingLogger {
+    fn stdout(&self, output: &str) -> eyre::Result<()> {
+        tracing::info!(output = output, "dagger-sdk");
+
+        Ok(())
+    }
+
+    fn stderr(&self, output: &str) -> eyre::Result<()> {
+        tracing::warn!(output = output, "dagger-sdk");
+
+        Ok(())
+    }
+}
+
+pub struct AggregateLogger {
+    pub loggers: Vec<DynLogger>,
+}
+
+impl Default for AggregateLogger {
+    fn default() -> Self {
+        Self {
+            loggers: Vec::new(),
+        }
+    }
+}
+
+impl Logger for AggregateLogger {
+    fn stdout(&self, output: &str) -> eyre::Result<()> {
+        for logger in &self.loggers {
+            logger.stdout(output).unwrap()
+        }
+
+        Ok(())
+    }
+
+    fn stderr(&self, output: &str) -> eyre::Result<()> {
+        for logger in &self.loggers {
+            logger.stderr(output).unwrap()
+        }
+
+        Ok(())
+    }
+}

crates/dagger-sdk/src/querybuilder.rs

@@ -77,9 +77,6 @@ impl Selection {
         let val = serde_json::to_string(&value).unwrap();
         let val = val[1..val.len() - 1].to_string();
 
-        println!("test");
-        println!("{}", val);
-
         match s.args.as_mut() {
             Some(args) => {
                 let _ = args.insert(name.to_string(), val);
@@ -125,8 +122,7 @@ impl Selection {
     {
         let query = self.build()?;
 
-        let qbs = query.as_str();
+        tracing::trace!(query = query.as_str(), "dagger-query");
-        println!("{}", qbs);
 
         let resp: Option<serde_json::Value> = match gql_client.query(&query).await {
             Ok(r) => r,