Merge remote-tracking branch 'upsteam/master' into synced

Synced Redpanda's OMB with the upsteam OMB

Author: rystsov

.github/stale.yml

@@ -0,0 +1,59 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 60
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 5
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - enhancement
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed after 5 days if no further activity
+  occurs. Thank you for your contributions.
+
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Comment to post when closing a stale Issue or Pull Request.
+# closeComment: >
+#   Your comment here.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
+# pulls:
+#   daysUntilStale: 30
+#   markComment: >
+#     This pull request has been automatically marked as stale because it has not had
+#     recent activity. It will be closed if no further activity occurs. Thank you
+#     for your contributions.
+
+# issues:
+#   exemptLabels:
+#     - confirmed

.gitignore

@@ -9,11 +9,13 @@ target
 core/*.json
 *.retry
 *.pem
+*.hcl
 **/.terraform
 **/terraform.tfstate
 **/terraform.tfstate.backup
 **/*.lock.info
 .DS_Store
+.factorypath
 
 # IntelliJ artifacts
 .idea/

.travis.yml

@@ -0,0 +1,17 @@
+dist: trusty
+
+notifications:
+  email:
+    recipients:
+      - [email protected]
+  on_success: change
+  on_failure: always
+
+language: java
+
+jdk:
+  - oraclejdk8
+  - oraclejdk11
+
+script:
+  - mvn clean install

README.md

@@ -1,4 +1,12 @@
-# The OpenMessaging Benchmark Framework
+# OpenMessaging Benchmark Framework
+[![Build Status](https://app.travis-ci.com/openmessaging/benchmark.svg?branch=master)](https://app.travis-ci.com/openmessaging/benchmark)
+[![Total alerts](https://img.shields.io/lgtm/alerts/g/openmessaging/benchmark.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/openmessaging/benchmark/alerts/)
+[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/openmessaging/benchmark.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/openmessaging/benchmark/context:python)
+[![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/openmessaging/benchmark.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/openmessaging/benchmark/context:java)
+[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
+
+
+**Notice：** We do not consider or plan to release any unilateral test results based on this standard. For reference, you can purchase server tests on the cloud by yourself. 
 
 This repository houses user-friendly, cloud-ready benchmarking suites for the following messaging platforms:
 
@@ -7,5 +15,9 @@ This repository houses user-friendly, cloud-ready benchmarking suites for the fo
 * [RabbitMQ](https://www.rabbitmq.com/)
 * [Apache Pulsar](https://pulsar.apache.org)
 * [NATS Streaming](https://nats.io/)
+* [Redis](https://redis.com/)
+* [Pravega](https://pravega.io/)
 
 > More details could be found at the [official documentation](http://openmessaging.cloud/docs/benchmarks/).
+
+

benchmark-framework/pom.xml

@@ -1,23 +1,16 @@
 <!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
@@ -32,6 +25,7 @@
 
 	<properties>
 		<log4j.version>2.17.1</log4j.version>
+		<jackson.version>2.13.2</jackson.version>
 	</properties>
 
 	<dependencies>
@@ -61,23 +55,23 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.jaxrs</groupId>
 			<artifactId>jackson-jaxrs-base</artifactId>
-			<version>2.9.3</version>
+			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.jaxrs</groupId>
 			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>2.9.3</version>
+			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<version>2.9.3</version>
+			<version>${jackson.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-yaml</artifactId>
-			<version>2.9.3</version>
+			<version>${jackson.version}</version>
 		</dependency>
 
 		<dependency>
@@ -98,6 +92,12 @@
 			<version>${project.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>driver-jms</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>driver-kafka</artifactId>
@@ -110,6 +110,18 @@
 			<version>${project.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>driver-kop</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>driver-pravega</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>driver-rocketmq</artifactId>
@@ -153,6 +165,12 @@
 		</dependency>
 
 		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>driver-redis</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+ 		<dependency>
 			<groupId>org.apache.bookkeeper.stats</groupId>
 			<artifactId>bookkeeper-stats-api</artifactId>
 			<version>${bookkeeper.version}</version>
@@ -180,21 +198,22 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-server</artifactId>
-			<version>9.4.8.v20171121</version>
+			<version>9.4.42.v20210604</version>
 		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>4.13.1</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-util</artifactId>
-			<version>9.4.8.v20171121</version>
+			<version>9.4.42.v20210604</version>
 		</dependency>
+
 	</dependencies>
 
 	<build>

benchmark-framework/src/main/java/io/openmessaging/benchmark/Benchmark.java

@@ -1,20 +1,15 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package io.openmessaging.benchmark;
 
@@ -46,11 +41,14 @@ public class Benchmark {
 
     static class Arguments {
 
+        @Parameter(names = {"-c", "--csv"}, description = "Print results from this directory to a csv file")
+        String resultsDir;
+
         @Parameter(names = { "-h", "--help" }, description = "Help message", help = true)
         boolean help;
 
         @Parameter(names = { "-d",
-                "--drivers" }, description = "Drivers list. eg.: pulsar/pulsar.yaml,kafka/kafka.yaml", required = true)
+                "--drivers" }, description = "Drivers list. eg.: pulsar/pulsar.yaml,kafka/kafka.yaml")//, required = true)
         public List<String> drivers;
 
         @Parameter(names = { "-w",
@@ -61,14 +59,17 @@ static class Arguments {
                 "--workers-file" }, description = "Path to a YAML file containing the list of workers addresses")
         public File workersFile;
 
-        @Parameter(description = "Workloads", required = true)
+        @Parameter(names = { "-x", "--extra" }, description = "Allocate extra consumer workers when your backlog builds.")
+        boolean extraConsumers;
+
+        @Parameter(description = "Workloads")//, required = true)
         public List<String> workloads;
 
         @Parameter(names = { "-o", "--output" }, description = "Output", required = false)
         public String output;
 
-	@Parameter(names = { "-v", "--service-version" }, description = "Optional version of the service being benchmarked, embedded in the final result", required = false)
-	public String serviceVersion;
+        @Parameter(names = { "-v", "--service-version" }, description = "Optional version of the service being benchmarked, embedded in the final result", required = false)
+        public String serviceVersion;
     }
 
     public static void main(String[] args) throws Exception {
@@ -89,6 +90,12 @@ public static void main(String[] args) throws Exception {
             System.exit(-1);
         }
 
+        if(arguments.resultsDir != null) {
+            ResultsToCsv r = new ResultsToCsv();
+            r.writeAllResultFiles(arguments.resultsDir);
+            System.exit(0);
+        }
+
         if (arguments.workers != null && arguments.workersFile != null) {
             System.err.println("Only one between --workers and --workers-file can be specified");
             System.exit(-1);
@@ -123,7 +130,7 @@ public static void main(String[] args) throws Exception {
         Worker worker;
 
         if (arguments.workers != null && !arguments.workers.isEmpty()) {
-            worker = new DistributedWorkersEnsemble(arguments.workers);
+            worker = new DistributedWorkersEnsemble(arguments.workers, arguments.extraConsumers);
         } else {
             // Use local worker implementation
             worker = new LocalWorker();
@@ -147,17 +154,14 @@ public static void main(String[] args) throws Exception {
                     WorkloadGenerator generator = new WorkloadGenerator(driverConfiguration.name, workload, worker);
 
                     TestResult result = generator.run();
-		    result.beginTime = beginTime;
-		    result.endTime = dateFormat.format(new Date());
-		    result.version = arguments.serviceVersion;
-
-                    String fileName;
-                    if (arguments.output != null  && arguments.output.length() > 0) {
-                        fileName = arguments.output;
-                    } else {
-                        fileName = String.format("%s-%s-%s.json", workloadName, driverConfiguration.name,
-                                dateFormat.format(new Date()));
-                    }
+                    result.beginTime = beginTime;
+                    result.endTime = dateFormat.format(new Date());
+                    result.version = arguments.serviceVersion;
+
+                    boolean useOutput = (arguments.output != null) && (arguments.output.length() > 0);
+
+                    String fileName = useOutput? arguments.output: String.format("%s-%s-%s.json", workloadName,
+                    driverConfiguration.name, dateFormat.format(new Date()));
 
                     log.info("Writing test result into {}", fileName);
                     writer.writeValue(new File(fileName), result);