chore: Move third-party proto files into their own module (#20556)

* chore: Move third-party proto files into their own module To avoid cyclical dependencies between lib/vector-core/proto and proto/ Signed-off-by: Jesse Szwedko <[email protected]> * Fix vector-core build.rs Signed-off-by: Jesse Szwedko <[email protected]> * Fix prometheus-parser build.rs too Signed-off-by: Jesse Szwedko <[email protected]> * loki too Signed-off-by: Jesse Szwedko <[email protected]> --------- Signed-off-by: Jesse Szwedko <[email protected]>
vectordotdev · May 24, 2024 · 378f3b0 · 378f3b0
1 parent 5abaa32
commit 378f3b0
Show file tree

Hide file tree

Showing 26 changed files with 34 additions and 19 deletions.
diff --git a/buf.work.yaml b/buf.work.yaml
@@ -1,4 +1,5 @@
 version: v1
 directories:
-  - proto
+  - proto/third-party
+  - proto/vector
   - lib/vector-core/proto
diff --git a/build.rs b/build.rs
@@ -116,13 +116,13 @@ fn main() {
 
     #[cfg(feature = "protobuf-build")]
     {
-        println!("cargo:rerun-if-changed=proto/dd_trace.proto");
-        println!("cargo:rerun-if-changed=proto/dnstap.proto");
-        println!("cargo:rerun-if-changed=proto/ddsketch_full.proto");
-        println!("cargo:rerun-if-changed=proto/dd_metric.proto");
-        println!("cargo:rerun-if-changed=proto/google/pubsub/v1/pubsub.proto");
-        println!("cargo:rerun-if-changed=proto/google/rpc/status.proto");
-        println!("cargo:rerun-if-changed=proto/vector.proto");
+        println!("cargo:rerun-if-changed=proto/third-party/dnstap.proto");
+        println!("cargo:rerun-if-changed=proto/third-party/google/pubsub/v1/pubsub.proto");
+        println!("cargo:rerun-if-changed=proto/third-party/google/rpc/status.proto");
+        println!("cargo:rerun-if-changed=proto/vector/dd_metric.proto");
+        println!("cargo:rerun-if-changed=proto/vector/dd_trace.proto");
+        println!("cargo:rerun-if-changed=proto/vector/ddsketch_full.proto");
+        println!("cargo:rerun-if-changed=proto/vector/vector.proto");
 
         // Create and store the "file descriptor set" from the compiled Protocol Buffers packages.
         //
@@ -144,15 +144,19 @@ fn main() {
                 prost_build,
                 &[
                     "lib/vector-core/proto/event.proto",
-                    "proto/dnstap.proto",
-                    "proto/ddsketch_full.proto",
-                    "proto/dd_metric.proto",
-                    "proto/dd_trace.proto",
-                    "proto/google/pubsub/v1/pubsub.proto",
-                    "proto/google/rpc/status.proto",
-                    "proto/vector.proto",
+                    "proto/third-party/dnstap.proto",
+                    "proto/vector/ddsketch_full.proto",
+                    "proto/vector/dd_metric.proto",
+                    "proto/vector/dd_trace.proto",
+                    "proto/third-party/google/pubsub/v1/pubsub.proto",
+                    "proto/third-party/google/rpc/status.proto",
+                    "proto/vector/vector.proto",
+                ],
+                &[
+                    "proto/third-party",
+                    "proto/vector",
+                    "lib/vector-core/proto/",
                 ],
-                &["proto/", "lib/vector-core/proto/"],
             )
             .unwrap();
     }

diff --git a/lib/loki-logproto/build.rs b/lib/loki-logproto/build.rs
@@ -10,7 +10,7 @@ fn main() -> Result<()> {
             "proto/stats.proto",
             "proto/logproto.proto",
         ],
-        &["proto", "../../proto"],
+        &["proto", "../../proto/third-party"],
     )?;
     Ok(())
 }
diff --git a/lib/prometheus-parser/build.rs b/lib/prometheus-parser/build.rs
@@ -10,7 +10,7 @@ fn main() {
     prost_build
         .compile_protos(
             &["proto/prometheus-remote.proto"],
-            &["proto", "../../proto"],
+            &["proto", "../../proto/third-party"],
         )
         .unwrap();
 }
diff --git a/lib/vector-core/build.rs b/lib/vector-core/build.rs
@@ -4,6 +4,9 @@ fn main() {
         .protoc_arg("--experimental_allow_proto3_optional")
         .btree_map(["."])
         .bytes(["raw_bytes"])
-        .compile_protos(&["proto/event.proto"], &["proto", "../../proto"])
+        .compile_protos(
+            &["proto/event.proto"],
+            &["proto", "../../proto/third-party", "../../proto/vector"],
+        )
         .unwrap();
 }
diff --git a/proto/buf.yaml → proto/third-party/buf.yaml b/proto/buf.yaml → proto/third-party/buf.yaml
diff --git a/proto/dnstap.proto → proto/third-party/dnstap.proto b/proto/dnstap.proto → proto/third-party/dnstap.proto
diff --git a/proto/google/LICENSE-Apache-2.0.txt → ...third-party/google/LICENSE-Apache-2.0.txt b/proto/google/LICENSE-Apache-2.0.txt → ...third-party/google/LICENSE-Apache-2.0.txt
diff --git a/proto/google/README → proto/third-party/google/README b/proto/google/README → proto/third-party/google/README
diff --git a/proto/google/api/annotations.proto → .../third-party/google/api/annotations.proto b/proto/google/api/annotations.proto → .../third-party/google/api/annotations.proto
diff --git a/proto/google/api/client.proto → proto/third-party/google/api/client.proto b/proto/google/api/client.proto → proto/third-party/google/api/client.proto
diff --git a/proto/google/api/field_behavior.proto → ...ird-party/google/api/field_behavior.proto b/proto/google/api/field_behavior.proto → ...ird-party/google/api/field_behavior.proto
diff --git a/proto/google/api/http.proto → proto/third-party/google/api/http.proto b/proto/google/api/http.proto → proto/third-party/google/api/http.proto
diff --git a/proto/google/api/resource.proto → proto/third-party/google/api/resource.proto b/proto/google/api/resource.proto → proto/third-party/google/api/resource.proto
diff --git a/proto/google/protobuf/LICENSE → proto/third-party/google/protobuf/LICENSE b/proto/google/protobuf/LICENSE → proto/third-party/google/protobuf/LICENSE
diff --git a/proto/google/protobuf/any.proto → proto/third-party/google/protobuf/any.proto b/proto/google/protobuf/any.proto → proto/third-party/google/protobuf/any.proto
diff --git a/proto/google/protobuf/descriptor.proto → ...rd-party/google/protobuf/descriptor.proto b/proto/google/protobuf/descriptor.proto → ...rd-party/google/protobuf/descriptor.proto
diff --git a/proto/google/protobuf/empty.proto → ...o/third-party/google/protobuf/empty.proto b/proto/google/protobuf/empty.proto → ...o/third-party/google/protobuf/empty.proto
diff --git a/proto/google/protobuf/timestamp.proto → ...ird-party/google/protobuf/timestamp.proto b/proto/google/protobuf/timestamp.proto → ...ird-party/google/protobuf/timestamp.proto
diff --git a/proto/google/pubsub/v1/pubsub.proto → ...third-party/google/pubsub/v1/pubsub.proto b/proto/google/pubsub/v1/pubsub.proto → ...third-party/google/pubsub/v1/pubsub.proto
diff --git a/proto/google/rpc/status.proto → proto/third-party/google/rpc/status.proto b/proto/google/rpc/status.proto → proto/third-party/google/rpc/status.proto
diff --git a/proto/vector/buf.yaml b/proto/vector/buf.yaml
@@ -0,0 +1,7 @@
+version: v1
+breaking:
+  use:
+    - FILE
+lint:
+  use:
+    - DEFAULT
diff --git a/proto/dd_metric.proto → proto/vector/dd_metric.proto b/proto/dd_metric.proto → proto/vector/dd_metric.proto
diff --git a/proto/dd_trace.proto → proto/vector/dd_trace.proto b/proto/dd_trace.proto → proto/vector/dd_trace.proto
diff --git a/proto/ddsketch_full.proto → proto/vector/ddsketch_full.proto b/proto/ddsketch_full.proto → proto/vector/ddsketch_full.proto
diff --git a/proto/vector.proto → proto/vector/vector.proto b/proto/vector.proto → proto/vector/vector.proto