You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mb...@apache.org on 2022/10/27 19:01:05 UTC
[flink] 06/34: [internal] Hubble metrics reporter
This is an automated email from the ASF dual-hosted git repository.
mbalassi pushed a commit to branch release-1.15.2.4-acs
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 684d975f4e0bdcf6934b269d1e2bacc355853471
Author: Gyula Fora <g_...@apple.com>
AuthorDate: Wed Jan 26 16:33:39 2022 +0100
[internal] Hubble metrics reporter
---
flink-dist/pom.xml | 12 ++++++++++--
flink-dist/src/main/assemblies/plugins.xml | 10 ++++++++++
pom.xml | 26 +++++++++++++++++---------
3 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index b2d65846739..ca5640cf3ed 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -36,6 +36,7 @@ under the License.
<properties>
<zookeeper.optional.version>3.6.3</zookeeper.optional.version>
<japicmp.skip>true</japicmp.skip>
+ <acs.flink.libs.version>1.14-SNAPSHOT</acs.flink.libs.version>
</properties>
<dependencies>
@@ -154,7 +155,7 @@ under the License.
<version>${project.version}</version>
</dependency>
- <!-- Concrete logging framework - we add this only here (and not in the
+ <!-- Concrete logging framework - we add this only here (and not in the
root POM) to not tie the projects to one specific framework and make
it easier for users to swap logging frameworks -->
@@ -264,7 +265,7 @@ under the License.
</dependency>
<!--
- The following dependencies are packaged in 'opt/'
+ The following dependencies are packaged in 'opt/'
The scope of these dependencies needs to be 'provided' so that
they are not included into the 'flink-dist' uber jar.
-->
@@ -333,6 +334,12 @@ under the License.
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>com.apple.pie.flink</groupId>
+ <artifactId>acs-flink-metrics-hubble</artifactId>
+ <version>${acs.flink.libs.version}</version>
+ </dependency>
<!-- end optional Flink metrics reporters -->
<!-- start optional Flink libraries -->
@@ -739,6 +746,7 @@ under the License.
<exclude>org.apache.logging.log4j:*</exclude>
<!-- Bundled separately so that users can easily switch between ZK 3.4/3.5-->
<exclude>org.apache.flink:flink-shaded-zookeeper-3</exclude>
+ <exclude>com.apple.pie.flink:acs-flink-metrics-hubble</exclude>
</excludes>
</artifactSet>
</configuration>
diff --git a/flink-dist/src/main/assemblies/plugins.xml b/flink-dist/src/main/assemblies/plugins.xml
index ae47e0b8c09..6ed6a5838d6 100644
--- a/flink-dist/src/main/assemblies/plugins.xml
+++ b/flink-dist/src/main/assemblies/plugins.xml
@@ -28,6 +28,16 @@
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>flink-${project.version}</baseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>plugins/metrics-hubble/</outputDirectory>
+ <unpack>false</unpack>
+ <includes>
+ <include>com.apple.pie.flink:acs-flink-metrics-hubble</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
<files>
<!-- Metrics -->
diff --git a/pom.xml b/pom.xml
index 3ed192d10c4..a8392a3dd9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,22 @@ under the License.
<enabled>false</enabled>
</releases>
</repository>
+ <repository>
+ <id>apple-release</id>
+ <name>apple-release</name>
+ <url>https://artifacts.apple.com/libs-release</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>apple-snapshots</id>
+ <name>apple-snapshots</name>
+ <url>https://artifacts.apple.com/libs-snapshot</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<modules>
@@ -198,14 +214,6 @@ under the License.
<test.unit.pattern>**/*Test.*</test.unit.pattern>
</properties>
- <repositories>
- <repository>
- <id>apple-release</id>
- <name>apple-release</name>
- <url>https://artifacts.apple.com/libs-release</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
@@ -588,7 +596,7 @@ under the License.
<scope>import</scope>
<version>2.13.2.20220328</version>
</dependency>
-
+
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>