Merge branch 'main' into bump_braces

kafbat · Dec 5, 2024 · de5fedc · de5fedc
2 parents 85b7cba + ec324dc
commit de5fedc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -97,7 +97,7 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-identity</artifactId>
-            <version>1.13.3</version>
+            <version>1.14.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>io.netty</groupId>

diff --git a/contract/src/main/resources/swagger/kafbat-ui-api.yaml b/contract/src/main/resources/swagger/kafbat-ui-api.yaml
@@ -3779,6 +3779,7 @@ components:
         - DYNAMIC_BROKER_LOGGER_CONFIG
         - DYNAMIC_BROKER_CONFIG
         - DYNAMIC_DEFAULT_BROKER_CONFIG
+        - DYNAMIC_CLIENT_METRICS_CONFIG
         - STATIC_BROKER_CONFIG
         - DEFAULT_CONFIG
         - UNKNOWN

diff --git a/frontend/src/components/Brokers/Broker/Configs/lib/constants.ts b/frontend/src/components/Brokers/Broker/Configs/lib/constants.ts
@@ -5,6 +5,8 @@ export const CONFIG_SOURCE_NAME_MAP: Record<ConfigSource, string> = {
   [ConfigSource.DYNAMIC_BROKER_LOGGER_CONFIG]: 'Dynamic broker logger config',
   [ConfigSource.DYNAMIC_BROKER_CONFIG]: 'Dynamic broker config',
   [ConfigSource.DYNAMIC_DEFAULT_BROKER_CONFIG]: 'Dynamic default broker config',
+  [ConfigSource.DYNAMIC_CLIENT_METRICS_CONFIG]:
+    'Dynamic client metrics subscription config',
   [ConfigSource.STATIC_BROKER_CONFIG]: 'Static broker config',
   [ConfigSource.DEFAULT_CONFIG]: 'Default config',
   [ConfigSource.UNKNOWN]: 'Unknown',
@@ -15,6 +17,7 @@ export const CONFIG_SOURCE_PRIORITY = {
   [ConfigSource.DYNAMIC_BROKER_LOGGER_CONFIG]: 1,
   [ConfigSource.DYNAMIC_BROKER_CONFIG]: 1,
   [ConfigSource.DYNAMIC_DEFAULT_BROKER_CONFIG]: 1,
+  [ConfigSource.DYNAMIC_CLIENT_METRICS_CONFIG]: 1,
   [ConfigSource.STATIC_BROKER_CONFIG]: 2,
   [ConfigSource.DEFAULT_CONFIG]: 3,
   [ConfigSource.UNKNOWN]: 4,

diff --git a/pom.xml b/pom.xml
@@ -39,13 +39,13 @@
         <datasketches-java.version>3.1.0</datasketches-java.version>
         <groovy.version>3.0.13</groovy.version>
         <jackson.version>2.14.0</jackson.version>
-        <kafka-clients.version>3.5.2</kafka-clients.version>
+        <kafka-clients.version>3.7.1</kafka-clients.version>
         <org.mapstruct.version>1.6.2</org.mapstruct.version>
         <org.projectlombok.version>1.18.34</org.projectlombok.version>
         <protobuf-java.version>3.25.5</protobuf-java.version>
         <scala-lang.library.version>2.13.9</scala-lang.library.version>
         <snakeyaml.version>2.3</snakeyaml.version>
-        <spring-boot.version>3.3.4</spring-boot.version>
+        <spring-boot.version>3.3.6</spring-boot.version>
         <serde-api.version>1.0.0</serde-api.version>
         <odd-oddrn-generator.version>0.1.17</odd-oddrn-generator.version>
         <odd-oddrn-client.version>0.1.39</odd-oddrn-client.version>