fix(core): fix wrong tags for metrics

packages/common/api-builder/src/middleware.rs

@@ -200,7 +200,6 @@ pub async fn http_logging_middleware(
 			&[
 				KeyValue::new("method", method_clone.to_string()),
 				KeyValue::new("path", path_clone.clone()),
-				KeyValue::new("watch", "false"),
 			],
 		);
 
@@ -214,7 +213,6 @@ pub async fn http_logging_middleware(
 			&[
 				KeyValue::new("method", method_clone.to_string()),
 				KeyValue::new("path", path_clone.clone()),
-				KeyValue::new("watch", "false"),
 				KeyValue::new("status", status.to_string()),
 				KeyValue::new("error_code", error_code.clone()),
 			],
@@ -226,7 +224,6 @@ pub async fn http_logging_middleware(
 				&[
 					KeyValue::new("method", method_clone.to_string()),
 					KeyValue::new("path", path_clone.clone()),
-					KeyValue::new("watch", "false"),
 					KeyValue::new("status", status.to_string()),
 					KeyValue::new("error_code", error_code),
 				],

packages/common/api-util/src/lib.rs

@@ -1,15 +1,16 @@
 use anyhow::{Context, Result};
 use axum::{body::Body, response::Response};
 use futures_util::StreamExt;
 use rivet_api_builder::{ApiCtx, ErrorResponse, RawErrorResponse};
-use serde::{Serialize, de::DeserializeOwned};
+use serde::{de::DeserializeOwned, Serialize};
 use std::future::Future;
 
 mod errors;
 
 pub use axum::http::{HeaderMap, Method};
 
 /// Generic function to make raw requests to remote datacenters by label (returns axum Response)
+#[tracing::instrument(skip(ctx, headers, query, body))]
 pub async fn request_remote_datacenter_raw(
 	ctx: &ApiCtx,
 	dc_label: u16,
@@ -32,6 +33,8 @@
 		url.set_query(Some(&serde_html_form::to_string(q)?));
 	}
 
+	tracing::debug!(%method, %url, "sending raw request to remote datacenter");
+
 	let mut request = client.request(method, url).headers(headers);
 
 	if let Some(b) = body {
@@ -48,6 +51,7 @@
 }
 
 /// Generic function to make requests to a specific datacenter
+#[tracing::instrument(skip(config, headers, query, body))]
 pub async fn request_remote_datacenter<T>(
 	config: &rivet_config::Config,
 	dc_label: u16,
@@ -72,6 +76,8 @@
 		url.set_query(Some(&serde_html_form::to_string(q)?));
 	}
 
+	tracing::debug!(%method, %url, "sending request to remote datacenter");
+
 	let mut request = client.request(method, url).headers(headers);
 
 	if let Some(b) = body {
@@ -89,6 +95,7 @@
 
 /// Generic function to fanout requests to all datacenters and aggregate results
 /// Returns aggregated results and errors only if all requests fail
+#[tracing::instrument(skip(ctx, headers, query, local_handler, aggregator))]
 pub async fn fanout_to_datacenters<I, Q, F, Fut, A, R>(
 	ctx: ApiCtx,
 	headers: HeaderMap,
@@ -164,6 +171,7 @@
 	Ok(aggregated)
 }
 
+#[tracing::instrument(skip_all)]
 pub async fn reqwest_to_axum_response(reqwest_response: reqwest::Response) -> Result<Response> {
 	let status = reqwest_response.status();
 	let headers = reqwest_response.headers().clone();
@@ -178,6 +186,7 @@
 	Ok(response)
 }
 
+#[tracing::instrument(skip_all)]
 pub async fn parse_response<T: DeserializeOwned>(reqwest_response: reqwest::Response) -> Result<T> {
 	let status = reqwest_response.status();
 	let response_text = reqwest_response.text().await?;

packages/common/runtime/src/traces.rs

@@ -2,7 +2,7 @@
 
 use console_subscriber;
 use opentelemetry::trace::TracerProvider;
 use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge;
 use rivet_metrics::OtelProviderGuard;
 use tracing_opentelemetry::{MetricsLayer, OpenTelemetryLayer};
 use tracing_subscriber::{EnvFilter, Layer, layer::SubscriberExt, util::SubscriberInitExt};
@@ -12,32 +12,27 @@
 	let registry = tracing_subscriber::registry();
 
 	// Build and apply otel layers to the registry if otel is enabled
-	let (otel_trace_layer, otel_metric_layer, otel_log_layer) = match otel_providers {
+	let (otel_trace_layer, otel_metric_layer) = match otel_providers {
 		Some(providers) => {
 			let tracer = providers.tracer_provider.tracer("tracing-otel-subscriber");
 
 			let otel_trace_layer =
 				OpenTelemetryLayer::new(tracer).with_filter(env_filter("RUST_TRACE"));
 
 			let otel_metric_layer = MetricsLayer::new(providers.meter_provider.clone())
 				.with_filter(env_filter("RUST_TRACE"));
 
-			let otel_log_layer = OpenTelemetryTracingBridge::new(&providers.logger_provider)
-				.with_filter(env_filter("RUST_LOG"));
-
 			(
 				Some(otel_trace_layer),
 				Some(otel_metric_layer),
-				Some(otel_log_layer),
 			)
 		}
-		None => (None, None, None),
+		None => (None, None),
 	};
 
 	let registry = registry
 		.with(otel_metric_layer)
-		.with(otel_trace_layer)
-		.with(otel_log_layer);
+		.with(otel_trace_layer);
 
 	// Check if tokio console is enabled
 	let enable_tokio_console = std::env::var("TOKIO_CONSOLE_ENABLE").map_or(false, |x| x == "1");

packages/core/api-peer/src/actors/create.rs

@@ -3,6 +3,7 @@ use gas::prelude::*;
 use rivet_api_builder::ApiCtx;
 use rivet_api_types::actors::create::{CreateQuery, CreateRequest, CreateResponse};
 
+#[tracing::instrument(skip_all)]
 pub async fn create(
 	ctx: ApiCtx,
 	_path: (),

packages/core/api-peer/src/actors/delete.rs

@@ -34,6 +34,7 @@ pub struct DeletePath {
         (status = 200, body = DeleteResponse),
     ),
 )]
+#[tracing::instrument(skip_all)]
 pub async fn delete(ctx: ApiCtx, path: DeletePath, query: DeleteQuery) -> Result<DeleteResponse> {
 	// Get the actor first to verify it exists
 	let actors_res = ctx

packages/core/api-peer/src/actors/list.rs

@@ -11,6 +11,7 @@ use rivet_api_types::{actors::list::*, pagination::Pagination};
         (status = 200, body = ListResponse),
     ),
 )]
+#[tracing::instrument(skip_all)]
 pub async fn list(ctx: ApiCtx, _path: (), query: ListQuery) -> Result<ListResponse> {
 	let key = query.key;
 	let actor_ids = query.actor_ids.as_ref().map(|x| {

packages/core/api-peer/src/actors/list_names.rs

@@ -12,6 +12,7 @@ use rivet_types::actors::ActorName;
         (status = 200, body = ListNamesResponse),
     ),
 )]
+#[tracing::instrument(skip_all)]
 pub async fn list_names(
 	ctx: ApiCtx,
 	_path: (),

packages/core/api-peer/src/internal.rs

@@ -12,6 +12,7 @@ pub struct CachePurgeRequest {
 #[derive(Serialize)]
 pub struct CachePurgeResponse {}
 
+#[tracing::instrument(skip_all)]
 pub async fn cache_purge(
 	ctx: ApiCtx,
 	_path: (),
@@ -30,6 +31,7 @@ pub async fn cache_purge(
 #[derive(Serialize)]
 pub struct BumpServerlessAutoscalerResponse {}
 
+#[tracing::instrument(skip_all)]
 pub async fn bump_serverless_autoscaler(
 	ctx: ApiCtx,
 	_path: (),

packages/core/api-peer/src/lib.rs

@@ -11,6 +11,7 @@ pub mod runners;
 
 pub use router::router as create_router;
 
+#[tracing::instrument(skip_all)]
 pub async fn start(config: rivet_config::Config, pools: rivet_pools::Pools) -> Result<()> {
 	let host = config.api_peer().host();
 	let port = config.api_peer().port();

packages/core/api-peer/src/namespaces.rs

@@ -6,6 +6,7 @@ use rivet_util::Id;
 use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
 
+#[tracing::instrument(skip_all)]
 pub async fn list(ctx: ApiCtx, _path: (), query: ListQuery) -> Result<ListResponse> {
 	let namespace_ids = query.namespace_ids.as_ref().map(|x| {
 		x.split(',')
@@ -72,6 +73,7 @@ pub struct CreateResponse {
 	pub namespace: rivet_types::namespaces::Namespace,
 }
 
+#[tracing::instrument(skip_all)]
 pub async fn create(
 	ctx: ApiCtx,
 	_path: (),

packages/core/api-peer/src/router.rs

@@ -2,6 +2,7 @@ use rivet_api_builder::{create_router, prelude::*};
 
 use crate::{actors, internal, namespaces, runner_configs, runners};
 
+#[tracing::instrument(skip_all)]
 pub async fn router(
 	name: &'static str,
 	config: rivet_config::Config,

packages/core/api-peer/src/runner_configs.rs

@@ -6,6 +6,7 @@ use rivet_types::keys::namespace::runner_config::RunnerConfigVariant;
 use serde::{Deserialize, Serialize};
 use utoipa::{IntoParams, ToSchema};
 
+#[tracing::instrument(skip_all)]
 pub async fn list(ctx: ApiCtx, _path: ListPath, query: ListQuery) -> Result<ListResponse> {
 	let namespace = ctx
 		.op(namespace::ops::resolve_for_name_global::Input {
@@ -94,6 +95,7 @@ pub struct UpsertRequest(pub rivet_api_types::namespaces::runner_configs::Runner
 #[schema(as = RunnerConfigsUpsertResponse)]
 pub struct UpsertResponse {}
 
+#[tracing::instrument(skip_all)]
 pub async fn upsert(
 	ctx: ApiCtx,
 	path: UpsertPath,
@@ -134,6 +136,7 @@ pub struct DeletePath {
 #[schema(as = RunnerConfigsDeleteResponse)]
 pub struct DeleteResponse {}
 
+#[tracing::instrument(skip_all)]
 pub async fn delete(ctx: ApiCtx, path: DeletePath, query: DeleteQuery) -> Result<DeleteResponse> {
 	let namespace = ctx
 		.op(namespace::ops::resolve_for_name_global::Input {

packages/core/api-peer/src/runners.rs

@@ -13,6 +13,7 @@ use utoipa::{IntoParams, ToSchema};
         (status = 200, body = ListResponse),
     ),
 )]
+#[tracing::instrument(skip_all)]
 pub async fn list(ctx: ApiCtx, _path: (), query: ListQuery) -> Result<ListResponse> {
 	let namespace = ctx
 		.op(namespace::ops::resolve_for_name_global::Input {
@@ -76,6 +77,7 @@ pub struct ListNamesResponse {
 	pub pagination: Pagination,
 }
 
+#[tracing::instrument(skip_all)]
 pub async fn list_names(
 	ctx: ApiCtx,
 	_path: (),

packages/core/api-public/src/actors/create.rs

@@ -59,6 +59,7 @@ pub async fn create(
 	}
 }
 
+#[tracing::instrument(skip_all)]
 async fn create_inner(
 	ctx: ApiCtx,
 	headers: HeaderMap,

packages/core/api-public/src/actors/delete.rs

@@ -49,6 +49,7 @@ pub struct DeleteResponse {}
     ),
 	security(("bearer_auth" = [])),
 )]
+#[tracing::instrument(skip_all)]
 pub async fn delete(
 	Extension(ctx): Extension<ApiCtx>,
 	headers: HeaderMap,
@@ -61,6 +62,7 @@ pub async fn delete(
 	}
 }
 
+#[tracing::instrument(skip_all)]
 async fn delete_inner(
 	ctx: ApiCtx,
 	headers: HeaderMap,

packages/core/api-public/src/actors/get_or_create.rs

@@ -87,6 +87,7 @@ pub async fn get_or_create(
 	}
 }
 
+#[tracing::instrument(skip_all)]
 async fn get_or_create_inner(
 	ctx: ApiCtx,
 	headers: HeaderMap,

packages/core/api-public/src/actors/list_names.rs

@@ -28,6 +28,7 @@ use crate::ctx::ApiCtx;
     ),
 	security(("bearer_auth" = [])),
 )]
+#[tracing::instrument(skip_all)]
 pub async fn list_names(
 	Extension(ctx): Extension<ApiCtx>,
 	headers: HeaderMap,
@@ -39,6 +40,7 @@ pub async fn list_names(
 	}
 }
 
+#[tracing::instrument(skip_all)]
 async fn list_names_inner(
 	ctx: ApiCtx,
 	headers: HeaderMap,

packages/core/api-public/src/actors/utils.rs

@@ -9,6 +9,7 @@ use std::collections::HashMap;
 
 /// Helper function to fetch an actor by ID, automatically routing to the correct datacenter
 /// based on the actor ID's label.
+#[tracing::instrument(skip_all)]
 pub async fn fetch_actor_by_id(
 	ctx: &ApiCtx,
 	headers: HeaderMap,
@@ -55,6 +56,7 @@ pub async fn fetch_actor_by_id(
 
 /// Helper function to fetch multiple actors by their IDs, automatically routing to the correct datacenters
 /// based on each actor ID's label. This function batches requests by datacenter for efficiency.
+#[tracing::instrument(skip_all)]
 pub async fn fetch_actors_by_ids(
 	ctx: &ApiCtx,
 	headers: HeaderMap,
@@ -186,6 +188,7 @@ pub fn extract_duplicate_key_error(err: &anyhow::Error) -> Option<Id> {
 }
 
 /// Determine the datacenter label to create the actor in.
+#[tracing::instrument(skip_all)]
 pub async fn find_dc_for_actor_creation(
 	ctx: &ApiCtx,
 	namespace_id: Id,

packages/core/api-public/src/datacenters.rs

@@ -15,6 +15,7 @@ use crate::ctx::ApiCtx;
     ),
 	security(("bearer_auth" = [])),
 )]
+#[tracing::instrument(skip_all)]
 pub async fn list(Extension(ctx): Extension<ApiCtx>) -> Response {
 	match list_inner(ctx).await {
 		Ok(response) => Json(response).into_response(),

packages/core/api-public/src/health.rs

@@ -1,4 +1,4 @@
 use anyhow::Result;
 use axum::{extract::Extension, response::IntoResponse, Json};
 use futures_util::StreamExt;
 use rivet_api_builder::ApiError;
@@ -47,6 +47,7 @@
 	),
 	security(("bearer_auth" = [])),
 )]
+#[tracing::instrument(skip_all)]
 pub async fn fanout(Extension(ctx): Extension<ApiCtx>) -> impl IntoResponse {
 	match fanout_inner(ctx).await {
 		Ok(response) => Json(response).into_response(),
@@ -126,6 +127,7 @@
 	})
 }
 
+#[tracing::instrument(skip_all)]
 async fn send_health_check(
 	ctx: &ApiCtx,
 	dc: &rivet_config::config::topology::Datacenter,
@@ -149,7 +151,7 @@
 		let response = res.json::<HealthResponse>().await?;
 		Ok(response)
 	} else {
 		anyhow::bail!("Health check returned status: {}", res.status())
 	}
 }
 

packages/core/api-public/src/metadata.rs

@@ -3,6 +3,7 @@ use axum::response::IntoResponse;
 use serde_json::json;
 
 /// Returns metadata about the API including runtime and version
+#[tracing::instrument(skip_all)]
 pub async fn get_metadata() -> impl IntoResponse {
 	Json(json!({
 		"runtime": "engine",