From db6cb13df3140f93cec94f169184294a0316e78d Mon Sep 17 00:00:00 2001
From: Mahmoud Mazouz <mazouz.mahmoud@outlook.com>
Date: Fri, 5 Apr 2024 16:42:25 +0200
Subject: [PATCH 1/9] fix: Release workflow (#68)

* fix: Release workflow

* fix: Remove enforce-linking-issues

* fix: Set ghcr.io/ prefix in publish-crates-ghcr workflow
---
 .github/workflows/enforce-linking-issues.yml | 10 ----
 .github/workflows/release.yml                | 57 +++++++++-----------
 2 files changed, 25 insertions(+), 42 deletions(-)
 delete mode 100644 .github/workflows/enforce-linking-issues.yml

diff --git a/.github/workflows/enforce-linking-issues.yml b/.github/workflows/enforce-linking-issues.yml
deleted file mode 100644
index ebeddd9..0000000
--- a/.github/workflows/enforce-linking-issues.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: Enforce linking issues
-
-on:
-  pull_request_target:
-    types: [opened, edited, labeled]
-
-jobs:
-  main:
-    uses: eclipse-zenoh/zenoh/.github/workflows/enforce-linking-issues.yml@main
-    secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3507bf9..051e6e6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,27 +20,28 @@ on:
     inputs:
       live-run:
         type: boolean
-        description: If false (or undefined) the workflow runs in dry-run mode (i.e. with no side-effects)
+        description: Live-run
         required: false
       version:
         type: string
-        description: Release number. If undefined, the workflow auto-generates a version using git-describe
+        description: Release number
         required: false
       zenoh-version:
         type: string
-        description: Release number of Zenoh. Required in live-run mode and ignored in dry-run mode
+        description: Release number of Zenoh
         required: false
 
 jobs:
   tag:
-    name: Bump and tag crates
-    uses: eclipse-zenoh/ci/.github/workflows/tag-crates.yml@main
+    name: Branch, Bump & tag crates
+    uses: eclipse-zenoh/ci/.github/workflows/branch-bump-tag-crates.yml@main
     with:
       repo: ${{ github.repository }}
       live-run: ${{ inputs.live-run || false }}
       version: ${{ inputs.version }}
-      inter-deps-pattern: ${{ inputs.live-run && 'zenoh.*' || '^$' }}
-      inter-deps-version: ${{ inputs.live-run && inputs.zenoh-version || '' }}
+      bump-deps-version: ${{ inputs.zenoh-version }}
+      bump-deps-pattern: ${{ inputs.zenoh-version && 'zenoh.*' || '^$' }}
+      bump-deps-branch: ${{ inputs.zenoh-version && format('release/{0}', inputs.zenoh-version) || '' }}
     secrets: inherit
 
   build-debian:
@@ -68,32 +69,20 @@ jobs:
     secrets: inherit
 
   cargo-live-run:
-    if: ${{ inputs.live-run || false }}
-    name: Publish Cargo crates (live-run)
     needs: tag
+    name: Publish Cargo crates
     uses: eclipse-zenoh/ci/.github/workflows/release-crates-cargo.yml@main
     with:
-      repos: ${{ github.repository }}
-      live-run: true
-      branch: ${{ needs.tag.outputs.branch }}
-      inter-deps-pattern: ^$
-    secrets: inherit
-
-  # In dry-run mode, we need to publish eclipse-zenoh/zenoh before this repository,
-  # in which case the version of zenoh dependecies are left as is and thus point to
-  # the main branch of eclipse-zenoh/zenoh
-  cargo-dry-run:
-    if: ${{ !inputs.live-run || true }}
-    name: Publish Cargo crates (dry-run)
-    needs: tag
-    uses: eclipse-zenoh/ci/.github/workflows/release-crates-cargo.yml@main
-    with:
-      repos: |
-        eclipse-zenoh/zenoh
-        ${{ github.repository }}
-      live-run: false
+      repo: ${{ github.repository }}
+      live-run: ${{ inputs.live-run || false }}
       branch: ${{ needs.tag.outputs.branch }}
-      inter-deps-pattern: zenoh.*
+      # - In dry-run mode, we need to publish eclipse-zenoh/zenoh before this
+      #   repository, in which case the version of zenoh dependecies are left as
+      #   is and thus point to the main branch of eclipse-zenoh/zenoh.
+      # - In live-run mode, we assume that eclipse-zenoh/zenoh is already
+      #   published as this workflow can't be responsible for publishing it
+      unpublished-deps-patterns: ${{ !(inputs.live-run || false) && 'zenoh.*' || '' }}
+      unpublished-deps-repos: ${{ !(inputs.live-run || false) && 'eclipse-zenoh/zenoh' || '' }}
     secrets: inherit
 
   debian:
@@ -165,9 +154,10 @@ jobs:
     uses: eclipse-zenoh/ci/.github/workflows/release-crates-dockerhub.yml@main
     with:
       no-build: true
-      live-run: ${{ inputs.live-run || false }}
+      live-run: true
       version: ${{ needs.tag.outputs.version }}
       repo: ${{ github.repository }}
+      branch: ${{ needs.tag.outputs.branch }}
       tags: "eclipse/zenoh-plugin-mqtt:${{ needs.tag.outputs.version }}"
       binary: zenoh-bridge-mqtt
       files: |
@@ -176,6 +166,7 @@ jobs:
       platforms: |
         linux/arm64
         linux/amd64
+      licenses: EPL-2.0 OR Apache-2.0
     secrets: inherit
 
   ghcr:
@@ -184,10 +175,11 @@ jobs:
     uses: eclipse-zenoh/ci/.github/workflows/release-crates-ghcr.yml@main
     with:
       no-build: true
-      live-run: ${{ inputs.live-run || false }}
+      live-run: true
       version: ${{ needs.tag.outputs.version }}
       repo: ${{ github.repository }}
-      tags: "${{ github.repository }}:${{ needs.tag.outputs.version }}"
+      branch: ${{ needs.tag.outputs.branch }}
+      tags: "ghcr.io/${{ github.repository }}:${{ needs.tag.outputs.version }}"
       binary: zenoh-bridge-mqtt
       files: |
         zenoh-bridge-mqtt
@@ -195,4 +187,5 @@ jobs:
       platforms: |
         linux/arm64
         linux/amd64
+      licenses: EPL-2.0 OR Apache-2.0
     secrets: inherit

From 1d79148c08269cc6fedc35082db9ebd81b3f5fa0 Mon Sep 17 00:00:00 2001
From: Mahmoud Mazouz <mazouz.mahmoud@outlook.com>
Date: Tue, 9 Apr 2024 13:34:51 +0200
Subject: [PATCH 2/9] chore: Typo in cargo job name

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 051e6e6..91e6624 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -68,7 +68,7 @@ jobs:
         ^zenoh_plugin_mqtt\.dll$
     secrets: inherit
 
-  cargo-live-run:
+  cargo:
     needs: tag
     name: Publish Cargo crates
     uses: eclipse-zenoh/ci/.github/workflows/release-crates-cargo.yml@main

From 514f4b6a94376f66a981eca4e73821159f441f48 Mon Sep 17 00:00:00 2001
From: Mahmoud Mazouz <mazouz.mahmoud@outlook.com>
Date: Tue, 9 Apr 2024 13:35:22 +0200
Subject: [PATCH 3/9] fix: Set `installation-test` to false in debian job

---
 .github/workflows/release.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 91e6624..36b88d9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -95,6 +95,7 @@ jobs:
       version: ${{ needs.tag.outputs.version }}
       repo: ${{ github.repository }}
       branch: ${{ needs.tag.outputs.branch }}
+      installation-test: false
     secrets: inherit
 
   homebrew:

From eef5fc15f51d273ceeb55a88af1e995abe8d0e15 Mon Sep 17 00:00:00 2001
From: Mahmoud Mazouz <mazouz.mahmoud@outlook.com>
Date: Tue, 9 Apr 2024 13:36:51 +0200
Subject: [PATCH 4/9] fix: Set `publish` to false in zenoh-bridge-mqtt

---
 zenoh-bridge-mqtt/Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zenoh-bridge-mqtt/Cargo.toml b/zenoh-bridge-mqtt/Cargo.toml
index 45b1111..f520cc6 100644
--- a/zenoh-bridge-mqtt/Cargo.toml
+++ b/zenoh-bridge-mqtt/Cargo.toml
@@ -21,6 +21,7 @@ homepage = { workspace = true }
 license = { workspace = true }
 categories = { workspace = true }
 description = "Zenoh bridge for MQTT"
+publish = false
 
 [dependencies]
 async-std = { workspace = true, features = ["unstable", "attributes"] }

From 6cb1324b41c3234407a22d827237bde22be0bcac Mon Sep 17 00:00:00 2001
From: Mahmoud Mazouz <mazouz.mahmoud@outlook.com>
Date: Tue, 9 Apr 2024 13:37:35 +0200
Subject: [PATCH 5/9] fix: Incorrect Docker image tag basename

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 36b88d9..a2c960c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -159,7 +159,7 @@ jobs:
       version: ${{ needs.tag.outputs.version }}
       repo: ${{ github.repository }}
       branch: ${{ needs.tag.outputs.branch }}
-      tags: "eclipse/zenoh-plugin-mqtt:${{ needs.tag.outputs.version }}"
+      tags: "eclipse/zenoh-bridge-mqtt:${{ needs.tag.outputs.version }}"
       binary: zenoh-bridge-mqtt
       files: |
         zenoh-bridge-mqtt

From 457d115f42bbe714355226787c0a91e9523d88b1 Mon Sep 17 00:00:00 2001
From: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com>
Date: Tue, 9 Apr 2024 17:47:47 +0200
Subject: [PATCH 6/9] build: Sync  with eclipse-zenoh/zenoh@0926dd3 from
 2024-04-08 (#66)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
---
 Cargo.lock | 85 ++++++++++++++++++++++++++++++++----------------------
 1 file changed, 51 insertions(+), 34 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d31e413..e5d7f93 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1013,9 +1013,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291"
+checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3"
 dependencies = [
  "event-listener 5.2.0",
  "pin-project-lite 0.2.13",
@@ -1912,9 +1912,9 @@ dependencies = [
 
 [[package]]
 name = "ntex-bytes"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb17fec7b1e5f1b504a7f2f02a05ccfe7ad9ecb47fa039a0d7f5a55ff940dfa"
+checksum = "2ffd6ac357a3fd885753ddeb4130ec92474e79d013362532eba4778854466981"
 dependencies = [
  "bitflags 2.4.0",
  "bytes",
@@ -2043,9 +2043,9 @@ dependencies = [
 
 [[package]]
 name = "ntex-rt"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbcd2ccc1e2d97936f461e9d552d348d94bf321a857f40907afe5697f65d2d97"
+checksum = "471b8ce4b4edfd8eddcb4143ebd91022e949b96627e14436bf0beec66ecd6394"
 dependencies = [
  "async-channel 2.2.0",
  "async-std",
@@ -2963,9 +2963,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47"
 
 [[package]]
 name = "ryu"
@@ -4348,7 +4348,7 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 [[package]]
 name = "zenoh"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "async-trait",
  "base64 0.21.4",
@@ -4390,6 +4390,7 @@ dependencies = [
  "zenoh-result",
  "zenoh-runtime",
  "zenoh-sync",
+ "zenoh-task",
  "zenoh-transport",
  "zenoh-util",
 ]
@@ -4413,7 +4414,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "zenoh-collections",
 ]
@@ -4421,7 +4422,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "log",
  "serde",
@@ -4433,12 +4434,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 
 [[package]]
 name = "zenoh-config"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "flume 0.11.0",
  "json5",
@@ -4458,7 +4459,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "async-global-executor",
  "lazy_static",
@@ -4470,7 +4471,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "aes 0.8.3",
  "hmac 0.12.1",
@@ -4483,7 +4484,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "bincode",
  "env_logger 0.11.2",
@@ -4498,13 +4499,14 @@ dependencies = [
  "zenoh-result",
  "zenoh-runtime",
  "zenoh-sync",
+ "zenoh-task",
  "zenoh-util",
 ]
 
 [[package]]
 name = "zenoh-keyexpr"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "hashbrown 0.14.0",
  "keyed-set",
@@ -4518,7 +4520,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "async-trait",
  "zenoh-config",
@@ -4536,7 +4538,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -4559,7 +4561,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "async-trait",
  "base64 0.21.4",
@@ -4587,7 +4589,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "async-trait",
  "log",
@@ -4605,7 +4607,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "async-trait",
  "base64 0.21.4",
@@ -4633,7 +4635,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "async-trait",
  "log",
@@ -4654,7 +4656,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "async-trait",
  "futures",
@@ -4674,7 +4676,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4695,7 +4697,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4739,7 +4741,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-rest"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "anyhow",
  "async-std",
@@ -4767,7 +4769,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "const_format",
  "libloading",
@@ -4783,7 +4785,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4797,7 +4799,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "anyhow",
 ]
@@ -4805,8 +4807,9 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
+ "futures",
  "lazy_static",
  "tokio",
  "zenoh-collections",
@@ -4816,7 +4819,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "event-listener 4.0.0",
  "futures",
@@ -4827,10 +4830,23 @@ dependencies = [
  "zenoh-runtime",
 ]
 
+[[package]]
+name = "zenoh-task"
+version = "0.11.0-dev"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+dependencies = [
+ "futures",
+ "log",
+ "tokio",
+ "tokio-util",
+ "zenoh-core",
+ "zenoh-runtime",
+]
+
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -4855,13 +4871,14 @@ dependencies = [
  "zenoh-result",
  "zenoh-runtime",
  "zenoh-sync",
+ "zenoh-task",
  "zenoh-util",
 ]
 
 [[package]]
 name = "zenoh-util"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#e04c8613d3c33472edcbde6fde5bd4beeb24f2bf"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
 dependencies = [
  "async-std",
  "async-trait",

From 9331e9ca111c9895a949c0bde721841dfcce66d5 Mon Sep 17 00:00:00 2001
From: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com>
Date: Thu, 11 Apr 2024 02:13:43 +0200
Subject: [PATCH 7/9] build: Sync  with eclipse-zenoh/zenoh@15a46a0 from
 2024-04-10 (#70)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
---
 Cargo.lock | 58 +++++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e5d7f93..394d579 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -915,9 +915,9 @@ checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.33"
+version = "0.8.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -4348,7 +4348,7 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 [[package]]
 name = "zenoh"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "async-trait",
  "base64 0.21.4",
@@ -4414,7 +4414,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "zenoh-collections",
 ]
@@ -4422,7 +4422,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "log",
  "serde",
@@ -4434,12 +4434,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 
 [[package]]
 name = "zenoh-config"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "flume 0.11.0",
  "json5",
@@ -4459,7 +4459,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "async-global-executor",
  "lazy_static",
@@ -4471,7 +4471,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "aes 0.8.3",
  "hmac 0.12.1",
@@ -4484,7 +4484,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "bincode",
  "env_logger 0.11.2",
@@ -4506,7 +4506,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "hashbrown 0.14.0",
  "keyed-set",
@@ -4520,7 +4520,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "async-trait",
  "zenoh-config",
@@ -4538,7 +4538,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -4561,7 +4561,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "async-trait",
  "base64 0.21.4",
@@ -4589,7 +4589,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "async-trait",
  "log",
@@ -4607,7 +4607,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "async-trait",
  "base64 0.21.4",
@@ -4635,7 +4635,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "async-trait",
  "log",
@@ -4656,7 +4656,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "async-trait",
  "futures",
@@ -4676,7 +4676,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4697,7 +4697,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4741,7 +4741,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-rest"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "anyhow",
  "async-std",
@@ -4769,7 +4769,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "const_format",
  "libloading",
@@ -4785,7 +4785,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4799,7 +4799,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "anyhow",
 ]
@@ -4807,7 +4807,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "futures",
  "lazy_static",
@@ -4819,7 +4819,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "event-listener 4.0.0",
  "futures",
@@ -4833,7 +4833,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "futures",
  "log",
@@ -4846,7 +4846,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -4878,7 +4878,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#0926dd36bf81cb56729af63ea39c2c4389bfbad4"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
 dependencies = [
  "async-std",
  "async-trait",

From dbbcf1130e2d3842f313bb4619015a568434aff1 Mon Sep 17 00:00:00 2001
From: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com>
Date: Thu, 11 Apr 2024 09:36:13 +0200
Subject: [PATCH 8/9] build: Sync  with eclipse-zenoh/zenoh@d594afb from
 2024-04-10 (#71)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
---
 Cargo.lock | 54 +++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 394d579..d266378 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4348,7 +4348,7 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 [[package]]
 name = "zenoh"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "async-trait",
  "base64 0.21.4",
@@ -4414,7 +4414,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "zenoh-collections",
 ]
@@ -4422,7 +4422,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "log",
  "serde",
@@ -4434,12 +4434,12 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 
 [[package]]
 name = "zenoh-config"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "flume 0.11.0",
  "json5",
@@ -4459,7 +4459,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "async-global-executor",
  "lazy_static",
@@ -4471,7 +4471,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "aes 0.8.3",
  "hmac 0.12.1",
@@ -4484,7 +4484,7 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "bincode",
  "env_logger 0.11.2",
@@ -4506,7 +4506,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "hashbrown 0.14.0",
  "keyed-set",
@@ -4520,7 +4520,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "async-trait",
  "zenoh-config",
@@ -4538,7 +4538,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -4561,7 +4561,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "async-trait",
  "base64 0.21.4",
@@ -4589,7 +4589,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "async-trait",
  "log",
@@ -4607,7 +4607,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "async-trait",
  "base64 0.21.4",
@@ -4635,7 +4635,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "async-trait",
  "log",
@@ -4656,7 +4656,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "async-trait",
  "futures",
@@ -4676,7 +4676,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4697,7 +4697,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4741,7 +4741,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-rest"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "anyhow",
  "async-std",
@@ -4769,7 +4769,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "const_format",
  "libloading",
@@ -4785,7 +4785,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4799,7 +4799,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "anyhow",
 ]
@@ -4807,7 +4807,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "futures",
  "lazy_static",
@@ -4819,7 +4819,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "event-listener 4.0.0",
  "futures",
@@ -4833,7 +4833,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "futures",
  "log",
@@ -4846,7 +4846,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
@@ -4878,7 +4878,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#15a46a076358f2cd09b8b75cfc9eb5d9ba1ff476"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
 dependencies = [
  "async-std",
  "async-trait",

From a69f9089e428dc936b235f422bda73a66a2d542c Mon Sep 17 00:00:00 2001
From: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com>
Date: Fri, 12 Apr 2024 02:13:53 +0200
Subject: [PATCH 9/9] build: Sync  with eclipse-zenoh/zenoh@580f0b6 from
 2024-04-11 (#72)

Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
---
 Cargo.lock | 194 +++++++++++++++++------------------------------------
 1 file changed, 61 insertions(+), 133 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d266378..419c251 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -126,54 +126,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "anstream"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
-dependencies = [
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
-dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.75"
@@ -676,12 +628,6 @@ dependencies = [
  "os_str_bytes",
 ]
 
-[[package]]
-name = "colorchoice"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
-
 [[package]]
 name = "concurrent-queue"
 version = "2.2.0"
@@ -915,23 +861,13 @@ checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.34"
+version = "0.8.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
 dependencies = [
  "cfg-if 1.0.0",
 ]
 
-[[package]]
-name = "env_filter"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
-dependencies = [
- "log",
- "regex",
-]
-
 [[package]]
 name = "env_logger"
 version = "0.10.2"
@@ -945,19 +881,6 @@ dependencies = [
  "termcolor",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c012a26a7f605efc424dd53697843a72be7dc86ad2d01f7814337794a12231d"
-dependencies = [
- "anstream",
- "anstyle",
- "env_filter",
- "humantime",
- "log",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -3812,6 +3735,16 @@ dependencies = [
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-serde"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
+dependencies = [
+ "serde",
+ "tracing-core",
+]
+
 [[package]]
 name = "tracing-subscriber"
 version = "0.3.18"
@@ -3822,12 +3755,15 @@ dependencies = [
  "nu-ansi-term",
  "once_cell",
  "regex",
+ "serde",
+ "serde_json",
  "sharded-slab",
  "smallvec",
  "thread_local",
  "tracing",
  "tracing-core",
  "tracing-log",
+ "tracing-serde",
 ]
 
 [[package]]
@@ -3969,12 +3905,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
-[[package]]
-name = "utf8parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
-
 [[package]]
 name = "uuid"
 version = "1.4.1"
@@ -4348,19 +4278,17 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 [[package]]
 name = "zenoh"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "async-trait",
  "base64 0.21.4",
  "const_format",
- "env_logger 0.11.2",
  "event-listener 4.0.0",
  "flume 0.11.0",
  "form_urlencoded",
  "futures",
  "git-version",
  "lazy_static",
- "log",
  "ordered-float",
  "paste",
  "petgraph",
@@ -4373,6 +4301,7 @@ dependencies = [
  "stop-token",
  "tokio",
  "tokio-util",
+ "tracing",
  "uhlc",
  "uuid",
  "vec_map",
@@ -4401,7 +4330,7 @@ version = "0.11.0-dev"
 dependencies = [
  "async-std",
  "clap",
- "env_logger 0.10.2",
+ "env_logger",
  "lazy_static",
  "log",
  "serde_json",
@@ -4414,7 +4343,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "zenoh-collections",
 ]
@@ -4422,10 +4351,10 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
- "log",
  "serde",
+ "tracing",
  "uhlc",
  "zenoh-buffers",
  "zenoh-protocol",
@@ -4434,21 +4363,21 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 
 [[package]]
 name = "zenoh-config"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "flume 0.11.0",
  "json5",
- "log",
  "num_cpus",
  "secrecy",
  "serde",
  "serde_json",
  "serde_yaml",
+ "tracing",
  "validated_struct",
  "zenoh-core",
  "zenoh-protocol",
@@ -4459,7 +4388,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "async-global-executor",
  "lazy_static",
@@ -4471,7 +4400,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "aes 0.8.3",
  "hmac 0.12.1",
@@ -4484,15 +4413,14 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "bincode",
- "env_logger 0.11.2",
  "flume 0.11.0",
  "futures",
- "log",
  "serde",
  "tokio",
+ "tracing",
  "zenoh",
  "zenoh-core",
  "zenoh-macros",
@@ -4506,7 +4434,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "hashbrown 0.14.0",
  "keyed-set",
@@ -4520,7 +4448,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "async-trait",
  "zenoh-config",
@@ -4538,17 +4466,17 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
  "futures",
- "log",
  "rustls 0.22.2",
  "rustls-webpki 0.102.2",
  "serde",
  "tokio",
  "tokio-util",
+ "tracing",
  "zenoh-buffers",
  "zenoh-codec",
  "zenoh-core",
@@ -4561,12 +4489,11 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "async-trait",
  "base64 0.21.4",
  "futures",
- "log",
  "quinn",
  "rustls 0.21.7",
  "rustls-native-certs 0.7.0",
@@ -4576,6 +4503,7 @@ dependencies = [
  "tokio",
  "tokio-rustls 0.24.1",
  "tokio-util",
+ "tracing",
  "zenoh-config",
  "zenoh-core",
  "zenoh-link-commons",
@@ -4589,12 +4517,12 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "async-trait",
- "log",
  "tokio",
  "tokio-util",
+ "tracing",
  "zenoh-core",
  "zenoh-link-commons",
  "zenoh-protocol",
@@ -4607,12 +4535,11 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "async-trait",
  "base64 0.21.4",
  "futures",
- "log",
  "rustls 0.22.2",
  "rustls-pemfile 2.0.0",
  "rustls-pki-types",
@@ -4621,6 +4548,7 @@ dependencies = [
  "tokio",
  "tokio-rustls 0.25.0",
  "tokio-util",
+ "tracing",
  "webpki-roots 0.26.0",
  "zenoh-config",
  "zenoh-core",
@@ -4635,13 +4563,13 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "async-trait",
- "log",
  "socket2 0.5.6",
  "tokio",
  "tokio-util",
+ "tracing",
  "zenoh-buffers",
  "zenoh-collections",
  "zenoh-core",
@@ -4656,14 +4584,14 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "async-trait",
  "futures",
- "log",
  "nix",
  "tokio",
  "tokio-util",
+ "tracing",
  "uuid",
  "zenoh-core",
  "zenoh-link-commons",
@@ -4676,14 +4604,14 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "async-trait",
  "futures-util",
- "log",
  "tokio",
  "tokio-tungstenite",
  "tokio-util",
+ "tracing",
  "url",
  "zenoh-core",
  "zenoh-link-commons",
@@ -4697,7 +4625,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4714,7 +4642,7 @@ dependencies = [
  "async-trait",
  "base64 0.21.4",
  "derivative",
- "env_logger 0.10.2",
+ "env_logger",
  "flume 0.10.14",
  "futures",
  "git-version",
@@ -4741,25 +4669,24 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-rest"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "anyhow",
  "async-std",
  "base64 0.21.4",
  "const_format",
- "env_logger 0.11.2",
  "flume 0.11.0",
  "futures",
  "git-version",
  "http-types",
  "jsonschema",
  "lazy_static",
- "log",
  "rustc_version 0.4.0",
  "schemars",
  "serde",
  "serde_json",
  "tide",
+ "tracing",
  "zenoh",
  "zenoh-plugin-trait",
  "zenoh-result",
@@ -4769,13 +4696,13 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "const_format",
  "libloading",
- "log",
  "serde",
  "serde_json",
+ "tracing",
  "zenoh-keyexpr",
  "zenoh-macros",
  "zenoh-result",
@@ -4785,7 +4712,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4799,7 +4726,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "anyhow",
 ]
@@ -4807,7 +4734,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "futures",
  "lazy_static",
@@ -4819,7 +4746,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "event-listener 4.0.0",
  "futures",
@@ -4833,12 +4760,12 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "futures",
- "log",
  "tokio",
  "tokio-util",
+ "tracing",
  "zenoh-core",
  "zenoh-runtime",
 ]
@@ -4846,11 +4773,10 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "async-trait",
  "flume 0.11.0",
- "log",
  "lz4_flex",
  "paste",
  "rand 0.8.5",
@@ -4860,6 +4786,7 @@ dependencies = [
  "sha3",
  "tokio",
  "tokio-util",
+ "tracing",
  "zenoh-buffers",
  "zenoh-codec",
  "zenoh-collections",
@@ -4878,7 +4805,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "0.11.0-dev"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#d594afbc358be0e8379a25ed985a1fcc1e36f2d8"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#580f0b6142338c73d17da28b17986b0094272c6e"
 dependencies = [
  "async-std",
  "async-trait",
@@ -4888,10 +4815,11 @@ dependencies = [
  "lazy_static",
  "libc",
  "libloading",
- "log",
  "pnet_datalink",
  "shellexpand",
  "tokio",
+ "tracing",
+ "tracing-subscriber",
  "winapi",
  "zenoh-core",
  "zenoh-result",