wip

Author: Khoyo

core/.dockerignore

@@ -1,2 +1,4 @@
 build
 Dockerfile
+.gradle
+.idea

core/src/main/java/fr/sncf/osrd/cli/WorkerCommand.kt

@@ -158,7 +158,7 @@ class WorkerCommand : CliCommand {
                     }
 
                     override fun get(carrier: Map<String, Any>?, key: String): String? {
-                        return carrier?.get(key) as String?
+                        return (carrier?.get(key) as ByteArray?)?.decodeToString()
                     }
                 }
 

docker-compose.yml

@@ -54,28 +54,14 @@ services:
 
   core:
     image: ghcr.io/openrailassociation/osrd-edge/osrd-core:${TAG-dev}
-    # container_name: osrd-core
+    container_name: osrd-core-dummy
     build:
       context: core
       dockerfile: Dockerfile
       additional_contexts:
         test_data: tests/data
     restart: no
-    ports: ["8080:8080"]
     command: "true"
-    environment:
-      CORE_EDITOAST_URL: "http://osrd-editoast"
-      JAVA_TOOL_OPTIONS: "-javaagent:/app/opentelemetry-javaagent.jar"
-      CORE_MONITOR_TYPE: "opentelemetry"
-      OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: "grpc"
-      OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: "http://jaeger:4317"
-      OTEL_METRICS_EXPORTER: "none"
-      OTEL_LOGS_EXPORTER: "none"
-    # healthcheck:
-      # test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
-      # start_period: 4s
-      # interval: 5s
-
 
   osrdyne:
     image: ghcr.io/openrailassociation/osrd-edge/osrd-osrdyne:${TAG-dev}

editoast/src/core/mod.rs

@@ -114,6 +114,7 @@ impl CoreClient {
         CoreError::UnparsableErrorOutput.into()
     }
 
+    #[tracing::instrument(name = "core::fetch", skip_all, err, fields(path))]
     async fn fetch<B: Serialize, R: CoreResponse>(
         &self,
         method: reqwest::Method,

editoast/src/core/mq_client.rs

@@ -228,6 +228,7 @@ fn attach_tracing_info(headers: &mut FieldTable) {
 struct HeaderInjector<'a>(&'a mut FieldTable);
 impl opentelemetry::propagation::Injector for HeaderInjector<'_> {
     /// Set a key and value pair on the headers
+    #[tracing::instrument(name = "headerinjector::set", skip(self))]
     fn set(&mut self, key: &str, value: String) {
         let value: ByteArray = value.bytes().collect_vec().into();
         self.0.insert(key.into(), value.into());