Merge pull request #27 from MarcusDunn/nginx-fix-and-logging

fixed dockerfiles and added logging to quote server adapter

distribution-server/Dockerfile

@@ -7,4 +7,5 @@ RUN cd /opt ; unzip opentelemetry-webserver-sdk-x64-linux.tgz.zip; tar xvfz open
 RUN cd /opt/opentelemetry-webserver-sdk; ./install.sh
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/opentelemetry-webserver-sdk/sdk_lib/lib
 RUN echo "load_module /opt/opentelemetry-webserver-sdk/WebServerModule/Nginx/ngx_http_opentelemetry_module.so;\n$(cat /etc/nginx/nginx.conf)" > /etc/nginx/nginx.conf
+COPY default.conf.template /etc/nginx/templates/default.conf.template
 COPY opentelemetry_module.conf.template /etc/nginx/templates/conf.d.template

docker-compose.yml

@@ -10,8 +10,10 @@ services:
   quote-server-adaptor:
     image: ghcr.io/marcusdunn/day-trader/quote-server-adaptor:latest
     environment:
-      QUOTE_SERVER_URI: quoteserver.seng.uvic.ca:4444
-      OTEL_EXPORTER_URI: jaeger:14268
+      QUOTE_SERVER_URI: FAKE
+      OTEL_EXPORTER_URI: jaeger:14268/api/traces
+    ports:
+      - "5000:5000"
   distribution-server:
     image: ghcr.io/marcusdunn/day-trader/distribution-server:latest
     environment:

quote-server-adaptor/Cargo.toml

@@ -8,7 +8,7 @@ tokio = { version = "1.25.0", features = ["io-util", "rt-multi-thread", "macros"
 tonic = "0.8.3"
 prost = "0.11.6"
 tracing = "0.1.37"
-tracing-subscriber = "0.3.16"
+tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
 tracing-opentelemetry = "0.18.0"
 opentelemetry = { version = "0.18.0", features = ["rt-tokio", "trace"] }
 opentelemetry-jaeger = { version = "0.17.0", features = ["rt-tokio", "reqwest_collector_client"] }

quote-server-adaptor/src/main.rs

@@ -20,23 +20,37 @@ use tokio::sync::oneshot::Sender;
 use tokio::sync::{mpsc, oneshot};
 use tonic::transport::Server;
 use tonic::{Request, Response, Status};
-use tracing::{info, instrument};
+use tracing::{info, instrument, Level};
+use tracing_subscriber::filter::{Directive, LevelFilter};
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;
+use tracing_subscriber::{EnvFilter, Layer};
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
     global::set_text_map_propagator(TraceContextPropagator::new());
 
-    let tracer = opentelemetry_jaeger::new_collector_pipeline()
+    let open_telemetry_tracer = opentelemetry_jaeger::new_collector_pipeline()
         .with_reqwest()
         .with_service_name("quote-server-adaptor")
         .with_endpoint(env::var("OTEL_EXPORTER_URI").expect("OTEL_EXPORTER_URI should be set"))
         .install_batch(Tokio)?;
 
     tracing_subscriber::registry()
-        .with(tracing::level_filters::LevelFilter::INFO)
-        .with(tracing_opentelemetry::layer().with_tracer(tracer.clone()))
+        .with(
+            tracing_subscriber::fmt::layer()
+                .with_ansi(true)
+                .with_filter(
+                    EnvFilter::builder()
+                        .with_default_directive(Directive::from(LevelFilter::DEBUG))
+                        .from_env_lossy(),
+                ),
+        )
+        .with(
+            tracing_opentelemetry::layer()
+                .with_tracer(open_telemetry_tracer.clone())
+                .with_filter(LevelFilter::from_level(Level::INFO)),
+        )
         .try_init()?;
 
     info!("starting");
@@ -71,7 +85,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     });
 
     let server = Server::builder()
-        .layer(OtelLayer::new(tracer))
+        .layer(OtelLayer::new(open_telemetry_tracer))
         .add_service(QuoteServer::new(Quoter {
             tcp_handler_send: tcp_handler_send.clone(),
         }))