beanstalk plugin

Conflicts:
	build.gradle

Author: Michael Wunderlich

build.gradle

@@ -36,7 +36,6 @@ dependencies {
     compile("com.amazonaws:aws-xray-recorder-sdk-aws-sdk-instrumentor")
     compile("com.amazonaws:aws-xray-recorder-sdk-apache-http")
     compile("com.amazonaws:aws-xray-recorder-sdk-sql-postgres")
-    compile("com.amazonaws:aws-xray-recorder-sdk-sql-mysql")
     compile("org.postgresql:postgresql:9.4.1211.jre7")
     testCompile("junit:junit:4.11")
     compile("com.fasterxml.jackson.core:jackson-databind:2.8.4")
@@ -46,7 +45,7 @@ dependencies {
 dependencyManagement {
     imports {
         mavenBom("com.amazonaws:aws-java-sdk-bom:1.11.67")
-        mavenBom("com.amazonaws:aws-xray-recorder-sdk-bom:1.0.0-beta")
+        mavenBom("com.amazonaws:aws-xray-recorder-sdk-bom:1.0.1-beta")
     }
 }
 task wrapper(type: Wrapper) {

src/main/java/scorekeep/RdsWebConfig.java

@@ -4,6 +4,7 @@
 import com.amazonaws.xray.AWSXRayRecorderBuilder;
 import com.amazonaws.xray.javax.servlet.AWSXRayServletFilter;
 import com.amazonaws.xray.plugins.EC2Plugin;
+import com.amazonaws.xray.plugins.ElasticBeanstalkPlugin;
 import com.amazonaws.xray.strategy.sampling.DefaultSamplingStrategy;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -54,7 +55,7 @@ public GameHistoryModel gameHistoryModel() {
     }
 
     static {
-        AWSXRayRecorderBuilder builder = AWSXRayRecorderBuilder.standard().withPlugin(new EC2Plugin());
+        AWSXRayRecorderBuilder builder = AWSXRayRecorderBuilder.standard().withPlugin(new EC2Plugin()).withPlugin(new ElasticBeanstalkPlugin());
 
         URL ruleFile = WebConfig.class.getResource("/sampling-rules.json");
         builder.withSamplingStrategy(new DefaultSamplingStrategy(ruleFile));