From 1b4791bc76e00cf13fb7ae08de523db1704277bc Mon Sep 17 00:00:00 2001 From: Maximilian Michels Date: Tue, 28 Apr 2026 18:30:30 +0200 Subject: [PATCH 1/2] Flink: Backport: Bundle flink-metrics-dropwizard in runtime jar (#16126) --- flink/v1.20/build.gradle | 4 ++-- flink/v1.20/flink-runtime/LICENSE | 10 +++++++++- flink/v2.0/build.gradle | 4 ++-- flink/v2.0/flink-runtime/LICENSE | 10 +++++++++- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/flink/v1.20/build.gradle b/flink/v1.20/build.gradle index 772133c8e1d8..2bbad1891c81 100644 --- a/flink/v1.20/build.gradle +++ b/flink/v1.20/build.gradle @@ -33,7 +33,7 @@ project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}") { implementation project(':iceberg-hive-metastore') compileOnly libs.flink120.avro - // for dropwizard histogram metrics implementation + // dropwizard histogram metrics (optional in Flink) compileOnly libs.flink120.metrics.dropwizard compileOnly libs.flink120.streaming.java compileOnly "${libs.flink120.streaming.java.get().module}:${libs.flink120.streaming.java.get().getVersion()}:tests" @@ -169,7 +169,7 @@ project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") { exclude group: 'com.google.code.findbugs', module: 'jsr305' } - // for dropwizard histogram metrics implementation + // To support dropwizard histogram metrics (not shipped by Flink by default) implementation libs.flink120.metrics.dropwizard // for integration testing with the flink-runtime-jar diff --git a/flink/v1.20/flink-runtime/LICENSE b/flink/v1.20/flink-runtime/LICENSE index 36a03cb4fcf9..e8c4c4a0bdf7 100644 --- a/flink/v1.20/flink-runtime/LICENSE +++ b/flink/v1.20/flink-runtime/LICENSE @@ -556,7 +556,7 @@ License: Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2 -------------------------------------------------------------------------------- -This product bundles Codahale Metrics. +This product bundles Dropwizard Metrics. Copyright: (c) 2010-2013 Coda Hale, Yammer.com, 2014-2021 Dropwizard Team Project URL: https://github.com/dropwizard/metrics @@ -564,6 +564,14 @@ License: Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2 -------------------------------------------------------------------------------- +This product bundles Apache Flink's optional support for Dropwizard Metrics. + +Copyright: 2014-2026 The Apache Software Foundation +Project URL: https://flink.apache.org/ +License: Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 + +-------------------------------------------------------------------------------- + This product bundles RoaringBitmap. Copyright: (c) 2013-... the RoaringBitmap authors diff --git a/flink/v2.0/build.gradle b/flink/v2.0/build.gradle index b276cb90dd24..626cc01b28e3 100644 --- a/flink/v2.0/build.gradle +++ b/flink/v2.0/build.gradle @@ -33,7 +33,7 @@ project(":iceberg-flink:iceberg-flink-${flinkMajorVersion}") { implementation project(':iceberg-hive-metastore') compileOnly libs.flink20.avro - // for dropwizard histogram metrics implementation + // dropwizard histogram metrics (optional in Flink) compileOnly libs.flink20.metrics.dropwizard compileOnly libs.flink20.streaming.java compileOnly "${libs.flink20.streaming.java.get().module}:${libs.flink20.streaming.java.get().getVersion()}:tests" @@ -169,7 +169,7 @@ project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") { exclude group: 'com.google.code.findbugs', module: 'jsr305' } - // for dropwizard histogram metrics implementation + // To support dropwizard histogram metrics (not shipped by Flink by default) implementation libs.flink20.metrics.dropwizard // for integration testing with the flink-runtime-jar diff --git a/flink/v2.0/flink-runtime/LICENSE b/flink/v2.0/flink-runtime/LICENSE index 36a03cb4fcf9..e8c4c4a0bdf7 100644 --- a/flink/v2.0/flink-runtime/LICENSE +++ b/flink/v2.0/flink-runtime/LICENSE @@ -556,7 +556,7 @@ License: Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2 -------------------------------------------------------------------------------- -This product bundles Codahale Metrics. +This product bundles Dropwizard Metrics. Copyright: (c) 2010-2013 Coda Hale, Yammer.com, 2014-2021 Dropwizard Team Project URL: https://github.com/dropwizard/metrics @@ -564,6 +564,14 @@ License: Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2 -------------------------------------------------------------------------------- +This product bundles Apache Flink's optional support for Dropwizard Metrics. + +Copyright: 2014-2026 The Apache Software Foundation +Project URL: https://flink.apache.org/ +License: Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0 + +-------------------------------------------------------------------------------- + This product bundles RoaringBitmap. Copyright: (c) 2013-... the RoaringBitmap authors From 575cbb2cbd4890d7d6f3577c5aae534aa83a88f6 Mon Sep 17 00:00:00 2001 From: Maximilian Michels Date: Wed, 29 Apr 2026 09:53:34 +0200 Subject: [PATCH 2/2] fixup! Re-trigger CI