From 85dba384f11aa7b48b5091ad35c45d2d1e12762c Mon Sep 17 00:00:00 2001
From: Claas <claas@claas.dev>
Date: Thu, 1 May 2025 15:09:55 +0200
Subject: [PATCH] Move to workspace to allow demo app

---
 Cargo.lock               | 21 +++++++++++++++------
 Cargo.toml               | 15 +++------------
 opo/Cargo.toml           | 12 ++++++++++++
 build.rs => opo/build.rs |  4 ++--
 {src => opo/src}/main.rs |  0
 5 files changed, 32 insertions(+), 20 deletions(-)
 create mode 100644 opo/Cargo.toml
 rename build.rs => opo/build.rs (66%)
 rename {src => opo/src}/main.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 2f0144c..8ba87ba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -158,7 +158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
 dependencies = [
  "libc",
- "windows-sys",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -455,7 +455,7 @@ checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -700,7 +700,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -766,7 +766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
 dependencies = [
  "libc",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -796,7 +796,7 @@ dependencies = [
  "getrandom",
  "once_cell",
  "rustix",
- "windows-sys",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -814,7 +814,7 @@ dependencies = [
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1002,6 +1002,15 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.52.6"
diff --git a/Cargo.toml b/Cargo.toml
index df99dc5..11edfa0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,12 +1,3 @@
-[package]
-name = "opo"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-prost = "0.13.5"
-tokio = { version = "1.44.2", features = ["full"] }
-tonic = "0.13.0"
-
-[build-dependencies]
-tonic-build = "0.13.0"
+[workspace]
+resolver = "3"
+members = ["opo"]
diff --git a/opo/Cargo.toml b/opo/Cargo.toml
new file mode 100644
index 0000000..df99dc5
--- /dev/null
+++ b/opo/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "opo"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+prost = "0.13.5"
+tokio = { version = "1.44.2", features = ["full"] }
+tonic = "0.13.0"
+
+[build-dependencies]
+tonic-build = "0.13.0"
diff --git a/build.rs b/opo/build.rs
similarity index 66%
rename from build.rs
rename to opo/build.rs
index 4ac4eec..18e1ae7 100644
--- a/build.rs
+++ b/opo/build.rs
@@ -6,8 +6,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .build_client(false)
         .build_server(true)
         .compile_protos(
-            &["opentelemetry-proto/opentelemetry/proto/collector/trace/v1/trace_service.proto"],
-            &["opentelemetry-proto/"],
+            &["../opentelemetry-proto/opentelemetry/proto/collector/trace/v1/trace_service.proto"],
+            &["../opentelemetry-proto/"],
         )?;
     Ok(())
 }
diff --git a/src/main.rs b/opo/src/main.rs
similarity index 100%
rename from src/main.rs
rename to opo/src/main.rs
-- 
2.51.2