Skip to content

chore(opentelemetry lib): improve build.rs #23551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pront merged 2 commits into from
Aug 7, 2025
Merged

chore(opentelemetry lib): improve build.rs #23551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
188415b
chore(opentelemetry lib): improve build.rs
pront Aug 7, 2025
93202be
Merge branch 'master' into pront-en-otel-lib-build
pront Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/semantic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,3 +254,4 @@ jobs:
website deps

config provider
opentelemetry lib
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions lib/opentelemetry-proto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ publish = false
[build-dependencies]
prost-build.workspace = true
tonic-build.workspace = true
glob.workspace = true

[dependencies]
bytes = { version = "1.10.1", default-features = false, features = ["serde"] }
Expand Down
36 changes: 21 additions & 15 deletions lib/opentelemetry-proto/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,28 @@
use std::io::Error;
use glob::glob;
use std::{env, io::Result, path::PathBuf};

fn main() -> Result<()> {
let proto_root = PathBuf::from("src/proto/opentelemetry-proto");
let include_path = proto_root.clone();

let proto_paths: Vec<_> = glob(&format!("{}/**/*.proto", proto_root.display()))
.expect("Failed to read glob pattern")
.filter_map(|result| result.ok())
.collect();

// Set up re-run triggers
for proto in &proto_paths {
println!("cargo:rerun-if-changed={}", proto.display());
}

let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
let descriptor_path = out_dir.join("opentelemetry-proto.desc");

fn main() -> Result<(), Error> {
tonic_build::configure()
.build_client(true)
.build_server(true)
.compile(
&[
"src/proto/opentelemetry-proto/opentelemetry/proto/common/v1/common.proto",
"src/proto/opentelemetry-proto/opentelemetry/proto/resource/v1/resource.proto",
"src/proto/opentelemetry-proto/opentelemetry/proto/logs/v1/logs.proto",
"src/proto/opentelemetry-proto/opentelemetry/proto/metrics/v1/metrics.proto",
"src/proto/opentelemetry-proto/opentelemetry/proto/trace/v1/trace.proto",
"src/proto/opentelemetry-proto/opentelemetry/proto/collector/trace/v1/trace_service.proto",
"src/proto/opentelemetry-proto/opentelemetry/proto/collector/logs/v1/logs_service.proto",
"src/proto/opentelemetry-proto/opentelemetry/proto/collector/metrics/v1/metrics_service.proto",
],
&["src/proto/opentelemetry-proto"],
)?;
.file_descriptor_set_path(&descriptor_path)
.compile(&proto_paths, &[include_path])?;

Ok(())
}
Loading