Skip to content

Commit 3d8ff77

Browse files
zymapcdbartholomew
authored andcommitted
Fix unable download twitter dependencies
--- Fixes apache#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 Descriptions of the changes in this PR: You can add -Dtwitter to choose add twitter dependencies. ### Motivation (Explain: why you're making that change, what is the problem you're trying to solve) ### Changes (Describe: what changes you have made) Master Issue: apache#1962 Reviewers: Enrico Olivelli <eolivelli@gmail.com>, Jia Zhai <zhaijia@apache.org>, Sijie Guo <sijie@apache.org> This closes apache#1966 from zymap/master
1 parent 108db3a commit 3d8ff77

File tree

4 files changed

+18
-37
lines changed

4 files changed

+18
-37
lines changed

bookkeeper-server/pom.xml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -241,26 +241,6 @@
241241
</plugins>
242242
</build>
243243
<profiles>
244-
<profile>
245-
<id>twitter-science-provider</id>
246-
<dependencies>
247-
<dependency>
248-
<groupId>org.apache.bookkeeper.stats</groupId>
249-
<artifactId>twitter-science-provider</artifactId>
250-
<version>${project.parent.version}</version>
251-
</dependency>
252-
</dependencies>
253-
</profile>
254-
<profile>
255-
<id>codahale-metrics-provider</id>
256-
<dependencies>
257-
<dependency>
258-
<groupId>org.apache.bookkeeper.stats</groupId>
259-
<artifactId>codahale-metrics-provider</artifactId>
260-
<version>${project.parent.version}</version>
261-
</dependency>
262-
</dependencies>
263-
</profile>
264244
<profile>
265245
<id>twitter-http-server</id>
266246
<dependencies>

bookkeeper-stats-providers/pom.xml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,25 @@
2626
<packaging>pom</packaging>
2727
<name>Apache BookKeeper :: Stats Providers</name>
2828
<modules>
29-
<module>twitter-finagle-provider</module>
30-
<module>twitter-science-provider</module>
31-
<module>twitter-ostrich-provider</module>
3229
<module>codahale-metrics-provider</module>
3330
<module>prometheus-metrics-provider</module>
3431
</modules>
32+
33+
<profiles>
34+
<profile>
35+
<id>twitter</id>
36+
<activation>
37+
<property>
38+
<name>twitter</name>
39+
</property>
40+
</activation>
41+
<modules>
42+
<!-- only building twitter stats providers when `-Dtwitter` is provided -->
43+
<module>twitter-finagle-provider</module>
44+
<module>twitter-science-provider</module>
45+
<module>twitter-ostrich-provider</module>
46+
</modules>
47+
</profile>
48+
</profiles>
49+
3550
</project>

microbenchmarks/pom.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,6 @@
6363
<artifactId>codahale-metrics-provider</artifactId>
6464
<version>${project.version}</version>
6565
</dependency>
66-
<dependency>
67-
<groupId>org.apache.bookkeeper.stats</groupId>
68-
<artifactId>twitter-science-provider</artifactId>
69-
<version>${project.version}</version>
70-
</dependency>
71-
<dependency>
72-
<groupId>org.apache.bookkeeper.stats</groupId>
73-
<artifactId>twitter-ostrich-provider</artifactId>
74-
<version>${project.version}</version>
75-
</dependency>
7666
</dependencies>
7767
<build>
7868
<plugins>

microbenchmarks/src/main/java/org/apache/bookkeeper/stats/StatsLoggerBenchmark.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
import org.apache.bookkeeper.stats.codahale.CodahaleMetricsProvider;
3131
import org.apache.bookkeeper.stats.codahale.FastCodahaleMetricsProvider;
3232
import org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider;
33-
import org.apache.bookkeeper.stats.twitter.ostrich.OstrichProvider;
34-
import org.apache.bookkeeper.stats.twitter.science.TwitterStatsProvider;
3533
import org.openjdk.jmh.annotations.Benchmark;
3634
import org.openjdk.jmh.annotations.Fork;
3735
import org.openjdk.jmh.annotations.Level;
@@ -60,8 +58,6 @@ public class StatsLoggerBenchmark {
6058
providers.put("Prometheus", PrometheusMetricsProvider::new);
6159
providers.put("Codahale", CodahaleMetricsProvider::new);
6260
providers.put("FastCodahale", FastCodahaleMetricsProvider::new);
63-
providers.put("Twitter", TwitterStatsProvider::new);
64-
providers.put("Ostrich", OstrichProvider::new);
6561
}
6662

6763
@State(Scope.Benchmark)

0 commit comments

Comments
 (0)