Add the ability to upload the heap dump to S3 bucket

javamelody-collector-server/pom.xml

@@ -79,6 +79,11 @@
 			<artifactId>aws-java-sdk-cloudwatch</artifactId>
 			<version>1.11.136</version>
 		</dependency>
+		<dependency>
+		    <groupId>com.amazonaws</groupId>
+		    <artifactId>aws-java-sdk-s3</artifactId>
+		    <version>1.11.136</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

javamelody-core/build.xml

@@ -52,6 +52,7 @@
 					<include name="bson-3.3.0.jar" />
 					<include name="aws-java-sdk-cloudwatch-1.11.136.jar" />
 					<include name="aws-java-sdk-core-1.11.136.jar" />
+					<include name="aws-java-sdk-s3-1.11.136.jar" />
 					<include name="javax.faces-api-2.1.jar" />
 					<include name="javax.el-api-2.2.1.jar" />
 					<include name="tomcat-jdbc-7.0.27.jar" />

javamelody-core/pom.xml

@@ -234,6 +234,17 @@
 			<version>1.11.136</version>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>com.amazonaws</groupId>
+			<artifactId>aws-java-sdk-core</artifactId>
+			<version>1.11.136</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-s3 -->
+		<dependency>
+		    <groupId>com.amazonaws</groupId>
+		    <artifactId>aws-java-sdk-s3</artifactId>
+		    <version>1.11.136</version>
+		</dependency>
 		<!-- Dépendance JUnit -->
 		<dependency>
 			<groupId>junit</groupId>

javamelody-core/src/main/java/net/bull/javamelody/internal/aws/s3/S3ClientFactory.java

@@ -0,0 +1,40 @@
+package net.bull.javamelody.internal.aws.s3;
+
+import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
+import com.amazonaws.regions.Regions;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+
+/**
+ * Client Factory for AWS S3.
+ * @author Salah Qasem 
+ *
+ */
+
+public class S3ClientFactory {
+
+	private static final String REGION = "region";
+
+	public final static S3ClientFactory INSTANCE = new S3ClientFactory();
+
+	private S3ClientFactory() {
+	}
+
+	/**
+	 * Creates an AWS s3 client.
+	 * @return AmazonS3 client
+	 */
+	public AmazonS3 createClient() {
+		AmazonS3ClientBuilder clientBuilder = AmazonS3Client.builder();
+		clientBuilder.withCredentials(new DefaultAWSCredentialsProviderChain());
+
+		if (System.getProperty(REGION) != null && !"".equals(System.getProperty(REGION).trim())) {
+			clientBuilder.withRegion(System.getProperty(REGION));
+		} else {
+			clientBuilder.withRegion(Regions.DEFAULT_REGION);
+		}
+		return clientBuilder.build();
+	}
+
+}

javamelody-core/src/main/java/net/bull/javamelody/internal/aws/s3/util/S3Util.java

@@ -0,0 +1,90 @@
+package net.bull.javamelody.internal.aws.s3.util;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.model.AbortMultipartUploadRequest;
+import com.amazonaws.services.s3.model.CompleteMultipartUploadRequest;
+import com.amazonaws.services.s3.model.InitiateMultipartUploadRequest;
+import com.amazonaws.services.s3.model.InitiateMultipartUploadResult;
+import com.amazonaws.services.s3.model.PartETag;
+import com.amazonaws.services.s3.model.PutObjectRequest;
+import com.amazonaws.services.s3.transfer.internal.UploadPartRequestFactory;
+
+import net.bull.javamelody.internal.aws.s3.S3ClientFactory;
+import net.bull.javamelody.internal.common.LOG;
+import net.bull.javamelody.internal.util.MemoryUtil;
+
+/**
+ * Util class for AWS S3.
+ * @author Salah Qasem 
+ *
+ */
+public class S3Util {
+
+	private static final long PART_SIZE = 200 * 1024 * 1024; // 200 mb
+
+	private S3Util() {
+
+	}
+
+	/**
+	 * upload file to AWS S3.
+	 * @param file
+	 * @throws Exception
+	 */
+	public static void upload(File file) throws Exception {
+
+		String bucketName = System.getProperty("s3.bucketName");
+
+		if (bucketName == null || "".equals(bucketName.trim())) {
+			throw new IllegalStateException("s3 bucketName property can't be empty.");
+		}
+
+		if (getFileSizeInGiga(file) > 0.3) {
+			uploadMultiPart(file, bucketName);
+			return;
+		}
+		try {
+			AmazonS3 s3Client = S3ClientFactory.INSTANCE.createClient();
+			s3Client.putObject(bucketName, file.getName(), file);
+			LOG.info("File " + file.getName() + " uploaded successfully to S3");
+		} catch (Exception e) {
+			throw e;
+		}
+	}
+
+	private static void uploadMultiPart(File file, String bucketName) throws Exception {
+		AmazonS3 s3Client = S3ClientFactory.INSTANCE.createClient();
+		List<PartETag> partETags = new ArrayList<PartETag>();
+
+		InitiateMultipartUploadRequest initRequest = new InitiateMultipartUploadRequest(bucketName,
+				file.getName());
+		InitiateMultipartUploadResult initResponse = s3Client.initiateMultipartUpload(initRequest);
+		PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, file.getName(), file);
+		UploadPartRequestFactory requestFactory = new UploadPartRequestFactory(putObjectRequest,
+				initResponse.getUploadId(), PART_SIZE);
+
+		try {
+			while (requestFactory.hasMoreRequests()) {
+				partETags.add(s3Client.uploadPart(requestFactory.getNextUploadPartRequest())
+						.getPartETag());
+			}
+			CompleteMultipartUploadRequest compRequest = new CompleteMultipartUploadRequest(
+					bucketName, file.getName(), initResponse.getUploadId(), partETags);
+			s3Client.completeMultipartUpload(compRequest);
+			LOG.info("File " + file.getName() + " uploaded successfully to S3");
+		} catch (Exception e) {
+			s3Client.abortMultipartUpload(new AbortMultipartUploadRequest(bucketName,
+					file.getName(), initResponse.getUploadId()));
+			throw e;
+		}
+
+	}
+
+	private static double getFileSizeInGiga(File file) {
+		return (file.length() * 1.0) / MemoryUtil.Size.GIGA_BYTE.getByteSize();
+	}
+}

javamelody-core/src/main/java/net/bull/javamelody/internal/model/Action.java

@@ -37,6 +37,7 @@
 
 import net.bull.javamelody.Parameter;
 import net.bull.javamelody.SessionListener;
+import net.bull.javamelody.internal.aws.s3.util.S3Util;
 import net.bull.javamelody.internal.common.I18N;
 import net.bull.javamelody.internal.common.InputOutput;
 import net.bull.javamelody.internal.common.LOG;
@@ -212,14 +213,24 @@ public String execute(Collector collector, CollectorServer collectorServer, // N
 				// heap dump à générer dans le répertoire temporaire sur le serveur
 				// avec un suffixe contenant le host, la date et l'heure et avec une extension hprof
 				// (utiliser jvisualvm du jdk ou MAT d'eclipse en standalone ou en plugin)
+				String message = "";
 				final File heapDump = heapDump();
 				final File zipFile = new File(heapDump.getParentFile(),
 						heapDump.getName() + ".zip");
 				InputOutput.zipFile(heapDump, zipFile);
 				InputOutput.deleteFile(heapDump);
 				final String path = zipFile.getPath();
-				messageForReport = I18N.getFormattedString("heap_dump_genere",
-						path.replace('\\', '/'));
+				if (Boolean.valueOf(System.getProperty("enable.s3.heapDump"))) {
+					try {
+						S3Util.upload(zipFile);
+						message = "heap dump " + zipFile.getName()
+								+ " uploaded successfully to s3.";
+					} catch (Exception e) {
+						message = "Failed to upload heap to s3 - " + e.getMessage() + "\n";
+					}
+				}
+				messageForReport = message
+						+ I18N.getFormattedString("heap_dump_genere", path.replace('\\', '/'));
 			}
 			break;
 		case INVALIDATE_SESSIONS:

javamelody-core/src/main/java/net/bull/javamelody/internal/util/MemoryUtil.java

@@ -0,0 +1,34 @@
+package net.bull.javamelody.internal.util;
+
+public class MemoryUtil {
+
+	public enum Size {
+		KILO_BYTE(1024L),
+		MEGA_BYTE(KILO_BYTE.byteSize * 1024L),
+		GIGA_BYTE(MEGA_BYTE.byteSize * 1024L);
+
+		private long byteSize;
+
+		Size(long byteSize) {
+			this.byteSize = byteSize;
+		}
+
+		public long getByteSize() {
+			return byteSize;
+		}
+	}
+
+	private MemoryUtil() {
+
+	}
+
+	/**
+	 * Gets the used memory measured by Kilobyte, MB, or GB based in the size param.
+	 * @param size
+	 * @return double represent the total JVM used memory.
+	 */
+	public static double getUsedMemory(MemoryUtil.Size size) {
+		return (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory())
+				/ (size.byteSize * 1.0);
+	}
+}

javamelody-swing/pom.xml

@@ -108,6 +108,11 @@
 			<artifactId>xstream</artifactId>
 			<version>1.4.10</version>
 		</dependency>
+		<dependency>
+		    <groupId>com.amazonaws</groupId>
+		    <artifactId>aws-java-sdk-s3</artifactId>
+		    <version>1.11.136</version>
+		</dependency>
 	</dependencies>
 
 	<distributionManagement>

javamelody-test-webapp/pom.xml

@@ -229,6 +229,11 @@
 			<version>1.11.136</version>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+		    <groupId>com.amazonaws</groupId>
+		    <artifactId>aws-java-sdk-s3</artifactId>
+		    <version>1.11.136</version>
+		</dependency>
 		<!-- Dépendance JUnit -->
 		<dependency>
 			<groupId>junit</groupId>