diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a651d3..e615698 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://git.rustybever.be/vieter-v/vieter/src/branch/dev) -### Added - -* Metrics endpoint for Prometheus integration - ## [0.5.0-rc.2](https://git.rustybever.be/vieter-v/vieter/src/tag/0.5.0-rc.2) ### Added diff --git a/src/server/api_metrics.v b/src/server/api_metrics.v deleted file mode 100644 index af1b134..0000000 --- a/src/server/api_metrics.v +++ /dev/null @@ -1,16 +0,0 @@ -module server - -import metrics -import web - -['/api/v1/metrics'; get] -fn (mut app App) v1_metrics() web.Result { - mut exporter := metrics.new_prometheus_exporter([0.01, 0.05, 0.1, 0.5, 1, 100]) - exporter.load(app.collector) - - // TODO stream to connection instead - body := exporter.export_to_string() or { - return app.status(.internal_server_error) - } - return app.body(.ok, 'text/plain', body) -} diff --git a/src/server/cli.v b/src/server/cli.v index 8fbea15..795f764 100644 --- a/src/server/cli.v +++ b/src/server/cli.v @@ -15,7 +15,6 @@ pub: base_image string = 'archlinux:base-devel' max_log_age int = -1 log_removal_schedule string = '0 0' - collect_metrics int = -1 } // cmd returns the cli submodule that handles starting the server diff --git a/src/server/server.v b/src/server/server.v index c5ff332..178f657 100644 --- a/src/server/server.v +++ b/src/server/server.v @@ -8,7 +8,6 @@ import util import db import build { BuildJobQueue } import cron.expression -import metrics const ( log_file_name = 'vieter.log' @@ -101,20 +100,12 @@ pub fn server(conf Config) ! { util.exit_with_message(1, 'Failed to initialize database: $err.msg()') } - collector := if conf.collect_metrics > 0 { - &metrics.MetricsCollector(metrics.new_default_collector()) - } else { - - &metrics.MetricsCollector(metrics.new_null_collector()) - } - mut app := &App{ logger: logger api_key: conf.api_key conf: conf repo: repo db: db - collector: collector job_queue: build.new_job_queue(global_ce, conf.base_image) } app.init_job_queue() or { diff --git a/src/v.mod b/src/v.mod index 461af6a..710c976 100644 --- a/src/v.mod +++ b/src/v.mod @@ -2,7 +2,6 @@ Module { dependencies: [ 'https://git.rustybever.be/vieter-v/conf', 'https://git.rustybever.be/vieter-v/docker', - 'https://git.rustybever.be/vieter-v/aur', - 'https://git.rustybever.be/vieter-v/metrics' + 'https://git.rustybever.be/vieter-v/aur' ] } diff --git a/src/web/web.v b/src/web/web.v index 95c91ed..565baff 100644 --- a/src/web/web.v +++ b/src/web/web.v @@ -11,7 +11,6 @@ import net.urllib import time import json import log -import metrics // The Context struct represents the Context which hold the HTTP request and response. // It has fields for the query, form, files. @@ -28,8 +27,6 @@ pub mut: conn &net.TcpConn = unsafe { nil } // Gives access to a shared logger object logger shared log.Log - // Used to collect metrics on the web server - collector &metrics.MetricsCollector // time.ticks() from start of web connection handle. // You can use it to determine how much time is spent on your request. page_gen_start i64 @@ -148,14 +145,6 @@ pub fn (ctx &Context) is_authenticated() bool { return false } -pub fn (mut ctx Context) body(status http.Status, content_type string, body string) Result { - ctx.status = status - ctx.content_type = content_type - ctx.send_response(body) - - return Result{} -} - // json HTTP_OK with json_s as payload with content-type `application/json` pub fn (mut ctx Context) json(status http.Status, j T) Result { ctx.status = status @@ -330,16 +319,6 @@ fn handle_conn(mut conn net.TcpConn, mut app T, routes map[string]Route) { app.logger.flush() } - // Record how long request took to process - labels := [ - ['method', app.req.method.str()]!, - ['path', app.req.url]!, - ['status', app.status.int().str()]! - ] - app.collector.counter_increment(name: 'http_requests_total', labels: labels) - app.collector.histogram_record(time.ticks() - app.page_gen_start, name: 'http_requests_time_ms', labels: labels) - /* app.collector.histogram_ */ - unsafe { free(app) } @@ -405,7 +384,6 @@ fn handle_conn(mut conn net.TcpConn, mut app T, routes map[string]Route) { static_mime_types: app.static_mime_types reader: reader logger: app.logger - collector: app.collector api_key: app.api_key } diff --git a/vieter.toml b/vieter.toml index 2c95e90..1f839f0 100644 --- a/vieter.toml +++ b/vieter.toml @@ -13,4 +13,3 @@ api_update_frequency = 2 image_rebuild_frequency = 1 max_concurrent_builds = 3 max_log_age = 64 -collect_metrics = false