revert fake tests, fix deployment

Author: gzp79

crates/shine-core/src/telemetry/telemetry_service.rs

@@ -334,7 +334,7 @@ impl TelemetryService {
             .build();
 
         self.install_metrics(config, &resource, &scope)?;
-        //self.install_trace(config, &resource, &scope)?;
+        self.install_trace(config, &resource, &scope)?;
 
         Ok(())
     }

crates/shine-core/src/web/web_app.rs

@@ -107,14 +107,14 @@ async fn prepare_web_app<A: WebApplication>(
     let stage = args.get(1).ok_or(anyhow!("Missing config stage parameter"))?.clone();
 
     // initialize a pre-init logger
-    // let _pre_init_log_guard = {
-    //     LogTracer::init().expect("Failed to set log tracer");
-    //     let env_filter = EnvFilter::builder()
-    //         .with_default_directive(LevelFilter::INFO.into())
-    //         .from_env_lossy();
-    //     let pre_init_log = tracing_subscriber::fmt().with_env_filter(env_filter).compact().finish();
-    //     tracing::dispatcher::set_default(&pre_init_log.into())
-    // };
+    let _pre_init_log_guard = {
+        LogTracer::init().expect("Failed to set log tracer");
+        let env_filter = EnvFilter::builder()
+            .with_default_directive(LevelFilter::INFO.into())
+            .from_env_lossy();
+        let pre_init_log = tracing_subscriber::fmt().with_env_filter(env_filter).compact().finish();
+        tracing::dispatcher::set_default(&pre_init_log.into())
+    };
 
     log::trace!("init-trace - ok");
     log::debug!("init-debug - ok");
@@ -274,13 +274,6 @@ async fn start_web_app<A: WebApplication>(app: A) -> Result<(), AnyError> {
 pub fn run_web_app<A: WebApplication>(app: A) {
     let _ = rustls::crypto::ring::default_provider().install_default();
 
-    LogTracer::init().expect("Failed to set log tracer");
-    let env_filter = EnvFilter::builder()
-        .with_default_directive(LevelFilter::DEBUG.into())
-        .from_env_lossy();
-    let pre_init_log = tracing_subscriber::fmt().with_env_filter(env_filter).compact().finish();
-    tracing::dispatcher::set_global_default(pre_init_log.into());
-
     let rt = Runtime::new().unwrap();
     let handle = rt.handle();
 

docker/supervisord.conf

@@ -1,41 +1,36 @@
 [supervisord]
 user=root
 nodaemon=true
-redirect_stderr=true
-logfile=/dev/stdout 
-logfile_maxbytes=0  
-loglevel=debug
 
 [program:nginx]
-user=root
 command=nginx -c /etc/nginx/nginx.conf  -g 'daemon off;'
 process_name=%(program_name)s_%(process_num)02d
 numprocs=1
 autostart=true
 autorestart=false
 startsecs=0
+redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
 
 [program:shine-identity]
-user=root
 directory=/app
 command=/app/start-identity.sh
 process_name=%(program_name)s_%(process_num)02d
 autostart=true
 autorestart=true
 startsecs=0
 redirect_stderr=true
-logfile=/dev/stdout 
-logfile_maxbytes=0  
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
 
 [program:shine-builder]
-user=root
 directory=/app
 command=/app/start-builder.sh
 process_name=%(program_name)s_%(process_num)02d
 autostart=true
 autorestart=true
 startsecs=0
 redirect_stderr=true
-logfile=/dev/stdout 
-logfile_maxbytes=0  
-
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0

fly.json

@@ -3,7 +3,7 @@
   "primary_region": "cdg",
 
   "build": {
-    "image": "ghcr.io/gzp79/shine-services:sha-4035eeb"
+    "image": "%DOCKER_IMAGE%"
   },
 
   "services": [