From c92eb4cbeb0e339b22a9b319195fefc45c60917c Mon Sep 17 00:00:00 2001
From: Yong Zhang <zhangyong1025.zy@gmail.com>
Date: Tue, 26 Feb 2019 17:57:54 +0800
Subject: [PATCH 1/2] Fix unable download twitter dependencies ---

Fixes #1962

*Motivation*

There are some twitter dependencies can't download from repo

*Modifications*

- remove some using in StatsLoggerBenchmark.java
- update some config in pom.xml
---
 bookkeeper-server/pom.xml                     | 20 ------------------
 bookkeeper-stats-providers/pom.xml            | 21 ++++++++++++++++---
 microbenchmarks/pom.xml                       | 10 ---------
 .../stats/StatsLoggerBenchmark.java           |  4 ----
 4 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml
index a2d853865b9..1b131969f7f 100644
--- a/bookkeeper-server/pom.xml
+++ b/bookkeeper-server/pom.xml
@@ -241,26 +241,6 @@
     </plugins>
   </build>
   <profiles>
-    <profile>
-      <id>twitter-science-provider</id>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.bookkeeper.stats</groupId>
-          <artifactId>twitter-science-provider</artifactId>
-          <version>${project.parent.version}</version>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <id>codahale-metrics-provider</id>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.bookkeeper.stats</groupId>
-          <artifactId>codahale-metrics-provider</artifactId>
-          <version>${project.parent.version}</version>
-        </dependency>
-      </dependencies>
-    </profile>
     <profile>
       <id>twitter-http-server</id>
       <dependencies>
diff --git a/bookkeeper-stats-providers/pom.xml b/bookkeeper-stats-providers/pom.xml
index b36d36961b0..f03d74ee864 100644
--- a/bookkeeper-stats-providers/pom.xml
+++ b/bookkeeper-stats-providers/pom.xml
@@ -26,10 +26,25 @@
   <packaging>pom</packaging>
   <name>Apache BookKeeper :: Stats Providers</name>
   <modules>
-    <module>twitter-finagle-provider</module>
-    <module>twitter-science-provider</module>
-    <module>twitter-ostrich-provider</module>
     <module>codahale-metrics-provider</module>
     <module>prometheus-metrics-provider</module>
   </modules>
+
+  <profiles>
+    <profile>
+      <id>twitter</id>
+      <activation>
+        <property>
+          <name>twitter</name>
+        </property>
+      </activation>
+      <modules>
+        <!-- enable building table service -->
+        <module>twitter-finagle-provider</module>
+        <module>twitter-science-provider</module>
+        <module>twitter-ostrich-provider</module>
+      </modules>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/microbenchmarks/pom.xml b/microbenchmarks/pom.xml
index 8ec203cbec2..8aa66a7f98d 100644
--- a/microbenchmarks/pom.xml
+++ b/microbenchmarks/pom.xml
@@ -63,16 +63,6 @@
       <artifactId>codahale-metrics-provider</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.bookkeeper.stats</groupId>
-      <artifactId>twitter-science-provider</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.bookkeeper.stats</groupId>
-      <artifactId>twitter-ostrich-provider</artifactId>
-      <version>${project.version}</version>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/microbenchmarks/src/main/java/org/apache/bookkeeper/stats/StatsLoggerBenchmark.java b/microbenchmarks/src/main/java/org/apache/bookkeeper/stats/StatsLoggerBenchmark.java
index 0a2cd063800..3986ffadd83 100644
--- a/microbenchmarks/src/main/java/org/apache/bookkeeper/stats/StatsLoggerBenchmark.java
+++ b/microbenchmarks/src/main/java/org/apache/bookkeeper/stats/StatsLoggerBenchmark.java
@@ -30,8 +30,6 @@
 import org.apache.bookkeeper.stats.codahale.CodahaleMetricsProvider;
 import org.apache.bookkeeper.stats.codahale.FastCodahaleMetricsProvider;
 import org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider;
-import org.apache.bookkeeper.stats.twitter.ostrich.OstrichProvider;
-import org.apache.bookkeeper.stats.twitter.science.TwitterStatsProvider;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Level;
@@ -60,8 +58,6 @@ public class StatsLoggerBenchmark {
         providers.put("Prometheus", PrometheusMetricsProvider::new);
         providers.put("Codahale", CodahaleMetricsProvider::new);
         providers.put("FastCodahale", FastCodahaleMetricsProvider::new);
-        providers.put("Twitter", TwitterStatsProvider::new);
-        providers.put("Ostrich", OstrichProvider::new);
     }
 
     @State(Scope.Benchmark)

From acfab0185eabfa8901b70b44a6916af0f590fbe0 Mon Sep 17 00:00:00 2001
From: Sijie Guo <guosijie@gmail.com>
Date: Tue, 26 Feb 2019 18:24:45 +0800
Subject: [PATCH 2/2] Apply suggestions

Co-Authored-By: zymap <zhangyong1025.zy@gmail.com>
---
 bookkeeper-stats-providers/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookkeeper-stats-providers/pom.xml b/bookkeeper-stats-providers/pom.xml
index f03d74ee864..75af272d56a 100644
--- a/bookkeeper-stats-providers/pom.xml
+++ b/bookkeeper-stats-providers/pom.xml
@@ -39,7 +39,7 @@
         </property>
       </activation>
       <modules>
-        <!-- enable building table service -->
+        <!-- only building twitter stats providers when `-Dtwitter` is provided -->
         <module>twitter-finagle-provider</module>
         <module>twitter-science-provider</module>
         <module>twitter-ostrich-provider</module>