Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bug: service name being unknown #1202

Merged
merged 1 commit into from Sep 6, 2023
Merged

bug: service name being unknown #1202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions common/src/log.rs
View file
Open in desktop
Expand Up @@ -31,6 +31,7 @@ pub enum Backend {
Logger,
Provisioner,
ResourceRecorder,
Runtime(String),
}

#[derive(Clone, Debug, Deserialize, Serialize)]
Expand Down
7 changes: 5 additions & 2 deletions deployer/src/runtime_manager.rs
View file
Open in desktop
Expand Up @@ -3,7 +3,10 @@ use std::{collections::HashMap, path::PathBuf, sync::Arc};
use anyhow::Context;
use chrono::Utc;
use prost_types::Timestamp;
use shuttle_common::claims::{ClaimService, InjectPropagation};
use shuttle_common::{
claims::{ClaimService, InjectPropagation},
log::Backend,
};
use shuttle_proto::{
logger::{logger_client::LoggerClient, Batcher, LogItem, LogLine},
runtime::{self, runtime_client::RuntimeClient, StopRequest},
Expand Down Expand Up @@ -154,7 +157,7 @@ impl RuntimeManager {
let log = LogItem {
deployment_id: id.to_string(),
log_line: Some(LogLine {
service_name: service_name.to_string(),
service_name: Backend::Runtime(service_name.clone()).to_string(),
tx_timestamp: Some(Timestamp {
seconds: utc.timestamp(),
nanos: utc.timestamp_subsec_nanos().try_into().unwrap_or_default(),
Expand Down