DATAMONGO-1720 - Polishing.

Enhance benchmark statistics with Git/working tree details. Specify byte encoding for JSON to byte encoder.
Add status code check to HttpResultsWriter to verify that the results were accepted. Convert spaces to tabs in pom.xml.

Original pull request: #483.

spring-data-mongodb-benchmarks/pom.xml

@@ -17,33 +17,38 @@
 	<name>Spring Data MongoDB - Microbenchmarks</name>
 
 	<properties>
-        <skipTests>true</skipTests>  <!-- Skip tests by default; run only if -DskipTests=false is specified or benchmarks profile is activated  -->
+		<!-- Skip tests by default; run only if -DskipTests=false is specified or benchmarks profile is activated  -->
-        <bundlor.enabled>false</bundlor.enabled>
+		<skipTests>true</skipTests>
 	</properties>
 
 	<dependencies>
+
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-data-mongodb</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>${junit}</version>
 			<scope>compile</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>org.openjdk.jmh</groupId>
 			<artifactId>jmh-core</artifactId>
 			<version>${jmh.version}</version>
 		</dependency>
+
 		<dependency>
 			<groupId>org.openjdk.jmh</groupId>
 			<artifactId>jmh-generator-annprocess</artifactId>
 			<version>${jmh.version}</version>
 			<scope>provided</scope>
 		</dependency>
+
 	</dependencies>
 
 	<profiles>
@@ -58,6 +63,18 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>pl.project13.maven</groupId>
+				<artifactId>git-commit-id-plugin</artifactId>
+				<version>2.2.2</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>revision</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<artifactId>maven-jar-plugin</artifactId>
 				<executions>
@@ -83,6 +100,9 @@
 					<systemPropertyVariables>
 						<benchmarkReportDir>${project.build.directory}/reports/performance</benchmarkReportDir>
 						<project.version>${project.version}</project.version>
+						<git.dirty>${git.dirty}</git.dirty>
+						<git.commit.id>${git.commit.id}</git.commit.id>
+						<git.branch>${git.branch}</git.branch>
 					</systemPropertyVariables>
 				</configuration>
 			</plugin>

spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterBenchmark.java

@@ -126,7 +126,7 @@ public class MappingMongoConverterBenchmark extends AbstractMicrobenchmark {
 	}
 
 	@Benchmark // DATAMONGO-1720
-	public Customer readObjectWith2tPropertiesAnd1NestedObject() {
+	public Customer readObjectWith2PropertiesAnd1NestedObject() {
 		return converter.read(Customer.class, documentWith2PropertiesAnd1Nested);
 	}
 

spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/HttpResultsWriter.java

@@ -15,7 +15,10 @@
  */
 package org.springframework.data.mongodb.microbenchmark;
 
+import lombok.SneakyThrows;
+
 import java.io.OutputStream;
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
@@ -23,6 +26,7 @@ import java.time.Duration;
 import java.util.Collection;
 
 import org.openjdk.jmh.results.RunResult;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.util.CollectionUtils;
 
 /**
@@ -39,24 +43,39 @@ class HttpResultsWriter implements ResultsWriter {
 	}
 
 	@Override
+	@SneakyThrows
 	public void write(Collection<RunResult> results) {
 
 		if (CollectionUtils.isEmpty(results)) {
 			return;
 		}
 
-		try {
+		StandardEnvironment env = new StandardEnvironment();
+
+		String projectVersion = env.getProperty("project.version", "unknown");
+		String gitBranch = env.getProperty("git.branch", "unknown");
+		String gitDirty = env.getProperty("git.dirty", "no");
+		String gitCommitId = env.getProperty("git.commit.id", "unknown");
 
-			URLConnection connection = new URL(url).openConnection();
+		HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
 		connection.setConnectTimeout((int) Duration.ofSeconds(1).toMillis());
+		connection.setReadTimeout((int) Duration.ofSeconds(1).toMillis());
 		connection.setDoOutput(true);
+		connection.setRequestMethod("POST");
+
 		connection.setRequestProperty("Content-Type", "application/json");
+		connection.addRequestProperty("X-Project-Version", projectVersion);
+		connection.addRequestProperty("X-Git-Branch", gitBranch);
+		connection.addRequestProperty("X-Git-Dirty", gitDirty);
+		connection.addRequestProperty("X-Git-Commit-Id", gitCommitId);
 
 		try (OutputStream output = connection.getOutputStream()) {
 			output.write(ResultsWriter.jsonifyResults(results).getBytes(StandardCharsets.UTF_8));
 		}
-		} catch (Exception e) {
+
-			throw new RuntimeException(e);
+		if (connection.getResponseCode() >= 400) {
+			throw new IllegalStateException(
+					String.format("Status %d %s", connection.getResponseCode(), connection.getResponseMessage()));
 		}
 	}
 }

spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/MongoResultsWriter.java

@@ -52,6 +52,9 @@ class MongoResultsWriter implements ResultsWriter {
 		StandardEnvironment env = new StandardEnvironment();
 
 		String projectVersion = env.getProperty("project.version", "unknown");
+		String gitBranch = env.getProperty("git.branch", "unknown");
+		String gitDirty = env.getProperty("git.dirty", "no");
+		String gitCommitId = env.getProperty("git.commit.id", "unknown");
 
 		MongoClientURI uri = new MongoClientURI(this.uri);
 		MongoClient client = new MongoClient(uri);
@@ -65,6 +68,9 @@ class MongoResultsWriter implements ResultsWriter {
 
 			Document sink = new Document();
 			sink.append("_version", projectVersion);
+			sink.append("_branch", gitBranch);
+			sink.append("_commit", gitCommitId);
+			sink.append("_dirty", gitDirty);
 			sink.append("_method", extractBenchmarkName(dbo.get("benchmark").toString()));
 			sink.append("_date", now);
 			sink.append("_snapshot", projectVersion.toLowerCase().contains("snapshot"));
@@ -75,7 +81,6 @@ class MongoResultsWriter implements ResultsWriter {
 		}
 
 		client.close();
-
 	}
 
 	/**
@@ -113,13 +118,13 @@ class MongoResultsWriter implements ResultsWriter {
 		return sanitized;
 	}
 
-	private String extractClass(String source) {
+	private static String extractClass(String source) {
 
 		String tmp = source.substring(0, source.lastIndexOf('.'));
 		return tmp.substring(tmp.lastIndexOf(".") + 1);
 	}
 
-	private String extractBenchmarkName(String source) {
+	private static String extractBenchmarkName(String source) {
 		return source.substring(source.lastIndexOf(".") + 1);
 	}
 

spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/ResultsWriter.java

@@ -15,6 +15,8 @@
  */
 package org.springframework.data.mongodb.microbenchmark;
 
+import lombok.SneakyThrows;
+
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
@@ -54,10 +56,12 @@ interface ResultsWriter {
 	 * @return json string representation of results.
 	 * @see org.openjdk.jmh.results.format.JSONResultFormat
 	 */
+	@SneakyThrows
 	static String jsonifyResults(Collection<RunResult> results) {
 
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ResultFormatFactory.getInstance(ResultFormatType.JSON, new PrintStream(baos)).writeOut(results);
+		ResultFormatFactory.getInstance(ResultFormatType.JSON, new PrintStream(baos, true, "UTF-8")).writeOut(results);
+
 		return new String(baos.toByteArray(), StandardCharsets.UTF_8);
 	}
 }