Skip to content

Commit

Permalink
Rename proto organization to trace_machina (#389)
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronmondal committed Nov 13, 2023
1 parent 6006e23 commit cf5f45b
Show file tree
Hide file tree
Showing 17 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion cas/grpc_service/tests/worker_api_server_test.rs
Expand Up @@ -28,7 +28,7 @@ use proto::build::bazel::remote::execution::v2::{
ActionResult as ProtoActionResult, ExecuteResponse, ExecutedActionMetadata, LogFile, OutputDirectory, OutputFile,
OutputSymlink,
};
use proto::com::github::allada::turbo_cache::remote_execution::{
use proto::com::github::trace_machina::turbo_cache::remote_execution::{
execute_result, update_for_worker, worker_api_server::WorkerApi, ExecuteResult, KeepAliveRequest,
SupportedProperties,
};
Expand Down
2 changes: 1 addition & 1 deletion cas/grpc_service/worker_api_server.rs
Expand Up @@ -29,7 +29,7 @@ use common::DigestInfo;
use config::cas_server::WorkerApiConfig;
use error::{make_err, Code, Error, ResultExt};
use platform_property_manager::PlatformProperties;
use proto::com::github::allada::turbo_cache::remote_execution::{
use proto::com::github::trace_machina::turbo_cache::remote_execution::{
execute_result, worker_api_server::WorkerApi, worker_api_server::WorkerApiServer as Server, ExecuteResult,
GoingAwayRequest, KeepAliveRequest, SupportedProperties, UpdateForWorker,
};
Expand Down
2 changes: 1 addition & 1 deletion cas/scheduler/tests/simple_scheduler_test.rs
Expand Up @@ -27,7 +27,7 @@ use common::DigestInfo;
use error::{make_err, Code, Error, ResultExt};
use platform_property_manager::{PlatformProperties, PlatformPropertyValue};
use proto::build::bazel::remote::execution::v2::{digest_function, ExecuteRequest};
use proto::com::github::allada::turbo_cache::remote_execution::{
use proto::com::github::trace_machina::turbo_cache::remote_execution::{
update_for_worker, ConnectionResult, StartExecute, UpdateForWorker,
};
use scheduler::{ActionScheduler, WorkerScheduler};
Expand Down
2 changes: 1 addition & 1 deletion cas/scheduler/worker.rs
Expand Up @@ -23,7 +23,7 @@ use action_messages::ActionInfo;
use error::{make_err, make_input_err, Code, Error, ResultExt};
use metrics_utils::{CollectorState, CounterWithTime, FuncCounterWrapper, MetricsComponent};
use platform_property_manager::{PlatformProperties, PlatformPropertyValue};
use proto::com::github::allada::turbo_cache::remote_execution::{
use proto::com::github::trace_machina::turbo_cache::remote_execution::{
update_for_worker, ConnectionResult, StartExecute, UpdateForWorker,
};
use tokio::sync::mpsc::UnboundedSender;
Expand Down
2 changes: 1 addition & 1 deletion cas/worker/local_worker.rs
Expand Up @@ -32,7 +32,7 @@ use config::cas_server::LocalWorkerConfig;
use error::{make_err, make_input_err, Code, Error, ResultExt};
use fast_slow_store::FastSlowStore;
use metrics_utils::{AsyncCounterWrapper, Collector, CollectorState, CounterWithTime, MetricsComponent, Registry};
use proto::com::github::allada::turbo_cache::remote_execution::{
use proto::com::github::trace_machina::turbo_cache::remote_execution::{
execute_result, update_for_worker::Update, worker_api_client::WorkerApiClient, ExecuteResult, KeepAliveRequest,
UpdateForWorker,
};
Expand Down
2 changes: 1 addition & 1 deletion cas/worker/running_actions_manager.rs
Expand Up @@ -67,7 +67,7 @@ use proto::build::bazel::remote::execution::v2::{
ExecuteResponse, FileNode, SymlinkNode, Tree as ProtoTree,
};
use proto::build::bazel::remote::execution::v2::{ActionResult as ProtoActionResult, UpdateActionResultRequest};
use proto::com::github::allada::turbo_cache::remote_execution::{HistoricalExecuteResponse, StartExecute};
use proto::com::github::trace_machina::turbo_cache::remote_execution::{HistoricalExecuteResponse, StartExecute};
use store::Store;

pub type ActionId = [u8; 32];
Expand Down
2 changes: 1 addition & 1 deletion cas/worker/tests/local_worker_test.rs
Expand Up @@ -41,7 +41,7 @@ use memory_store::MemoryStore;
use mock_running_actions_manager::MockRunningAction;
use platform_property_manager::PlatformProperties;
use proto::build::bazel::remote::execution::v2::platform::Property;
use proto::com::github::allada::turbo_cache::remote_execution::{
use proto::com::github::trace_machina::turbo_cache::remote_execution::{
execute_result, update_for_worker::Update, ConnectionResult, ExecuteResult, StartExecute, SupportedProperties,
UpdateForWorker,
};
Expand Down
2 changes: 1 addition & 1 deletion cas/worker/tests/running_actions_manager_test.rs
Expand Up @@ -46,7 +46,7 @@ use proto::build::bazel::remote::execution::v2::{
platform::Property, Action, ActionResult as ProtoActionResult, Command, Directory, DirectoryNode, ExecuteRequest,
ExecuteResponse, FileNode, NodeProperties, Platform, SymlinkNode, Tree,
};
use proto::com::github::allada::turbo_cache::remote_execution::{HistoricalExecuteResponse, StartExecute};
use proto::com::github::trace_machina::turbo_cache::remote_execution::{HistoricalExecuteResponse, StartExecute};
use running_actions_manager::{
download_to_directory, Callbacks, ExecutionConfiguration, RunningAction, RunningActionImpl, RunningActionsManager,
RunningActionsManagerArgs, RunningActionsManagerImpl,
Expand Down
2 changes: 1 addition & 1 deletion cas/worker/tests/utils/local_worker_test_utils.rs
Expand Up @@ -31,7 +31,7 @@ use error::Error;
use local_worker::LocalWorker;
use mock_running_actions_manager::MockRunningActionsManager;
use mock_worker_api_client::MockWorkerApiClient;
use proto::com::github::allada::turbo_cache::remote_execution::UpdateForWorker;
use proto::com::github::trace_machina::turbo_cache::remote_execution::UpdateForWorker;

pub fn setup_grpc_stream() -> (HyperSender, Response<Streaming<UpdateForWorker>>) {
let (tx, body) = Body::channel();
Expand Down
2 changes: 1 addition & 1 deletion cas/worker/tests/utils/mock_running_actions_manager.rs
Expand Up @@ -21,7 +21,7 @@ use tokio::sync::mpsc;
use action_messages::ActionResult;
use common::DigestInfo;
use error::{make_input_err, Error};
use proto::com::github::allada::turbo_cache::remote_execution::StartExecute;
use proto::com::github::trace_machina::turbo_cache::remote_execution::StartExecute;
use running_actions_manager::{Metrics, RunningAction, RunningActionsManager};

#[derive(Debug)]
Expand Down
2 changes: 1 addition & 1 deletion cas/worker/tests/utils/mock_worker_api_client.rs
Expand Up @@ -19,7 +19,7 @@ use async_trait::async_trait;
use tokio::sync::mpsc;
use tonic::{Response, Status, Streaming};

use proto::com::github::allada::turbo_cache::remote_execution::{
use proto::com::github::trace_machina::turbo_cache::remote_execution::{
ExecuteResult, GoingAwayRequest, KeepAliveRequest, SupportedProperties, UpdateForWorker,
};
use worker_api_client_wrapper::WorkerApiClientTrait;
Expand Down
2 changes: 1 addition & 1 deletion cas/worker/worker_api_client_wrapper.rs
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

use async_trait::async_trait;
use proto::com::github::allada::turbo_cache::remote_execution::{
use proto::com::github::trace_machina::turbo_cache::remote_execution::{
worker_api_client::WorkerApiClient, ExecuteResult, GoingAwayRequest, KeepAliveRequest, SupportedProperties,
UpdateForWorker,
};
Expand Down
2 changes: 1 addition & 1 deletion cas/worker/worker_utils.rs
Expand Up @@ -25,7 +25,7 @@ use common::log;
use config::cas_server::WrokerProperty;
use error::{make_err, make_input_err, Error, ResultExt};
use proto::build::bazel::remote::execution::v2::platform::Property;
use proto::com::github::allada::turbo_cache::remote_execution::SupportedProperties;
use proto::com::github::trace_machina::turbo_cache::remote_execution::SupportedProperties;

pub async fn make_supported_properties<S: BuildHasher>(
worker_properties: &HashMap<String, WrokerProperty, S>,
Expand Down
10 changes: 5 additions & 5 deletions proto/BUILD.bazel
Expand Up @@ -3,7 +3,7 @@ load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_library")
PROTO_NAMES = [
"build.bazel.remote.execution.v2",
"build.bazel.semver",
"com.github.allada.turbo_cache.remote_execution",
"com.github.trace_machina.turbo_cache.remote_execution",
"google.api",
"google.bytestream",
"google.longrunning",
Expand All @@ -25,7 +25,7 @@ genrule(
srcs = [
"build/bazel/remote/execution/v2/remote_execution.proto",
"build/bazel/semver/semver.proto",
"com/github/allada/turbo_cache/remote_execution/worker_api.proto",
"com/github/trace_machina/turbo_cache/remote_execution/worker_api.proto",
"google/api/annotations.proto",
"google/api/client.proto",
"google/api/http.proto",
Expand Down Expand Up @@ -72,22 +72,22 @@ genrule(
rust_library(
name = "proto",
srcs = glob(["genproto/*.rs"]),
tags = ["no-rustfmt"],
visibility = ["//visibility:public"],
deps = [
"@crate_index//:prost",
"@crate_index//:prost-types",
"@crate_index//:tonic",
],
tags = ["no-rustfmt"],
)

py_binary(
name = "update_protos",
srcs = ["update_protos.py"],
args = ["--update"] + PROTO_NAMES,
data = [
":gen_rs_protos",
":gen_lib_rs",
":gen_rs_protos",
],
)

Expand All @@ -97,8 +97,8 @@ py_test(
srcs = ["update_protos.py"],
args = ["--check"] + PROTO_NAMES,
data = glob(["genproto/*.rs"]) + [
":gen_rs_protos",
":gen_lib_rs",
":gen_rs_protos",
],
main = "update_protos.py",
)
Expand Up @@ -14,7 +14,7 @@

syntax = "proto3";

package com.github.allada.turbo_cache.remote_execution;
package com.github.trace_machina.turbo_cache.remote_execution;

import "build/bazel/remote/execution/v2/remote_execution.proto";
import "google/protobuf/empty.proto";
Expand Down Expand Up @@ -85,7 +85,7 @@ message SupportedProperties {
/// the unsupported properties.
///
/// The details on how to use this property can be found here:
/// https://github.com/allada/turbo-cache/blob/c91f61edf182f2b64451fd48a5e63fa506a43aae/config/cas_server.rs
/// https://github.com/trace_machina/turbo-cache/blob/c91f61edf182f2b64451fd48a5e63fa506a43aae/config/cas_server.rs
repeated build.bazel.remote.execution.v2.Platform.Property properties = 1;
reserved 2; // NextId.
}
Expand Down
Expand Up @@ -42,7 +42,7 @@ pub struct SupportedProperties {
/// / the unsupported properties.
/// /
/// / The details on how to use this property can be found here:
/// / <https://github.com/allada/turbo-cache/blob/c91f61edf182f2b64451fd48a5e63fa506a43aae/config/cas_server.rs>
/// / <https://github.com/trace_machina/turbo-cache/blob/c91f61edf182f2b64451fd48a5e63fa506a43aae/config/cas_server.rs>
#[prost(message, repeated, tag = "1")]
pub properties: ::prost::alloc::vec::Vec<
super::super::super::super::super::build::bazel::remote::execution::v2::platform::Property,
Expand Down Expand Up @@ -281,13 +281,13 @@ pub mod worker_api_client {
})?;
let codec = tonic::codec::ProstCodec::default();
let path = http::uri::PathAndQuery::from_static(
"/com.github.allada.turbo_cache.remote_execution.WorkerApi/ConnectWorker",
"/com.github.trace_machina.turbo_cache.remote_execution.WorkerApi/ConnectWorker",
);
let mut req = request.into_request();
req.extensions_mut()
.insert(
GrpcMethod::new(
"com.github.allada.turbo_cache.remote_execution.WorkerApi",
"com.github.trace_machina.turbo_cache.remote_execution.WorkerApi",
"ConnectWorker",
),
);
Expand All @@ -313,13 +313,13 @@ pub mod worker_api_client {
})?;
let codec = tonic::codec::ProstCodec::default();
let path = http::uri::PathAndQuery::from_static(
"/com.github.allada.turbo_cache.remote_execution.WorkerApi/KeepAlive",
"/com.github.trace_machina.turbo_cache.remote_execution.WorkerApi/KeepAlive",
);
let mut req = request.into_request();
req.extensions_mut()
.insert(
GrpcMethod::new(
"com.github.allada.turbo_cache.remote_execution.WorkerApi",
"com.github.trace_machina.turbo_cache.remote_execution.WorkerApi",
"KeepAlive",
),
);
Expand Down Expand Up @@ -351,13 +351,13 @@ pub mod worker_api_client {
})?;
let codec = tonic::codec::ProstCodec::default();
let path = http::uri::PathAndQuery::from_static(
"/com.github.allada.turbo_cache.remote_execution.WorkerApi/GoingAway",
"/com.github.trace_machina.turbo_cache.remote_execution.WorkerApi/GoingAway",
);
let mut req = request.into_request();
req.extensions_mut()
.insert(
GrpcMethod::new(
"com.github.allada.turbo_cache.remote_execution.WorkerApi",
"com.github.trace_machina.turbo_cache.remote_execution.WorkerApi",
"GoingAway",
),
);
Expand All @@ -379,13 +379,13 @@ pub mod worker_api_client {
})?;
let codec = tonic::codec::ProstCodec::default();
let path = http::uri::PathAndQuery::from_static(
"/com.github.allada.turbo_cache.remote_execution.WorkerApi/ExecutionResponse",
"/com.github.trace_machina.turbo_cache.remote_execution.WorkerApi/ExecutionResponse",
);
let mut req = request.into_request();
req.extensions_mut()
.insert(
GrpcMethod::new(
"com.github.allada.turbo_cache.remote_execution.WorkerApi",
"com.github.trace_machina.turbo_cache.remote_execution.WorkerApi",
"ExecutionResponse",
),
);
Expand Down Expand Up @@ -533,7 +533,7 @@ pub mod worker_api_server {
fn call(&mut self, req: http::Request<B>) -> Self::Future {
let inner = self.inner.clone();
match req.uri().path() {
"/com.github.allada.turbo_cache.remote_execution.WorkerApi/ConnectWorker" => {
"/com.github.trace_machina.turbo_cache.remote_execution.WorkerApi/ConnectWorker" => {
#[allow(non_camel_case_types)]
struct ConnectWorkerSvc<T: WorkerApi>(pub Arc<T>);
impl<
Expand Down Expand Up @@ -580,7 +580,7 @@ pub mod worker_api_server {
};
Box::pin(fut)
}
"/com.github.allada.turbo_cache.remote_execution.WorkerApi/KeepAlive" => {
"/com.github.trace_machina.turbo_cache.remote_execution.WorkerApi/KeepAlive" => {
#[allow(non_camel_case_types)]
struct KeepAliveSvc<T: WorkerApi>(pub Arc<T>);
impl<
Expand Down Expand Up @@ -624,7 +624,7 @@ pub mod worker_api_server {
};
Box::pin(fut)
}
"/com.github.allada.turbo_cache.remote_execution.WorkerApi/GoingAway" => {
"/com.github.trace_machina.turbo_cache.remote_execution.WorkerApi/GoingAway" => {
#[allow(non_camel_case_types)]
struct GoingAwaySvc<T: WorkerApi>(pub Arc<T>);
impl<
Expand Down Expand Up @@ -668,7 +668,7 @@ pub mod worker_api_server {
};
Box::pin(fut)
}
"/com.github.allada.turbo_cache.remote_execution.WorkerApi/ExecutionResponse" => {
"/com.github.trace_machina.turbo_cache.remote_execution.WorkerApi/ExecutionResponse" => {
#[allow(non_camel_case_types)]
struct ExecutionResponseSvc<T: WorkerApi>(pub Arc<T>);
impl<T: WorkerApi> tonic::server::UnaryService<super::ExecuteResult>
Expand Down Expand Up @@ -750,6 +750,6 @@ pub mod worker_api_server {
}
}
impl<T: WorkerApi> tonic::server::NamedService for WorkerApiServer<T> {
const NAME: &'static str = "com.github.allada.turbo_cache.remote_execution.WorkerApi";
const NAME: &'static str = "com.github.trace_machina.turbo_cache.remote_execution.WorkerApi";
}
}
4 changes: 2 additions & 2 deletions proto/genproto/lib.rs
Expand Up @@ -33,10 +33,10 @@ pub mod build {
}
pub mod com {
pub mod github {
pub mod allada {
pub mod trace_machina {
pub mod turbo_cache {
pub mod remote_execution {
include!("com.github.allada.turbo_cache.remote_execution.pb.rs");
include!("com.github.trace_machina.turbo_cache.remote_execution.pb.rs");
}
}
}
Expand Down

0 comments on commit cf5f45b

Please sign in to comment.