From 4e1a6be17f0f0bf949a77d445a91ac453d117408 Mon Sep 17 00:00:00 2001 From: v-zhangjc9 Date: Tue, 30 Apr 2024 14:44:52 +0800 Subject: [PATCH] =?UTF-8?q?fix(executor):=20=E4=BF=AE=E5=A4=8D=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF=E5=92=8C=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=E9=94=99=E8=AF=AF=E5=AF=BC=E8=87=B4victoria=20metrics?= =?UTF-8?q?=E6=8C=87=E6=A0=87=E8=BE=93=E5=87=BA=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...apache.flink.client.deployment.ClusterClientFactory | 0 ...apache.flink.core.execution.PipelineExecutorFactory | 0 ...apache.flink.metrics.reporter.MetricReporterFactory | 0 .../services/org.apache.flink.table.factories.Factory | 0 .../executor/metrics/VictoriaMetricsReporter.java | 4 +++- .../metrics/VictoriaMetricsReporterFactory.java | 10 +++++++--- ...apache.flink.client.deployment.ClusterClientFactory | 0 ...apache.flink.core.execution.PipelineExecutorFactory | 0 ...apache.flink.metrics.reporter.MetricReporterFactory | 0 .../org.apache.flink.table.factories.TableFactory | 0 10 files changed, 10 insertions(+), 4 deletions(-) rename service-launcher/src/main/resources/{ => META-INF}/services/org.apache.flink.client.deployment.ClusterClientFactory (100%) rename service-launcher/src/main/resources/{ => META-INF}/services/org.apache.flink.core.execution.PipelineExecutorFactory (100%) rename service-launcher/src/main/resources/{ => META-INF}/services/org.apache.flink.metrics.reporter.MetricReporterFactory (100%) rename service-launcher/src/main/resources/{ => META-INF}/services/org.apache.flink.table.factories.Factory (100%) rename utils/executor/src/main/resources/{ => META-INF}/services/org.apache.flink.client.deployment.ClusterClientFactory (100%) rename utils/executor/src/main/resources/{ => META-INF}/services/org.apache.flink.core.execution.PipelineExecutorFactory (100%) rename utils/executor/src/main/resources/{ => META-INF}/services/org.apache.flink.metrics.reporter.MetricReporterFactory (100%) rename utils/executor/src/main/resources/{ => META-INF}/services/org.apache.flink.table.factories.TableFactory (100%) diff --git a/service-launcher/src/main/resources/services/org.apache.flink.client.deployment.ClusterClientFactory b/service-launcher/src/main/resources/META-INF/services/org.apache.flink.client.deployment.ClusterClientFactory similarity index 100% rename from service-launcher/src/main/resources/services/org.apache.flink.client.deployment.ClusterClientFactory rename to service-launcher/src/main/resources/META-INF/services/org.apache.flink.client.deployment.ClusterClientFactory diff --git a/service-launcher/src/main/resources/services/org.apache.flink.core.execution.PipelineExecutorFactory b/service-launcher/src/main/resources/META-INF/services/org.apache.flink.core.execution.PipelineExecutorFactory similarity index 100% rename from service-launcher/src/main/resources/services/org.apache.flink.core.execution.PipelineExecutorFactory rename to service-launcher/src/main/resources/META-INF/services/org.apache.flink.core.execution.PipelineExecutorFactory diff --git a/service-launcher/src/main/resources/services/org.apache.flink.metrics.reporter.MetricReporterFactory b/service-launcher/src/main/resources/META-INF/services/org.apache.flink.metrics.reporter.MetricReporterFactory similarity index 100% rename from service-launcher/src/main/resources/services/org.apache.flink.metrics.reporter.MetricReporterFactory rename to service-launcher/src/main/resources/META-INF/services/org.apache.flink.metrics.reporter.MetricReporterFactory diff --git a/service-launcher/src/main/resources/services/org.apache.flink.table.factories.Factory b/service-launcher/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 100% rename from service-launcher/src/main/resources/services/org.apache.flink.table.factories.Factory rename to service-launcher/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory diff --git a/utils/executor/src/main/java/com/lanyuanxiaoyao/service/executor/metrics/VictoriaMetricsReporter.java b/utils/executor/src/main/java/com/lanyuanxiaoyao/service/executor/metrics/VictoriaMetricsReporter.java index ee9b2a0..09a5163 100644 --- a/utils/executor/src/main/java/com/lanyuanxiaoyao/service/executor/metrics/VictoriaMetricsReporter.java +++ b/utils/executor/src/main/java/com/lanyuanxiaoyao/service/executor/metrics/VictoriaMetricsReporter.java @@ -11,6 +11,7 @@ import java.io.StringWriter; import java.util.Map; import java.util.stream.Collectors; import org.apache.flink.metrics.prometheus.AbstractPrometheusReporter; +import org.apache.flink.metrics.reporter.InstantiateViaFactory; import org.apache.flink.metrics.reporter.Scheduled; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,6 +20,7 @@ import org.slf4j.LoggerFactory; * @author ZhangJiacheng * @date 2022-06-22 */ +@InstantiateViaFactory(factoryClassName = "com.lanyuanxiaoyao.service.executor.metrics.VictoriaMetricsReporterFactory") public class VictoriaMetricsReporter extends AbstractPrometheusReporter implements Scheduled { private static final Logger logger = LoggerFactory.getLogger(VictoriaMetricsReporter.class); @@ -58,7 +60,7 @@ public class VictoriaMetricsReporter extends AbstractPrometheusReporter implemen logger.warn("Fail to push metrics: {}, {}, endpoint: {}, tags: {}", response.getStatus(), response.body(), endpoint, tags); } } catch (IOException e) { - logger.error("Fail to write metrics, endpoint: {}, tags: {}, exception: {}", endpoint, tags, e); + logger.error("Fail to write metrics, endpoint: {}, tags: {}", endpoint, tags, e); } } } diff --git a/utils/executor/src/main/java/com/lanyuanxiaoyao/service/executor/metrics/VictoriaMetricsReporterFactory.java b/utils/executor/src/main/java/com/lanyuanxiaoyao/service/executor/metrics/VictoriaMetricsReporterFactory.java index dee70d0..321f269 100644 --- a/utils/executor/src/main/java/com/lanyuanxiaoyao/service/executor/metrics/VictoriaMetricsReporterFactory.java +++ b/utils/executor/src/main/java/com/lanyuanxiaoyao/service/executor/metrics/VictoriaMetricsReporterFactory.java @@ -10,14 +10,18 @@ import org.apache.flink.metrics.reporter.MetricReporterFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static com.lanyuanxiaoyao.service.executor.metrics.VictoriaMetricsOptions.*; +import static com.lanyuanxiaoyao.service.executor.metrics.VictoriaMetricsOptions.AUTH_PASSWORD; +import static com.lanyuanxiaoyao.service.executor.metrics.VictoriaMetricsOptions.AUTH_USERNAME; +import static com.lanyuanxiaoyao.service.executor.metrics.VictoriaMetricsOptions.ENABLE_AUTH; +import static com.lanyuanxiaoyao.service.executor.metrics.VictoriaMetricsOptions.ENDPOINT; +import static com.lanyuanxiaoyao.service.executor.metrics.VictoriaMetricsOptions.TAGS; +import static com.lanyuanxiaoyao.service.executor.metrics.VictoriaMetricsOptions.TIMEOUT; /** * @author ZhangJiacheng * @date 2022-06-22 */ -@InterceptInstantiationViaReflection( - reporterClassName = "com.lanyuanxiaoyao.service.executor.metrics.VictoriaMetricsReporter") +@InterceptInstantiationViaReflection(reporterClassName = "com.lanyuanxiaoyao.service.executor.metrics.VictoriaMetricsReporter") public class VictoriaMetricsReporterFactory implements MetricReporterFactory { private static final Logger logger = LoggerFactory.getLogger(VictoriaMetricsReporterFactory.class); diff --git a/utils/executor/src/main/resources/services/org.apache.flink.client.deployment.ClusterClientFactory b/utils/executor/src/main/resources/META-INF/services/org.apache.flink.client.deployment.ClusterClientFactory similarity index 100% rename from utils/executor/src/main/resources/services/org.apache.flink.client.deployment.ClusterClientFactory rename to utils/executor/src/main/resources/META-INF/services/org.apache.flink.client.deployment.ClusterClientFactory diff --git a/utils/executor/src/main/resources/services/org.apache.flink.core.execution.PipelineExecutorFactory b/utils/executor/src/main/resources/META-INF/services/org.apache.flink.core.execution.PipelineExecutorFactory similarity index 100% rename from utils/executor/src/main/resources/services/org.apache.flink.core.execution.PipelineExecutorFactory rename to utils/executor/src/main/resources/META-INF/services/org.apache.flink.core.execution.PipelineExecutorFactory diff --git a/utils/executor/src/main/resources/services/org.apache.flink.metrics.reporter.MetricReporterFactory b/utils/executor/src/main/resources/META-INF/services/org.apache.flink.metrics.reporter.MetricReporterFactory similarity index 100% rename from utils/executor/src/main/resources/services/org.apache.flink.metrics.reporter.MetricReporterFactory rename to utils/executor/src/main/resources/META-INF/services/org.apache.flink.metrics.reporter.MetricReporterFactory diff --git a/utils/executor/src/main/resources/services/org.apache.flink.table.factories.TableFactory b/utils/executor/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory similarity index 100% rename from utils/executor/src/main/resources/services/org.apache.flink.table.factories.TableFactory rename to utils/executor/src/main/resources/META-INF/services/org.apache.flink.table.factories.TableFactory