Fix tracing

- the spring.sleuth.propagation.type property has to be denoted
  as a list
- the non-list declaration lead to a bean instantiation exception
  because spring could not bind the property to a list

Issue-ID: SO-4230
Change-Id: I2035db3412692b33ffc32d9e1ccce715079932c3
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/so-cnf-adapter-application/src/main/resources/application.yaml b/so-cnf-adapter-application/src/main/resources/application.yaml
index dd36cb7..1d52efe 100644 (file)
--- a/so-cnf-adapter-application/src/main/resources/application.yaml
+++ b/so-cnf-adapter-application/src/main/resources/application.yaml
@@ -43,7 +43,9 @@ spring:
       probability: ${TRACING_SAMPLING_PROBABILITY:1.0}
     supports-join: false
     propagation:
-      type: w3c,bc
+      type:
+      - w3c
+      - b3
     web:
       skip-pattern: ${TRACING_SKIP_PATTERN}
 

diff --git a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/pom.xml b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/pom.xml
index 117a323..9375662 100644 (file)
--- a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/pom.xml
+++ b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/pom.xml
@@ -23,7 +23,7 @@
                     <systemPropertyVariables>
                         <so.log.level>DEBUG</so.log.level>
                     </systemPropertyVariables>
-                    <rerunFailingTestsCount>2</rerunFailingTestsCount>
+                    <!-- <rerunFailingTestsCount>2</rerunFailingTestsCount> -->
                     <parallel>suites</parallel>
                     <useUnlimitedThreads>false</useUnlimitedThreads>
                     <threadCount>1</threadCount>