From bb1b932957aa59d7cbb6de3b00d0edda993701b8 Mon Sep 17 00:00:00 2001 From: yagagagaga Date: Wed, 18 Dec 2024 16:38:20 +0800 Subject: [PATCH 1/2] [regression](metrics) add a regression for version metrics --- .../metrics_p0/test_version_metrics.groovy | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 regression-test/suites/metrics_p0/test_version_metrics.groovy diff --git a/regression-test/suites/metrics_p0/test_version_metrics.groovy b/regression-test/suites/metrics_p0/test_version_metrics.groovy new file mode 100644 index 00000000000000..0d89ec663c3f96 --- /dev/null +++ b/regression-test/suites/metrics_p0/test_version_metrics.groovy @@ -0,0 +1,60 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +suite("test_version_metrics") { + httpTest { + endpoint context.config.feHttpAddress + uri "/metrics" + op "get" + check { code, body -> + logger.debug("code:${code} body:${body}"); + assertEquals(200, code) + assertTrue(body.contains("doris_fe_version")) + } + } + + def res = sql_return_maparray("show backends") + def beBrpcEndpoint = res[0].Host + ":" + res[0].BrpcPort + + httpTest { + endpoint beBrpcEndpoint + uri "/brpc_metrics" + op "get" + check { code, body -> + logger.debug("code:${code} body:${body}"); + assertEquals(200, code) + assertTrue(body.contains("doris_be_version")) + } + } + + if (cluster.isRunning() && cluster.isCloudMode()) { + + def ms = cluster.getAllMetaservices().get(0) + def msEndpoint = ms.host + ":" + ms.httpPort + + httpTest { + endpoint msEndpoint + uri "/brpc_metrics" + op "get" + check { code, body -> + logger.debug("code:${code} body:${body}"); + assertEquals(200, code) + assertTrue(body.contains("doris_cloud_version")) + } + } + } +} From 15b56d870266dd579f9af1c38aa8e9b189511400 Mon Sep 17 00:00:00 2001 From: yagagagaga Date: Fri, 20 Dec 2024 20:52:24 +0800 Subject: [PATCH 2/2] assert version number --- .../suites/metrics_p0/test_version_metrics.groovy | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/regression-test/suites/metrics_p0/test_version_metrics.groovy b/regression-test/suites/metrics_p0/test_version_metrics.groovy index 0d89ec663c3f96..51f6cc8539dbda 100644 --- a/regression-test/suites/metrics_p0/test_version_metrics.groovy +++ b/regression-test/suites/metrics_p0/test_version_metrics.groovy @@ -24,6 +24,11 @@ suite("test_version_metrics") { logger.debug("code:${code} body:${body}"); assertEquals(200, code) assertTrue(body.contains("doris_fe_version")) + for (final def line in body.split("\n")) { + if (line.contains("doris_fe_version") && !line.contains("#")) { + assertTrue(Long.parseLong(line.split(" ")[1]) >= 0) + } + } } } @@ -38,6 +43,11 @@ suite("test_version_metrics") { logger.debug("code:${code} body:${body}"); assertEquals(200, code) assertTrue(body.contains("doris_be_version")) + for (final def line in body.split("\n")) { + if (line.contains("doris_be_version") && !line.contains("#")) { + assertTrue(Long.parseLong(line.split(" ")[1]) >= 0) + } + } } } @@ -54,6 +64,11 @@ suite("test_version_metrics") { logger.debug("code:${code} body:${body}"); assertEquals(200, code) assertTrue(body.contains("doris_cloud_version")) + for (final def line in body.split("\n")) { + if (line.contains("doris_cloud_version") && !line.contains("#")) { + assertTrue(Long.parseLong(line.split(" ")[1]) >= 0) + } + } } } }