Merge pull request zalando#170 from zalando/feature/curl-correlation-id

Added correlation id to curl log

Author: whiskeysierra

logbook-core/src/main/java/org/zalando/logbook/CurlHttpLogFormatter.java

@@ -26,6 +26,7 @@ public String format(final Precorrelation<HttpRequest> precorrelation) throws IO
         final HttpRequest request = precorrelation.getRequest();
         final List<String> command = new ArrayList<>();
 
+        command.add(precorrelation.getId());
         command.add("curl");
         command.add("-v"); // TODO optional?
 

logbook-core/src/test/java/org/zalando/logbook/CurlHttpLogFormatterTest.java

@@ -30,7 +30,8 @@ public void shouldLogRequest() throws IOException {
         final HttpLogFormatter unit = new CurlHttpLogFormatter();
         final String curl = unit.format(new SimplePrecorrelation<>(correlationId, request));
 
-        assertThat(curl, is("curl -v -X GET 'http://localhost/test?limit=1' -H 'Accept: application/json' -H 'Content-Type: text/plain' --data-binary 'Hello, world!'"));
+        assertThat(curl, is("c9408eaa-677d-11e5-9457-10ddb1ee7671 " +
+                "curl -v -X GET 'http://localhost/test?limit=1' -H 'Accept: application/json' -H 'Content-Type: text/plain' --data-binary 'Hello, world!'"));
     }
 
     @Test
@@ -43,7 +44,8 @@ public void shouldLogRequestWithoutBody() throws IOException {
         final HttpLogFormatter unit = new CurlHttpLogFormatter();
         final String curl = unit.format(new SimplePrecorrelation<>(correlationId, request));
 
-        assertThat(curl, is("curl -v -X GET 'http://localhost/test' -H 'Accept: application/json'"));
+        assertThat(curl, is("0eae9f6c-6824-11e5-8b0a-10ddb1ee7671 " +
+                "curl -v -X GET 'http://localhost/test' -H 'Accept: application/json'"));
     }
 
     @Test
@@ -62,7 +64,8 @@ public void shouldEscape() throws IOException {
         final HttpLogFormatter unit = new CurlHttpLogFormatter();
         final String curl = unit.format(new SimplePrecorrelation<>(correlationId, request));
 
-        assertThat(curl, is("curl -v -X GET 'http://localhost/test?char=\\'' -H 'Foo\\'Bar: Baz' --data-binary '{\"message\":\"Hello, \\'world\\'!\"}'"));
+        assertThat(curl, is("c9408eaa-677d-11e5-9457-10ddb1ee7671 " +
+                "curl -v -X GET 'http://localhost/test?char=\\'' -H 'Foo\\'Bar: Baz' --data-binary '{\"message\":\"Hello, \\'world\\'!\"}'"));
     }
 
     @Test

logbook-spring-boot-starter/src/test/java/org/zalando/logbook/spring/FormatStyleCurlTest.java

@@ -55,7 +55,7 @@ public void shouldUseHttpFormatter() throws IOException {
 
     private Matcher<Precorrelation<String>> isCurlFormatter() {
         final Function<Precorrelation<String>, String> getRequest = Precorrelation::getRequest;
-        return hasFeature("request", getRequest, is("curl -v -X GET 'http://localhost/'"));
+        return hasFeature("request", getRequest, containsString("curl -v -X GET 'http://localhost/'"));
     }
 
 }