Merge branch 'xray-gettingstarted' into xray

Michael Wunderlich · Michael Wunderlich · commit 0591462ca83f · 2017-01-25T00:02:54.000Z
Conflicts:
	build.gradle
diff --git a/build.gradle b/build.gradle
@@ -39,13 +39,12 @@ dependencies {
     compile("org.postgresql:postgresql:9.4.1211.jre7")
     testCompile("junit:junit:4.11")
     compile("com.fasterxml.jackson.core:jackson-databind:2.8.4")
-    compile("commons-validator:commons-validator:1.5.1")
 }
 
 dependencyManagement {
     imports {
         mavenBom("com.amazonaws:aws-java-sdk-bom:1.11.67")
-        mavenBom("com.amazonaws:aws-xray-recorder-sdk-bom:1.0.1-beta")
+        mavenBom("com.amazonaws:aws-xray-recorder-sdk-bom:1.0.2-beta")
     }
 }
 task wrapper(type: Wrapper) {
diff --git a/src/main/java/scorekeep/WebConfig.java b/src/main/java/scorekeep/WebConfig.java
@@ -28,7 +28,7 @@ public class WebConfig {
 
   @Bean
   public Filter TracingFilter() {
-    return new AWSXRayServletFilter();
+    return new AWSXRayServletFilter("Scorekeep");
   }
 
   @Bean

Original file line number	Diff line number	Diff line change
`@@ -39,13 +39,12 @@ dependencies {`
`39`	`39`	`compile("org.postgresql:postgresql:9.4.1211.jre7")`
`40`	`40`	`testCompile("junit:junit:4.11")`
`41`	`41`	`compile("com.fasterxml.jackson.core:jackson-databind:2.8.4")`
`42`		`- compile("commons-validator:commons-validator:1.5.1")`
`43`	`42`	`}`
`44`	`43`
`45`	`44`	`dependencyManagement {`
`46`	`45`	`imports {`
`47`	`46`	`mavenBom("com.amazonaws:aws-java-sdk-bom:1.11.67")`
`48`		`- mavenBom("com.amazonaws:aws-xray-recorder-sdk-bom:1.0.1-beta")`
	`47`	`+ mavenBom("com.amazonaws:aws-xray-recorder-sdk-bom:1.0.2-beta")`
`49`	`48`	`}`
`50`	`49`	`}`
`51`	`50`	`task wrapper(type: Wrapper) {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public class WebConfig {`
`28`	`28`
`29`	`29`	`@Bean`
`30`	`30`	`public Filter TracingFilter() {`
`31`		`- return new AWSXRayServletFilter();`
	`31`	`+ return new AWSXRayServletFilter("Scorekeep");`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Bean`