Skip to content
Permalink
Browse files
Move bookkeeper-stats and bookkeeper-stats-providers as submodules of…
… stats

### Motiviations
Fix todo to make the project layout more reasonable and easier to fix bug/dev new feature
### Changes
move `bookkeeper-stats` and `bookkeeper-stats-providers` as submodules of `stats`

Reviewers: Enrico Olivelli <eolivelli@gmail.com>, Nicolò Boschi <boschi1997@gmail.com>, Andrey Yegorov <None>

This closes #3246 from Shoothzj/module-04-25
  • Loading branch information
Shoothzj committed Apr 28, 2022
1 parent 4175088 commit 80ca1f834c9ec5054b6d8757d98126759b9292b4
Showing 72 changed files with 48 additions and 53 deletions.
@@ -28,7 +28,7 @@ dependencies {

implementation project(':bookkeeper-common')
implementation project(':bookkeeper-server')
implementation project(':bookkeeper-stats')
implementation project(':stats:bookkeeper-stats-api')

compileOnly depLibs.lombok
compileOnly depLibs.spotbugsAnnotations
@@ -24,7 +24,7 @@ plugins {
}

dependencies {
implementation project(":bookkeeper-stats")
implementation project(":stats:bookkeeper-stats-api")
implementation project(":cpu-affinity")

implementation depLibs.errorprone
@@ -29,9 +29,9 @@ dependencies {
implementation project(':bookkeeper-http:http-server')
implementation project(':bookkeeper-http:vertx-http-server')
implementation project(':bookkeeper-server')
implementation project(':bookkeeper-stats-providers:codahale-metrics-provider')
implementation project(':bookkeeper-stats-providers:prometheus-metrics-provider')
implementation project(':bookkeeper-stats')
implementation project(':stats:bookkeeper-stats-api')
implementation project(':stats:bookkeeper-stats-providers:codahale-metrics-provider')
implementation project(':stats:bookkeeper-stats-providers:prometheus-metrics-provider')
implementation project(':stream:distributedlog:core')
implementation project(':stream:server')
implementation project(':bookkeeper-tools')
@@ -33,7 +33,7 @@ dependencies {
exclude group: 'log4j', module: 'log4j'
exclude group: 'org.slf4j', module: 'slf4j-log4j12'
}
runtimeOnly (project(':bookkeeper-stats-providers:codahale-metrics-provider')) {
runtimeOnly (project(':stats:bookkeeper-stats-providers:codahale-metrics-provider')) {
exclude group: "io.dropwizard.metrics", module: "metrics-graphite"
exclude group: "io.dropwizard.metrics", module: "metrics-jvm"
}
@@ -30,11 +30,11 @@ releaseArtifacts {

dependencies {
implementation project(':bookkeeper-server')
implementation project(':bookkeeper-stats-providers:prometheus-metrics-provider')
implementation project(':bookkeeper-stats')
implementation project(':stats:bookkeeper-stats-api')
implementation project(':bookkeeper-tools')
implementation project(':stats:bookkeeper-stats-providers:prometheus-metrics-provider')
implementation project(':stream:distributedlog:core')
implementation project(':stream:server')
implementation project(':bookkeeper-tools')
runtimeOnly depLibs.log4jSlf4jImpl
runtimeOnly depLibs.log4jCore
runtimeOnly (depLibs.zookeeperTest) {
@@ -27,10 +27,10 @@ dependencies {
implementation project(':bookkeeper-common-allocator')
implementation project(':bookkeeper-http:http-server')
implementation project(':bookkeeper-proto')
implementation project(':bookkeeper-stats')
implementation project(':bookkeeper-tools-framework')
implementation project(':circe-checksum')
implementation project(':cpu-affinity')
implementation project(':stats:bookkeeper-stats-api')

compileOnly depLibs.lombok
compileOnly depLibs.spotbugsAnnotations
@@ -58,7 +58,7 @@ dependencies {
runtimeOnly depLibs.snappy

testImplementation project(':testtools')
testImplementation project(':bookkeeper-stats-providers:prometheus-metrics-provider')
testImplementation project(':stats:bookkeeper-stats-providers:prometheus-metrics-provider')
testImplementation project(':bookkeeper-http:vertx-http-server')
testImplementation project(path: ':bookkeeper-common', configuration: 'testArtifacts')

@@ -350,9 +350,9 @@ allprojects {
def javadocProjects = [
":bookkeeper-common",
":bookkeeper-server",
":bookkeeper-stats",
":bookkeeper-stats-providers:prometheus-metrics-provider",
":bookkeeper-stats-providers:codahale-metrics-provider",
":stats:bookkeeper-stats-api",
":stats:bookkeeper-stats-providers:codahale-metrics-provider",
":stats:bookkeeper-stats-providers:prometheus-metrics-provider",
]

task generateApiJavadoc(type: Javadoc) {
@@ -24,7 +24,7 @@ plugins {
dependencies {
implementation project(":bookkeeper-server")
implementation project(":bookkeeper-common")
implementation project(":bookkeeper-stats")
implementation project(":stats:bookkeeper-stats-api")
implementation depLibs.etcd
implementation depLibs.commonsConfiguration
implementation depLibs.commonsLang3
@@ -21,11 +21,11 @@ plugins {
}

dependencies {
implementation project(":bookkeeper-stats-providers:codahale-metrics-provider")
implementation project(":bookkeeper-stats-providers:prometheus-metrics-provider")
implementation project(":bookkeeper-common")
implementation project(":bookkeeper-server")
implementation project(":bookkeeper-stats")
implementation project(":stats:bookkeeper-stats-api")
implementation project(":stats:bookkeeper-stats-providers:codahale-metrics-provider")
implementation project(":stats:bookkeeper-stats-providers:prometheus-metrics-provider")
implementation project(":bookkeeper-proto")
compileOnly depLibs.metricsCore
compileOnly depLibs.protobuf
@@ -56,12 +56,9 @@
<module>bookkeeper-common</module>
<module>bookkeeper-common-allocator</module>
<module>stats</module>
<!-- TODO: move `bookkeeper-stats` and `bookkeeper-stats-providers` as submodules of `stats` -->
<module>bookkeeper-stats</module>
<module>bookkeeper-proto</module>
<module>bookkeeper-server</module>
<module>bookkeeper-benchmark</module>
<module>bookkeeper-stats-providers</module>
<module>bookkeeper-http</module>
<module>stream</module>
<module>tools</module>
@@ -52,9 +52,6 @@ include(':bookkeeper-benchmark',
'bookkeeper-server',
'shaded:bookkeeper-server-shaded',
'shaded:bookkeeper-server-tests-shaded',
'bookkeeper-stats',
'bookkeeper-stats-providers:prometheus-metrics-provider',
'bookkeeper-stats-providers:codahale-metrics-provider',
'buildtools',
'circe-checksum',
'circe-checksum:src:main:circe',
@@ -64,6 +61,9 @@ include(':bookkeeper-benchmark',
'microbenchmarks',
'metadata-drivers:etcd',
'shaded:distributedlog-core-shaded',
'stats:bookkeeper-stats-api',
'stats:bookkeeper-stats-providers:prometheus-metrics-provider',
'stats:bookkeeper-stats-providers:codahale-metrics-provider',
'stats:utils',
'stream:api',
'stream:clients:java:all',
File renamed without changes.
@@ -18,8 +18,8 @@
<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>
<parent>
<artifactId>bookkeeper</artifactId>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper-stats-parent</artifactId>
<groupId>org.apache.bookkeeper.stats</groupId>
<version>4.16.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.bookkeeper.stats</groupId>
@@ -25,7 +25,7 @@ description = 'Apache BookKeeper :: Stats Providers :: Codahale Metrics'

dependencies {

implementation project(':bookkeeper-stats')
implementation project(':stats:bookkeeper-stats-api')

implementation depLibs.commonsConfiguration
implementation depLibs.guava
@@ -18,10 +18,9 @@
<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>
<parent>
<artifactId>bookkeeper</artifactId>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper-stats-providers</artifactId>
<groupId>org.apache.bookkeeper.stats</groupId>
<version>4.16.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.apache.bookkeeper.stats</groupId>
<artifactId>codahale-metrics-provider</artifactId>
@@ -17,8 +17,8 @@

<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">
<parent>
<artifactId>bookkeeper</artifactId>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper-stats-parent</artifactId>
<groupId>org.apache.bookkeeper.stats</groupId>
<version>4.16.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -22,7 +22,7 @@ plugins {
}

dependencies {
implementation project(":bookkeeper-stats")
implementation project(":stats:bookkeeper-stats-api")
implementation depLibs.commonsConfiguration
implementation depLibs.guava
implementation depLibs.jettyServlet
@@ -18,10 +18,9 @@
<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>
<parent>
<artifactId>bookkeeper</artifactId>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper-stats-providers</artifactId>
<groupId>org.apache.bookkeeper.stats</groupId>
<version>4.16.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.apache.bookkeeper.stats</groupId>
<artifactId>prometheus-metrics-provider</artifactId>