Skip to content

Commit

Permalink
fix: added some missing feature gates to local.rs
Browse files Browse the repository at this point in the history 
Signed-off-by: Jiaxiao (mossaka) Zhou <duibao55328@gmail.com>
  • Loading branch information
@Mossaka
Mossaka committed Jan 30, 2025
1 parent b47ec16 commit 508fc35
Showing 1 changed file with 23 additions and 18 deletions.
41 changes: 23 additions & 18 deletions crates/containerd-shim-wasm/src/sandbox/shim/local.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ use containerd_shim::util::IntoOption;
use containerd_shim::{DeleteResponse, ExitSignal, TtrpcContext, TtrpcResult};
use log::debug;
use oci_spec::runtime::Spec;
#[cfg(feature = "opentelemetry")]
use tracing_opentelemetry::OpenTelemetrySpanExt as _;

#[cfg(feature = "opentelemetry")]
use super::otel::extract_context;
use crate::sandbox::instance::{Instance, InstanceConfig};
use crate::sandbox::shim::events::{EventSender, RemoteEventSender, ToTimestamp};
Expand Down Expand Up @@ -331,53 +333,56 @@ impl<T: Instance + Sync + Send, E: EventSender> Task for Local<T, E> {
#[cfg_attr(feature = "tracing", tracing::instrument(skip_all, level = "Info"))]
fn create(
&self,
ctx: &TtrpcContext,
_ctx: &TtrpcContext,
req: CreateTaskRequest,
) -> TtrpcResult<CreateTaskResponse> {
debug!("create: {:?}", req);

#[cfg(feature = "opentelemetry")]
tracing::Span::current().set_parent(extract_context(&ctx.metadata));
tracing::Span::current().set_parent(extract_context(&_ctx.metadata));

Ok(self.task_create(req)?)
}

#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), skip_all, level = "Info"))]
fn start(&self, ctx: &TtrpcContext, req: StartRequest) -> TtrpcResult<StartResponse> {
fn start(&self, _ctx: &TtrpcContext, req: StartRequest) -> TtrpcResult<StartResponse> {
debug!("start: {:?}", req);

#[cfg(feature = "opentelemetry")]
tracing::Span::current().set_parent(extract_context(&ctx.metadata));
tracing::Span::current().set_parent(extract_context(&_ctx.metadata));

Ok(self.task_start(req)?)
}

#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), skip_all, level = "Info"))]
fn kill(&self, ctx: &TtrpcContext, req: KillRequest) -> TtrpcResult<Empty> {
fn kill(&self, _ctx: &TtrpcContext, req: KillRequest) -> TtrpcResult<Empty> {
debug!("kill: {:?}", req);

#[cfg(feature = "opentelemetry")]
tracing::Span::current().set_parent(extract_context(&ctx.metadata));
tracing::Span::current().set_parent(extract_context(&_ctx.metadata));

Ok(self.task_kill(req)?)
}

#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), skip_all, level = "Info"))]
fn delete(&self, ctx: &TtrpcContext, req: DeleteRequest) -> TtrpcResult<DeleteResponse> {
fn delete(&self, _ctx: &TtrpcContext, req: DeleteRequest) -> TtrpcResult<DeleteResponse> {
debug!("delete: {:?}", req);
tracing::Span::current().set_parent(extract_context(&ctx.metadata));

#[cfg(feature = "opentelemetry")]
tracing::Span::current().set_parent(extract_context(&_ctx.metadata));

Ok(self.task_delete(req)?)
}

#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), skip_all, level = "Info"))]
fn wait(&self, ctx: &TtrpcContext, req: WaitRequest) -> TtrpcResult<WaitResponse> {
fn wait(&self, _ctx: &TtrpcContext, req: WaitRequest) -> TtrpcResult<WaitResponse> {
debug!("wait: {:?}", req);

#[cfg(feature = "opentelemetry")]
{
use tracing::{span, Level, Span};
let parent_span = Span::current();
parent_span.set_parent(extract_context(&ctx.metadata));
parent_span.set_parent(extract_context(&_ctx.metadata));

let (tx, rx) = std::sync::mpsc::channel();
// Start a thread to export interval span for long wait
Expand All @@ -402,11 +407,11 @@ impl<T: Instance + Sync + Send, E: EventSender> Task for Local<T, E> {
}

#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), skip_all, level = "Info"))]
fn connect(&self, ctx: &TtrpcContext, req: ConnectRequest) -> TtrpcResult<ConnectResponse> {
fn connect(&self, _ctx: &TtrpcContext, req: ConnectRequest) -> TtrpcResult<ConnectResponse> {
debug!("connect: {:?}", req);

#[cfg(feature = "opentelemetry")]
tracing::Span::current().set_parent(extract_context(&ctx.metadata));
tracing::Span::current().set_parent(extract_context(&_ctx.metadata));

let i = self.get_instance(req.id())?;
let shim_pid = std::process::id();
Expand All @@ -419,21 +424,21 @@ impl<T: Instance + Sync + Send, E: EventSender> Task for Local<T, E> {
}

#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), skip_all, level = "Info"))]
fn state(&self, ctx: &TtrpcContext, req: StateRequest) -> TtrpcResult<StateResponse> {
fn state(&self, _ctx: &TtrpcContext, req: StateRequest) -> TtrpcResult<StateResponse> {
debug!("state: {:?}", req);

#[cfg(feature = "opentelemetry")]
tracing::Span::current().set_parent(extract_context(&ctx.metadata));
tracing::Span::current().set_parent(extract_context(&_ctx.metadata));

Ok(self.task_state(req)?)
}

#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), skip_all, level = "Info"))]
fn shutdown(&self, ctx: &TtrpcContext, _: ShutdownRequest) -> TtrpcResult<Empty> {
fn shutdown(&self, _ctx: &TtrpcContext, _: ShutdownRequest) -> TtrpcResult<Empty> {
debug!("shutdown");

#[cfg(feature = "opentelemetry")]
tracing::Span::current().set_parent(extract_context(&ctx.metadata));
tracing::Span::current().set_parent(extract_context(&_ctx.metadata));

if self.is_empty() {
self.exit.signal();
Expand All @@ -442,11 +447,11 @@ impl<T: Instance + Sync + Send, E: EventSender> Task for Local<T, E> {
}

#[cfg_attr(feature = "tracing", tracing::instrument(parent = tracing::Span::current(), skip_all, level = "Info"))]
fn stats(&self, ctx: &TtrpcContext, req: StatsRequest) -> TtrpcResult<StatsResponse> {
fn stats(&self, _ctx: &TtrpcContext, req: StatsRequest) -> TtrpcResult<StatsResponse> {
debug!("stats: {:?}", req);

#[cfg(feature = "opentelemetry")]
tracing::Span::current().set_parent(extract_context(&ctx.metadata));
tracing::Span::current().set_parent(extract_context(&_ctx.metadata));

Ok(self.task_stats(req)?)
}
Expand Down

0 comments on commit 508fc35

Please sign in to comment.