From 1429412afae931e7ad9e70114083fb7117602c02 Mon Sep 17 00:00:00 2001 From: skudasov Date: Fri, 29 May 2026 12:38:54 +0200 Subject: [PATCH 01/15] wip --- book/src/libs/wasp/getting_started.md | 2 + .../how-to/start_local_observability_stack.md | 71 +-- wasp/Justfile | 18 + wasp/compose-victoria-metrics/README.md | 43 ++ .../docker-compose.yml | 66 +++ .../provisioning/dashboards/dashboards.yaml | 10 + .../provisioning/datasources/datasources.yaml | 20 + .../otel/otel-collector-config.yaml | 40 ++ .../conf/provisioning/dashboards/sample.yaml | 8 + .../conf/provisioning/datasources/loki.yaml | 1 + wasp/compose/docker-compose.yaml | 1 + .../dashboard-victoria-metrics/dashboard.json | 377 ++++++++++++++ wasp/dashboard/cmd/main.go | 25 - wasp/dashboard/dashboard.go | 485 ------------------ wasp/dashboard/dashboard.json | 428 ++++++++++++++++ wasp/dashboard/grafanasdk/panels.go | 381 -------------- wasp/dashboard/panels.go | 85 --- wasp/examples/go.mod | 33 +- wasp/examples/go.sum | 74 +-- .../profiles/node_background_load_test.go | 18 +- wasp/examples/profiles/node_mixed_test.go | 2 + wasp/examples/profiles/node_rps_test.go | 4 +- .../profiles/node_vu_grafana_opts_test.go | 4 +- wasp/examples/profiles/node_vu_test.go | 4 +- wasp/examples/scenario/main_test.go | 2 +- wasp/examples/simple_rps/gun.go | 2 +- wasp/examples/simple_rps/main_test.go | 2 +- wasp/examples/simple_vu/main_test.go | 2 +- wasp/go.mod | 33 +- wasp/go.sum | 74 +-- wasp/loki_client.go | 29 +- wasp/otel_client.go | 160 ++++++ wasp/tmpl_generator.go | 5 +- wasp/wasp.go | 207 ++++++-- 34 files changed, 1517 insertions(+), 1199 deletions(-) create mode 100644 wasp/Justfile create mode 100644 wasp/compose-victoria-metrics/README.md create mode 100644 wasp/compose-victoria-metrics/docker-compose.yml create mode 100644 wasp/compose-victoria-metrics/grafana/provisioning/dashboards/dashboards.yaml create mode 100644 wasp/compose-victoria-metrics/grafana/provisioning/datasources/datasources.yaml create mode 100644 wasp/compose-victoria-metrics/otel/otel-collector-config.yaml create mode 100644 wasp/dashboard-victoria-metrics/dashboard.json delete mode 100644 wasp/dashboard/cmd/main.go delete mode 100644 wasp/dashboard/dashboard.go create mode 100644 wasp/dashboard/dashboard.json delete mode 100644 wasp/dashboard/grafanasdk/panels.go delete mode 100644 wasp/dashboard/panels.go create mode 100644 wasp/otel_client.go diff --git a/book/src/libs/wasp/getting_started.md b/book/src/libs/wasp/getting_started.md index ff5028eed..9a4b03a99 100644 --- a/book/src/libs/wasp/getting_started.md +++ b/book/src/libs/wasp/getting_started.md @@ -2,6 +2,8 @@ ## Prerequisites * [Golang](https://go.dev/doc/install) +* [Just](https://github.com/casey/just) +* [Docker](https://docs.docker.com/get-docker/) ## Setup To start writing tests, create a directory for your project with a `go.mod` file, then add the WASP package: diff --git a/book/src/libs/wasp/how-to/start_local_observability_stack.md b/book/src/libs/wasp/how-to/start_local_observability_stack.md index ea510011e..cb3680183 100644 --- a/book/src/libs/wasp/how-to/start_local_observability_stack.md +++ b/book/src/libs/wasp/how-to/start_local_observability_stack.md @@ -1,77 +1,26 @@ # WASP - How to Start Local Observability Stack -To execute all examples or tests locally, you need to configure a local observability stack. This stack includes **Loki**, **Grafana**, and **Pyroscope**. +To execute all examples or tests locally, you need to configure a local observability stack. We have 2 versions of popular stacks: LGTM (Grafana, Loki, Prometheus) and VictoriaMetrics + OTEL (Grafana, VictoriaMetrics, VictoriaLogs, OTEL). ---- - -## Prerequisites - -Ensure you have the following installed: -* [Docker](https://docs.docker.com/get-docker/) --- -## Grafana and Loki - -To start the local observability stack, run the following command: +## LGTM ```bash -make start +just lgtm-up +just lgtm-down ``` -This command will download and run Docker images for Loki and Grafana. Once completed, it will output something like: - -```bash -Service account id: 2 -Grafana token: "" -``` +* [Dashboard](http://localhost:3000/d/wasp-victorialogs/wasp-victorialogs?orgId=1&from=now-5m&to=now&timezone=browser&var-go_test_name=$__all&var-gen_name=$__all&var-call_group=$__all&var-branch=$__all&var-commit=$__all&refresh=5s) -### Setting Up Environment Variables +Don't forget to remove the stack when you are done! -Next, set up the required environment variables. -> [!WARNING] -> Replace `` with the token provided in the previous step. +## VictoriaMetrics + OTEL ```bash -export LOKI_TOKEN= -export LOKI_URL=http://localhost:3030/loki/api/v1/push -export GRAFANA_URL=http://localhost:3000 -export GRAFANA_TOKEN= -export DATA_SOURCE_NAME=Loki -export DASHBOARD_FOLDER=LoadTests -export DASHBOARD_NAME=Wasp +just victoria-up +just victoria-down ``` -### Accessing Services - -* Grafana: [http://localhost:3000/](http://localhost:3000/) -* Loki: [http://localhost:3030/](http://localhost:3030/) - -### Stopping the Containers - -To stop both containers, run: - -```bash -make stop -``` - ---- - -## Pyroscope - -To start Pyroscope, execute: - -```bash -make pyro_start -``` - -> [!NOTE] -> Pyroscope is available at: [http://localhost:4040/](http://localhost:4040/) - -### Stopping Pyroscope - -To stop Pyroscope, run: - -```bash -make pyro_stop -``` \ No newline at end of file +* [Dashboard](http://localhost:3000/d/wasp-victorialogs/wasp-victorialogs?orgId=1&from=now-5m&to=now&timezone=browser&var-go_test_name=$__all&var-gen_name=$__all&var-call_group=$__all&var-branch=$__all&var-commit=$__all&refresh=5s) diff --git a/wasp/Justfile b/wasp/Justfile new file mode 100644 index 000000000..0aa12f8d7 --- /dev/null +++ b/wasp/Justfile @@ -0,0 +1,18 @@ +_default: + @just --list + +# Start LGTM stack (Loki + Grafana) in compose/ +lgtm-up: + cd {{justfile_directory()}}/compose && docker compose down -v && docker compose up -d + +# Stop LGTM stack and wipe volumes +lgtm-down: + cd {{justfile_directory()}}/compose && docker compose down -v + +# Start VictoriaMetrics + VictoriaLogs + OTEL stack in compose-victoria-metrics/ +victoria-up: + cd {{justfile_directory()}}/compose-victoria-metrics && docker compose down -v && docker compose up -d + +# Stop VictoriaMetrics stack and wipe volumes +victoria-down: + cd {{justfile_directory()}}/compose-victoria-metrics && docker compose down -v diff --git a/wasp/compose-victoria-metrics/README.md b/wasp/compose-victoria-metrics/README.md new file mode 100644 index 000000000..7ce3665ea --- /dev/null +++ b/wasp/compose-victoria-metrics/README.md @@ -0,0 +1,43 @@ +# Local VictoriaMetrics + VictoriaLogs + OTEL stack + +Minimal setup for experimenting with OTEL metrics & logs in Grafana. + +## Components + +| Service | Port | Purpose | +|---|---|---| +| Grafana | 3000 | UI, anonymous admin enabled | +| OTEL Collector | 4317 (gRPC), 4318 (HTTP) | Receives OTLP from your app | +| VictoriaMetrics | 8428 | Metrics TSDB (Prom remote_write in, MetricsQL out) | +| VictoriaLogs | 9428 | Logs DB (OTLP in, LogsQL out) | + +## Run + +```bash +docker compose up -d +``` + +Grafana: (no login required, anonymous admin). + +Both datasources (`VictoriaMetrics`, `VictoriaLogs`) are auto-provisioned. + +## Point your Go app at it + +In the OTEL exporter, use endpoint `localhost:4317` (gRPC) or `localhost:4318` (HTTP). Both metrics and logs go to the same collector — it fans them out to VM/VL. + +## Tear down + +```bash +docker compose down # keep data +docker compose down -v # wipe volumes +``` + +## Quick sanity checks + +```bash +# Metrics ingest +curl http://localhost:8428/api/v1/query?query=up + +# Logs ingest +curl 'http://localhost:9428/select/logsql/query?query=*&limit=10' +``` diff --git a/wasp/compose-victoria-metrics/docker-compose.yml b/wasp/compose-victoria-metrics/docker-compose.yml new file mode 100644 index 000000000..1d3dc1a8c --- /dev/null +++ b/wasp/compose-victoria-metrics/docker-compose.yml @@ -0,0 +1,66 @@ +services: + victoriametrics: + image: victoriametrics/victoria-metrics:v1.106.1 + container_name: victoriametrics + ports: + - "8428:8428" + command: + - "--storageDataPath=/storage" + - "--retentionPeriod=7d" + - "--httpListenAddr=:8428" + volumes: + - vm-data:/storage + restart: unless-stopped + + victorialogs: + image: victoriametrics/victoria-logs:v0.40.0-victorialogs + container_name: victorialogs + ports: + - "9428:9428" + command: + - "--storageDataPath=/vlogs" + - "--httpListenAddr=:9428" + - "--retentionPeriod=7d" + volumes: + - vl-data:/vlogs + restart: unless-stopped + + otel-collector: + image: otel/opentelemetry-collector-contrib:0.115.1 + container_name: otel-collector + command: ["--config=/etc/otel-collector-config.yaml"] + volumes: + - ./otel/otel-collector-config.yaml:/etc/otel-collector-config.yaml:ro + ports: + - "4317:4317" # OTLP gRPC + - "4318:4318" # OTLP HTTP + depends_on: + - victoriametrics + - victorialogs + restart: unless-stopped + + grafana: + image: grafana/grafana:11.3.1 + container_name: grafana + ports: + - "3000:3000" + environment: + - GF_SECURITY_ADMIN_USER=admin + - GF_SECURITY_ADMIN_PASSWORD=admin + - GF_AUTH_ANONYMOUS_ENABLED=true + - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin + - GF_INSTALL_PLUGINS=victoriametrics-logs-datasource + - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=victoriametrics-logs-datasource + volumes: + - ./grafana/provisioning:/etc/grafana/provisioning:ro + - ../dashboard-victoria-metrics:/etc/dashboards:ro + - grafana-data:/var/lib/grafana + depends_on: + - victoriametrics + - victorialogs + restart: unless-stopped + +volumes: + vm-data: + vl-data: + grafana-data: diff --git a/wasp/compose-victoria-metrics/grafana/provisioning/dashboards/dashboards.yaml b/wasp/compose-victoria-metrics/grafana/provisioning/dashboards/dashboards.yaml new file mode 100644 index 000000000..216d49b43 --- /dev/null +++ b/wasp/compose-victoria-metrics/grafana/provisioning/dashboards/dashboards.yaml @@ -0,0 +1,10 @@ +apiVersion: 1 + +providers: + - name: default + folder: '' + type: file + disableDeletion: false + editable: true + options: + path: /etc/dashboards diff --git a/wasp/compose-victoria-metrics/grafana/provisioning/datasources/datasources.yaml b/wasp/compose-victoria-metrics/grafana/provisioning/datasources/datasources.yaml new file mode 100644 index 000000000..2368c2417 --- /dev/null +++ b/wasp/compose-victoria-metrics/grafana/provisioning/datasources/datasources.yaml @@ -0,0 +1,20 @@ +apiVersion: 1 + +datasources: + - name: VictoriaMetrics + uid: victoriametrics + type: prometheus + access: proxy + url: http://victoriametrics:8428 + isDefault: true + editable: true + jsonData: + httpMethod: POST + timeInterval: "15s" + + - name: VictoriaLogs + uid: victorialogs + type: victoriametrics-logs-datasource + access: proxy + url: http://victorialogs:9428 + editable: true diff --git a/wasp/compose-victoria-metrics/otel/otel-collector-config.yaml b/wasp/compose-victoria-metrics/otel/otel-collector-config.yaml new file mode 100644 index 000000000..369654249 --- /dev/null +++ b/wasp/compose-victoria-metrics/otel/otel-collector-config.yaml @@ -0,0 +1,40 @@ +receivers: + otlp: + protocols: + grpc: + endpoint: 0.0.0.0:4317 + http: + endpoint: 0.0.0.0:4318 + +processors: + batch: + timeout: 5s + send_batch_size: 1024 + +exporters: + # VictoriaMetrics accepts Prometheus remote_write + prometheusremotewrite: + endpoint: http://victoriametrics:8428/api/v1/write + tls: + insecure: true + + # VictoriaLogs accepts OTLP logs natively + otlphttp/logs: + endpoint: http://victorialogs:9428/insert/opentelemetry + tls: + insecure: true + + debug: + verbosity: basic + +service: + pipelines: + metrics: + receivers: [otlp] + processors: [batch] + exporters: [prometheusremotewrite, debug] + + logs: + receivers: [otlp] + processors: [batch] + exporters: [otlphttp/logs, debug] diff --git a/wasp/compose/conf/provisioning/dashboards/sample.yaml b/wasp/compose/conf/provisioning/dashboards/sample.yaml index efecea203..e23151474 100644 --- a/wasp/compose/conf/provisioning/dashboards/sample.yaml +++ b/wasp/compose/conf/provisioning/dashboards/sample.yaml @@ -8,3 +8,11 @@ providers: type: file options: path: /etc/grafana/provisioning/dashboards + - name: 'wasp' + orgId: 1 + folder: 'WASP' + type: file + disableDeletion: false + editable: true + options: + path: /etc/wasp-dashboards diff --git a/wasp/compose/conf/provisioning/datasources/loki.yaml b/wasp/compose/conf/provisioning/datasources/loki.yaml index 3d4efb9aa..fc589b457 100644 --- a/wasp/compose/conf/provisioning/datasources/loki.yaml +++ b/wasp/compose/conf/provisioning/datasources/loki.yaml @@ -2,6 +2,7 @@ apiVersion: 1 datasources: - name: Loki + uid: loki type: loki isDefault: true access: proxy diff --git a/wasp/compose/docker-compose.yaml b/wasp/compose/docker-compose.yaml index 930bb3f82..67116c64b 100644 --- a/wasp/compose/docker-compose.yaml +++ b/wasp/compose/docker-compose.yaml @@ -18,6 +18,7 @@ services: - grafana_plugins:/var/lib/grafana/plugins - ./conf/grafana.ini:/etc/grafana/grafana.ini - ./conf/provisioning:/etc/grafana/provisioning + - ../dashboard/dashboard.json:/etc/wasp-dashboards/wasp.json:ro ports: - "3000:3000" diff --git a/wasp/dashboard-victoria-metrics/dashboard.json b/wasp/dashboard-victoria-metrics/dashboard.json new file mode 100644 index 000000000..5e81c5e4c --- /dev/null +++ b/wasp/dashboard-victoria-metrics/dashboard.json @@ -0,0 +1,377 @@ +{ + "annotations": {"list": []}, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "id": null, + "links": [], + "liveNow": false, + "panels": [ + { + "collapsed": false, + "gridPos": {"h": 1, "w": 24, "x": 0, "y": 0}, + "id": 100, + "title": "WASP Load Stats", + "type": "row", + "panels": [] + }, + { + "id": 1, + "type": "stat", + "title": "RPS (Now)", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "gridPos": {"h": 4, "w": 4, "x": 0, "y": 1}, + "options": { + "reduceOptions": {"calcs": ["lastNotNull"], "fields": "", "values": false}, + "orientation": "horizontal", + "textMode": "value_and_name", + "colorMode": "value" + }, + "targets": [ + { + "refId": "A", + "queryType": "stats", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(current_rps) value", + "legendFormat": "{{go_test_name}} {{gen_name}} RPS" + } + ] + }, + { + "id": 2, + "type": "stat", + "title": "VUs (Now)", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "gridPos": {"h": 4, "w": 4, "x": 4, "y": 1}, + "options": { + "reduceOptions": {"calcs": ["lastNotNull"], "fields": "", "values": false}, + "orientation": "horizontal", + "textMode": "value_and_name" + }, + "targets": [ + { + "refId": "A", + "queryType": "stats", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(current_instances) value", + "legendFormat": "{{go_test_name}} {{gen_name}} VUs" + } + ] + }, + { + "id": 3, + "type": "stat", + "title": "Responses (Total)", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "gridPos": {"h": 4, "w": 4, "x": 8, "y": 1}, + "options": { + "reduceOptions": {"calcs": ["lastNotNull"], "fields": "", "values": false}, + "orientation": "horizontal", + "textMode": "value_and_name" + }, + "targets": [ + { + "refId": "A", + "queryType": "stats", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:responses | stats by (go_test_name, gen_name) count() value", + "legendFormat": "{{go_test_name}} {{gen_name}} Responses" + } + ] + }, + { + "id": 4, + "type": "stat", + "title": "Successful requests (Total)", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "gridPos": {"h": 4, "w": 4, "x": 12, "y": 1}, + "options": { + "reduceOptions": {"calcs": ["lastNotNull"], "fields": "", "values": false}, + "orientation": "horizontal", + "textMode": "value_and_name" + }, + "targets": [ + { + "refId": "A", + "queryType": "stats", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(success) value", + "legendFormat": "{{go_test_name}} {{gen_name}} Success" + } + ] + }, + { + "id": 5, + "type": "stat", + "title": "Errored requests (Total)", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "gridPos": {"h": 4, "w": 4, "x": 16, "y": 1}, + "options": { + "reduceOptions": {"calcs": ["lastNotNull"], "fields": "", "values": false}, + "orientation": "horizontal", + "textMode": "value_and_name", + "colorMode": "value" + }, + "fieldConfig": { + "defaults": {"color": {"mode": "thresholds"}, "thresholds": {"mode": "absolute", "steps": [{"color": "green", "value": null}, {"color": "red", "value": 1}]}} + }, + "targets": [ + { + "refId": "A", + "queryType": "stats", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(failed) value", + "legendFormat": "{{go_test_name}} {{gen_name}} Failed" + } + ] + }, + { + "id": 6, + "type": "stat", + "title": "Timed out requests (Total)", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "gridPos": {"h": 4, "w": 4, "x": 20, "y": 1}, + "options": { + "reduceOptions": {"calcs": ["lastNotNull"], "fields": "", "values": false}, + "orientation": "horizontal", + "textMode": "value_and_name", + "colorMode": "value" + }, + "fieldConfig": { + "defaults": {"color": {"mode": "thresholds"}, "thresholds": {"mode": "absolute", "steps": [{"color": "green", "value": null}, {"color": "red", "value": 1}]}} + }, + "targets": [ + { + "refId": "A", + "queryType": "stats", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(callTimeout) value", + "legendFormat": "{{go_test_name}} {{gen_name}} Timeouts" + } + ] + }, + { + "id": 10, + "type": "timeseries", + "title": "RPS / VUs per schedule segment", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "gridPos": {"h": 8, "w": 12, "x": 0, "y": 5}, + "fieldConfig": {"defaults": {"custom": {"lineInterpolation": "stepBefore", "fillOpacity": 10}}}, + "options": {"legend": {"displayMode": "list", "placement": "bottom"}}, + "targets": [ + { + "refId": "RPS", + "queryType": "statsRange", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(current_rps) value", + "legendFormat": "{{go_test_name}} {{gen_name}} RPS" + }, + { + "refId": "VUS", + "queryType": "statsRange", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(current_instances) value", + "legendFormat": "{{go_test_name}} {{gen_name}} VUs" + } + ] + }, + { + "id": 11, + "type": "timeseries", + "title": "Latency quantiles (99, 95, 50)", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "gridPos": {"h": 8, "w": 12, "x": 12, "y": 5}, + "fieldConfig": {"defaults": {"unit": "ns"}}, + "options": {"legend": {"displayMode": "list", "placement": "bottom"}}, + "targets": [ + { + "refId": "Q99", + "queryType": "statsRange", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name) quantile(0.99, duration) value", + "legendFormat": "{{go_test_name}} {{gen_name}} Q99" + }, + { + "refId": "Q95", + "queryType": "statsRange", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name) quantile(0.95, duration) value", + "legendFormat": "{{go_test_name}} {{gen_name}} Q95" + }, + { + "refId": "Q50", + "queryType": "statsRange", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name) quantile(0.5, duration) value", + "legendFormat": "{{go_test_name}} {{gen_name}} Q50" + } + ] + }, + { + "id": 12, + "type": "timeseries", + "title": "Response latencies by call_group (latest per interval)", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "gridPos": {"h": 8, "w": 24, "x": 0, "y": 13}, + "fieldConfig": {"defaults": {"unit": "ns"}}, + "options": {"legend": {"displayMode": "list", "placement": "bottom"}}, + "targets": [ + { + "refId": "A", + "queryType": "statsRange", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name, call_group) max(duration) value", + "legendFormat": "{{go_test_name}} {{gen_name}} {{call_group}}" + } + ] + }, + { + "collapsed": false, + "gridPos": {"h": 1, "w": 24, "x": 0, "y": 21}, + "id": 200, + "title": "WASP Debug", + "type": "row", + "panels": [] + }, + { + "id": 20, + "type": "timeseries", + "title": "CallResult sampling (recorded vs skipped)", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "gridPos": {"h": 8, "w": 12, "x": 0, "y": 22}, + "options": {"legend": {"displayMode": "list", "placement": "bottom"}}, + "targets": [ + { + "refId": "REC", + "queryType": "statsRange", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(samples_recorded) value", + "legendFormat": "{{go_test_name}} {{gen_name}} recorded" + }, + { + "refId": "SKIP", + "queryType": "statsRange", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(samples_skipped) value", + "legendFormat": "{{go_test_name}} {{gen_name}} skipped" + } + ] + }, + { + "id": 21, + "type": "timeseries", + "title": "Logs ingest rate (records/interval)", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "gridPos": {"h": 8, "w": 12, "x": 12, "y": 22}, + "options": {"legend": {"displayMode": "list", "placement": "bottom"}}, + "targets": [ + { + "refId": "A", + "queryType": "hits", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\"", + "legendFormat": "{{go_test_name}} {{gen_name}}" + } + ] + }, + { + "id": 30, + "type": "logs", + "title": "Stats logs", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "gridPos": {"h": 8, "w": 24, "x": 0, "y": 30}, + "options": {"showTime": true, "wrapLogMessage": true, "sortOrder": "Descending"}, + "targets": [ + { + "refId": "A", + "queryType": "logs", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats" + } + ] + }, + { + "id": 31, + "type": "logs", + "title": "Failed responses", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "gridPos": {"h": 8, "w": 12, "x": 0, "y": 38}, + "options": {"showTime": true, "wrapLogMessage": true, "sortOrder": "Descending"}, + "targets": [ + { + "refId": "A", + "queryType": "logs", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:responses AND _msg:\"\\\"failed\\\":true\"" + } + ] + }, + { + "id": 32, + "type": "logs", + "title": "Timed out responses", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "gridPos": {"h": 8, "w": 12, "x": 12, "y": 38}, + "options": {"showTime": true, "wrapLogMessage": true, "sortOrder": "Descending"}, + "targets": [ + { + "refId": "A", + "queryType": "logs", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:responses AND _msg:\"\\\"timeout\\\":true\"" + } + ] + } + ], + "refresh": "5s", + "schemaVersion": 39, + "tags": ["generated", "load-test", "wasp", "victorialogs"], + "templating": { + "list": [ + { + "name": "go_test_name", + "label": "Go test name", + "type": "query", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "query": {"editorMode": "builder", "type": "fieldValue", "field": "go_test_name"}, + "refresh": 2, + "multi": true, + "includeAll": true, + "sort": 1 + }, + { + "name": "gen_name", + "label": "Generator name", + "type": "query", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "query": {"editorMode": "builder", "type": "fieldValue", "field": "gen_name"}, + "refresh": 2, + "multi": true, + "includeAll": true, + "sort": 1 + }, + { + "name": "call_group", + "label": "Call group", + "type": "query", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "query": {"editorMode": "builder", "type": "fieldValue", "field": "call_group"}, + "refresh": 2, + "multi": true, + "includeAll": true, + "sort": 1 + }, + { + "name": "branch", + "label": "Branch", + "type": "query", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "query": {"editorMode": "builder", "type": "fieldValue", "field": "branch"}, + "refresh": 2, + "multi": true, + "includeAll": true, + "sort": 1 + }, + { + "name": "commit", + "label": "Commit", + "type": "query", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "query": {"editorMode": "builder", "type": "fieldValue", "field": "commit"}, + "refresh": 2, + "multi": true, + "includeAll": true, + "sort": 1 + } + ] + }, + "time": {"from": "now-30m", "to": "now"}, + "timepicker": {}, + "timezone": "browser", + "title": "WASP (VictoriaLogs)", + "uid": "wasp-victorialogs", + "version": 1, + "weekStart": "" +} diff --git a/wasp/dashboard/cmd/main.go b/wasp/dashboard/cmd/main.go deleted file mode 100644 index 842844c37..000000000 --- a/wasp/dashboard/cmd/main.go +++ /dev/null @@ -1,25 +0,0 @@ -package main - -import ( - "github.com/smartcontractkit/chainlink-testing-framework/wasp/dashboard" -) - -// main creates and deploys a default dashboard using environment variables for configuration. -// It sets up the dashboard without extensions or non-functional requirements, enabling straightforward deployment. -func main() { - // just default dashboard, no NFRs, no dashboard extensions - // see examples/alerts.go for an example extension - d, err := dashboard.NewDashboard(nil, nil) - if err != nil { - panic(err) - } - // set env vars - //export GRAFANA_URL=... - //export GRAFANA_TOKEN=... - //export DATA_SOURCE_NAME=Loki - //export DASHBOARD_FOLDER=LoadTests - //export DASHBOARD_NAME=Wasp - if _, err := d.Deploy(); err != nil { - panic(err) - } -} diff --git a/wasp/dashboard/dashboard.go b/wasp/dashboard/dashboard.go deleted file mode 100644 index 4bbc8407b..000000000 --- a/wasp/dashboard/dashboard.go +++ /dev/null @@ -1,485 +0,0 @@ -package dashboard - -import ( - "fmt" - "net/http" - "os" - - "context" - - "github.com/K-Phoen/grabana" - "github.com/K-Phoen/grabana/alert" - "github.com/K-Phoen/grabana/dashboard" - "github.com/K-Phoen/grabana/logs" - "github.com/K-Phoen/grabana/row" - "github.com/K-Phoen/grabana/stat" - "github.com/K-Phoen/grabana/target/prometheus" - "github.com/K-Phoen/grabana/timeseries" - "github.com/K-Phoen/grabana/timeseries/axis" - "github.com/K-Phoen/grabana/variable/query" -) - -const ( - DefaultStatTextSize = 12 - DefaultStatValueSize = 20 - DefaultAlertEvaluateEvery = "10s" - DefaultAlertFor = "10s" - DefaultDashboardUUID = "Wasp" - - DefaultRequirementLabelKey = "requirement_name" -) - -const ( - AlertTypeQuantile99 = "quantile_99" - AlertTypeErrors = "errors" - AlertTypeTimeouts = "timeouts" -) - -type WaspAlert struct { - Name string - AlertType string - TestName string - GenName string - RequirementGroupName string - AlertIf alert.ConditionEvaluator - CustomAlert timeseries.Option -} - -// Dashboard is a Wasp dashboard -type Dashboard struct { - Name string - DataSourceName string - Folder string - GrafanaURL string - GrafanaToken string - extendedOpts []dashboard.Option - builder dashboard.Builder -} - -// NewDashboard initializes a Dashboard with provided alerts and options, using environment variables for configuration. It prepares the dashboard for deployment and returns the instance or an error if setup fails. -func NewDashboard(reqs []WaspAlert, opts []dashboard.Option) (*Dashboard, error) { - name := os.Getenv("DASHBOARD_NAME") - if name == "" { - return nil, fmt.Errorf("DASHBOARD_NAME must be provided") - } - dsn := os.Getenv("DATA_SOURCE_NAME") - if dsn == "" { - return nil, fmt.Errorf("DATA_SOURCE_NAME must be provided") - } - dbf := os.Getenv("DASHBOARD_FOLDER") - if dbf == "" { - return nil, fmt.Errorf("DASHBOARD_FOLDER must be provided") - } - grafanaURL := os.Getenv("GRAFANA_URL") - if grafanaURL == "" { - return nil, fmt.Errorf("GRAFANA_URL must be provided") - } - grafanaToken := os.Getenv("GRAFANA_TOKEN") - if grafanaToken == "" { - return nil, fmt.Errorf("GRAFANA_TOKEN must be provided") - } - dash := &Dashboard{ - Name: name, - DataSourceName: dsn, - Folder: dbf, - GrafanaURL: grafanaURL, - GrafanaToken: grafanaToken, - extendedOpts: opts, - } - err := dash.Build(name, dsn, reqs) - if err != nil { - return nil, fmt.Errorf("failed to build dashboard: %s", err) - } - return dash, nil -} - -// Deploy uploads the Dashboard to Grafana, creating the folder if necessary. -// It returns the deployed grabana.Dashboard and any encountered error. -func (m *Dashboard) Deploy() (*grabana.Dashboard, error) { - ctx := context.Background() - client := grabana.NewClient(&http.Client{}, m.GrafanaURL, grabana.WithAPIToken(m.GrafanaToken)) - fo, err := client.FindOrCreateFolder(ctx, m.Folder) - if err != nil { - fmt.Printf("Could not find or create folder: %s\n", err) - os.Exit(1) - } - return client.UpsertDashboard(ctx, fo, m.builder) -} - -// defaultStatWidget creates a standard dashboard stat widget using the specified name, datasource, Prometheus target, and legend. -// It is used to display consistent metrics within dashboard rows. -func defaultStatWidget(name, datasourceName, target, legend string) row.Option { - return row.WithStat( - name, - stat.Transparent(), - stat.DataSource(datasourceName), - stat.Text(stat.TextValueAndName), - stat.Orientation(stat.OrientationHorizontal), - stat.TitleFontSize(DefaultStatTextSize), - stat.ValueFontSize(DefaultStatValueSize), - stat.Span(2), - stat.WithPrometheusTarget(target, prometheus.Legend(legend)), - ) -} - -// defaultLastValueAlertWidget generates a timeseries.Option for alerting using a WaspAlert. -// It returns the custom alert if provided, otherwise configures a default last-value alert for consistent monitoring in dashboards. -func defaultLastValueAlertWidget(a WaspAlert) timeseries.Option { - if a.CustomAlert != nil { - return a.CustomAlert - } - return timeseries.Alert( - a.Name, - alert.For(DefaultAlertFor), - alert.OnExecutionError(alert.ErrorKO), - alert.Description(a.Name), - alert.Tags(map[string]string{ - "service": "wasp", - DefaultRequirementLabelKey: a.RequirementGroupName, - }), - alert.WithLokiQuery( - a.Name, - InlineLokiAlertParams(a.AlertType, a.TestName, a.GenName), - ), - alert.If(alert.Last, a.Name, a.AlertIf), - alert.EvaluateEvery(DefaultAlertEvaluateEvery), - ) -} - -// defaultLabelValuesVar generates a dashboard variable for the specified name and datasource. -// It enables multiple selections, includes an "All" option, and sorts label values in ascending numerical order. -// Use it to create consistent query variables for dashboard filtering. -func defaultLabelValuesVar(name, datasourceName string) dashboard.Option { - return dashboard.VariableAsQuery( - name, - query.DataSource(datasourceName), - query.Multiple(), - query.IncludeAll(), - query.Request(fmt.Sprintf("label_values(%s)", name)), - query.Sort(query.NumericalAsc), - ) -} - -// timeSeriesWithAlerts creates dashboard options for each WaspAlert, configuring time series panels with alert settings. -// Use it to add alert-specific rows to a dashboard based on provided alert definitions. -func timeSeriesWithAlerts(datasourceName string, alertDefs []WaspAlert) []dashboard.Option { - dashboardOpts := make([]dashboard.Option, 0) - for _, a := range alertDefs { - // for wasp metrics we also create additional row per alert - tsOpts := []timeseries.Option{ - timeseries.Transparent(), - timeseries.Span(12), - timeseries.Height("200px"), - timeseries.DataSource(datasourceName), - timeseries.Legend(timeseries.Bottom), - } - tsOpts = append(tsOpts, defaultLastValueAlertWidget(a)) - - var rowTitle string - // for wasp metrics we also create additional row per alert - if a.CustomAlert == nil { - rowTitle = fmt.Sprintf("Alert: %s, Requirement: %s", a.Name, a.RequirementGroupName) - tsOpts = append(tsOpts, timeseries.WithPrometheusTarget(InlineLokiAlertParams(a.AlertType, a.TestName, a.GenName))) - } else { - rowTitle = fmt.Sprintf("External alert: %s, Requirement: %s", a.Name, a.RequirementGroupName) - } - // all the other custom alerts may burden the dashboard, - dashboardOpts = append(dashboardOpts, - dashboard.Row( - rowTitle, - row.Collapse(), - row.HideTitle(), - row.WithTimeSeries(a.Name, tsOpts...), - )) - } - return dashboardOpts -} - -// AddVariables generates standard dashboard options for common label variables using the provided datasourceName. -// It includes variables like go_test_name, gen_name, branch, commit, and call_group. -// Use this to easily incorporate these variables into your dashboard configuration. -func AddVariables(datasourceName string) []dashboard.Option { - opts := []dashboard.Option{ - defaultLabelValuesVar("go_test_name", datasourceName), - defaultLabelValuesVar("gen_name", datasourceName), - defaultLabelValuesVar("branch", datasourceName), - defaultLabelValuesVar("commit", datasourceName), - defaultLabelValuesVar("call_group", datasourceName), - } - return opts -} - -// dashboard generates dashboard configuration options based on the specified datasource and alert requirements. -// It is used to set up panels and settings when building a new dashboard. -func (m *Dashboard) dashboard(datasourceName string, requirements []WaspAlert) []dashboard.Option { - panelQuery := map[string]string{ - "branch": `=~"${branch:pipe}"`, - "commit": `=~"${commit:pipe}"`, - } - - defaultOpts := []dashboard.Option{ - dashboard.UID(m.Name), - dashboard.AutoRefresh("5"), - dashboard.Time("now-30m", "now"), - dashboard.Tags([]string{"generated", "load-test"}), - } - defaultOpts = append(defaultOpts, AddVariables(datasourceName)...) - defaultOpts = append(defaultOpts, WASPLoadStatsRow(datasourceName, panelQuery)) - defaultOpts = append(defaultOpts, WASPDebugDataRow(datasourceName, panelQuery, false)) - defaultOpts = append(defaultOpts, timeSeriesWithAlerts(datasourceName, requirements)...) - defaultOpts = append(defaultOpts, m.extendedOpts...) - return defaultOpts -} - -// Build initializes the Dashboard with the specified name, data source, and alert requirements. -// It prepares the dashboard builder for further configuration and usage. -func (m *Dashboard) Build(dashboardName, datasourceName string, requirements []WaspAlert) error { - b, err := dashboard.New( - dashboardName, - m.dashboard(datasourceName, requirements)..., - ) - if err != nil { - return fmt.Errorf("failed to create a dashboard builder: %s", err) - } - m.builder = b - return nil -} - -// JSON serializes the Dashboard into indented JSON format. -// It provides a human-readable representation, useful for exporting or inspecting the dashboard. -func (m *Dashboard) JSON() ([]byte, error) { - return m.builder.MarshalIndentJSON() -} - -// InlineLokiAlertParams generates a Loki query string based on the alert type, test name, and generator name. -// It is used to configure specific alert conditions for monitoring test metrics in dashboards. -func InlineLokiAlertParams(queryType, testName, genName string) string { - switch queryType { - case AlertTypeQuantile99: - return fmt.Sprintf(` -avg(quantile_over_time(0.99, {go_test_name="%s", test_data_type=~"responses", gen_name="%s"} -| json -| unwrap duration [10s]) / 1e6)`, testName, genName) - case AlertTypeErrors: - return fmt.Sprintf(` -max_over_time({go_test_name="%s", test_data_type=~"stats", gen_name="%s"} -| json -| unwrap failed [10s]) by (go_test_name, gen_name)`, testName, genName) - case AlertTypeTimeouts: - return fmt.Sprintf(` -max_over_time({go_test_name="%s", test_data_type=~"stats", gen_name="%s"} -| json -| unwrap callTimeout [10s]) by (go_test_name, gen_name)`, testName, genName) - default: - return "" - } -} - -// WASPLoadStatsRow creates a "WASP Load Stats" dashboard row with widgets displaying real-time and total load metrics. -// It utilizes the provided data source and query parameters to configure the relevant statistics for monitoring. -func WASPLoadStatsRow(dataSource string, query map[string]string) dashboard.Option { - queryString := "" - for key, value := range query { - queryString += key + value + ", " - } - - return dashboard.Row( - "WASP Load Stats", - defaultStatWidget( - "RPS (Now)", - dataSource, - `sum(last_over_time({`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} - | json - | unwrap current_rps [1s]) by (node_id, go_test_name, gen_name)) by (__stream_shard__)`, - `{{go_test_name}} {{gen_name}} RPS`, - ), - defaultStatWidget( - "VUs (Now)", - dataSource, - `sum(max_over_time({`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} - | json - | unwrap current_instances [$__range]) by (node_id, go_test_name, gen_name)) by (__stream_shard__)`, - `{{go_test_name}} {{gen_name}} VUs`, - ), - defaultStatWidget( - "Responses/sec (Now)", - dataSource, - `sum(count_over_time({`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}"} [1s])) by (node_id, go_test_name, gen_name)`, - `{{go_test_name}} {{gen_name}} Responses/sec`, - ), - defaultStatWidget( - "Successful requests (Total)", - dataSource, - ` - sum(max_over_time({`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} - | json - | unwrap success [$__range]) by (node_id, go_test_name, gen_name)) by (__stream_shard__) - `, - `{{go_test_name}} {{gen_name}} Successful requests`, - ), - defaultStatWidget( - "Errored requests (Total)", - dataSource, - ` - sum(max_over_time({`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} - | json - | unwrap failed [$__range]) by (node_id, go_test_name, gen_name)) by (__stream_shard__) - `, - `{{go_test_name}} {{gen_name}} Errored requests`, - ), - defaultStatWidget( - "Timed out requests (Total)", - dataSource, - ` - sum(max_over_time({`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} - | json - | unwrap callTimeout [$__range]) by (node_id, go_test_name, gen_name)) by (__stream_shard__) - `, - `{{go_test_name}} {{gen_name}} Timed out requests`, - ), - RPSVUPerScheduleSegmentsPanel(dataSource, query), - RPSPanel(dataSource, query), - row.WithTimeSeries( - "Latency quantiles over groups (99, 95, 50)", - timeseries.Legend(timeseries.Hide), - timeseries.Transparent(), - timeseries.Span(6), - timeseries.Height("300px"), - timeseries.DataSource(dataSource), - timeseries.Legend(timeseries.Bottom), - timeseries.Axis( - axis.Unit("ms"), - axis.Label("ms"), - ), - timeseries.WithPrometheusTarget(` - quantile_over_time(0.99, {`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}"} - | json - | unwrap duration [$__interval]) by (go_test_name, gen_name) / 1e6`, - prometheus.Legend("{{go_test_name}} {{gen_name}} Q 99 - {{error}}"), - ), - timeseries.WithPrometheusTarget(` - quantile_over_time(0.95, {`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}"} - | json - | unwrap duration [$__interval]) by (go_test_name, gen_name) / 1e6`, - prometheus.Legend("{{go_test_name}} {{gen_name}} Q 95 - {{error}}"), - ), - timeseries.WithPrometheusTarget( - ` - quantile_over_time(0.50, {`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}"} - | json - | unwrap duration [$__interval]) by (go_test_name, gen_name) / 1e6`, - prometheus.Legend("{{go_test_name}} {{gen_name}} Q 50 - {{error}}"), - ), - ), - row.WithTimeSeries( - "Responses latencies by types over time (Generator, CallGroup)", - timeseries.Legend(timeseries.Hide), - timeseries.Transparent(), - timeseries.Span(6), - timeseries.Height("300px"), - timeseries.DataSource(dataSource), - timeseries.Axis( - axis.Unit("ms"), - axis.Label("ms"), - ), - timeseries.Legend(timeseries.Bottom), - timeseries.WithPrometheusTarget(` - last_over_time({`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}", call_group=~"${call_group}"} - | json - | unwrap duration [$__interval]) / 1e6`, - prometheus.Legend("{{go_test_name}} {{gen_name}} {{call_group}} T: {{timeout}} E: {{error}}"), - ), - timeseries.WithPrometheusTarget(` - last_over_time({`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}"} - | json - | unwrap duration [$__interval]) / 1e6`, - prometheus.Legend("{{go_test_name}} {{gen_name}} all groups T: {{timeout}} E: {{error}}"), - ), - ), - ) -} - -// WASPDebugDataRow returns a dashboard.Option containing a row with WASP debug metrics and logs. -// It uses the provided data source and query parameters. -// Use this function to include detailed debug information in your dashboard. -func WASPDebugDataRow(dataSource string, query map[string]string, collapse bool) dashboard.Option { - queryString := "" - for key, value := range query { - queryString += key + value + ", " - } - - defaultRowOpts := []row.Option{} - if collapse { - defaultRowOpts = append(defaultRowOpts, row.Collapse()) - } - - return dashboard.Row( - "WASP Debug", - append(defaultRowOpts, - row.WithStat( - "Latest segment stats", - stat.Transparent(), - stat.DataSource(dataSource), - stat.Text(stat.TextValueAndName), - stat.SparkLine(), - stat.Span(12), - stat.Height("100px"), - stat.ColorValue(), - stat.WithPrometheusTarget(` - sum(bytes_over_time({`+queryString+`go_test_name=~"${go_test_name:pipe}", gen_name=~"${gen_name:pipe}"} [$__range]) * 1e-6) - `, prometheus.Legend("Overall logs size"), - ), - stat.WithPrometheusTarget(` - sum(bytes_rate({`+queryString+`go_test_name=~"${go_test_name:pipe}", gen_name=~"${gen_name:pipe}"} [$__interval]) * 1e-6) - `, prometheus.Legend("Logs size per second"), - ), - ), - row.WithTimeSeries( - "CallResult sampling (successful results)", - timeseries.Transparent(), - timeseries.Span(12), - timeseries.Height("200px"), - timeseries.DataSource(dataSource), - timeseries.Axis( - axis.Label("CallResults"), - ), - timeseries.WithPrometheusTarget(` - sum(last_over_time({`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} - | json - | unwrap samples_recorded [$__interval])) by (go_test_name, gen_name) - `, prometheus.Legend("{{go_test_name}} {{gen_name}} recorded"), - ), - timeseries.WithPrometheusTarget(` - sum(last_over_time({`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} - | json - | unwrap samples_skipped [$__interval])) by (go_test_name, gen_name) - `, prometheus.Legend("{{go_test_name}} {{gen_name}} skipped"), - ), - ), - row.WithLogs( - "Stats logs", - logs.DataSource(dataSource), - logs.Span(12), - logs.Height("300px"), - logs.Transparent(), - logs.WithLokiTarget(`{`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"}`), - ), - row.WithLogs( - "Failed responses", - logs.DataSource(dataSource), - logs.Span(6), - logs.Height("300px"), - logs.Transparent(), - logs.WithLokiTarget(`{`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}"} |~ "failed\":true"`), - ), - row.WithLogs( - "Timed out responses", - logs.DataSource(dataSource), - logs.Span(6), - logs.Height("300px"), - logs.Transparent(), - logs.WithLokiTarget(`{`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}"} |~ "timeout\":true"`), - ), - )..., - ) -} diff --git a/wasp/dashboard/dashboard.json b/wasp/dashboard/dashboard.json new file mode 100644 index 000000000..27ba94bd5 --- /dev/null +++ b/wasp/dashboard/dashboard.json @@ -0,0 +1,428 @@ +{ + "annotations": {"list": []}, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "id": null, + "links": [], + "liveNow": false, + "panels": [ + { + "collapsed": false, + "gridPos": {"h": 1, "w": 24, "x": 0, "y": 0}, + "id": 100, + "title": "WASP Load Stats", + "type": "row", + "panels": [] + }, + { + "id": 1, + "type": "stat", + "title": "RPS (Now)", + "datasource": {"type": "loki", "uid": "loki"}, + "gridPos": {"h": 4, "w": 4, "x": 0, "y": 1}, + "options": { + "reduceOptions": {"calcs": ["lastNotNull"], "fields": "", "values": false}, + "orientation": "horizontal", + "textMode": "value_and_name", + "colorMode": "value" + }, + "targets": [ + { + "refId": "A", + "queryType": "range", + "expr": "sum(last_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"stats\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap current_rps [10s]) by (node_id, go_test_name, gen_name)) by (__stream_shard__)", + "legendFormat": "{{go_test_name}} {{gen_name}} RPS" + } + ] + }, + { + "id": 2, + "type": "stat", + "title": "VUs (Now)", + "datasource": {"type": "loki", "uid": "loki"}, + "gridPos": {"h": 4, "w": 4, "x": 4, "y": 1}, + "options": { + "reduceOptions": {"calcs": ["lastNotNull"], "fields": "", "values": false}, + "orientation": "horizontal", + "textMode": "value_and_name" + }, + "targets": [ + { + "refId": "A", + "queryType": "instant", + "expr": "sum(max_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"stats\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap current_instances [$__range]) by (node_id, go_test_name, gen_name)) by (__stream_shard__)", + "legendFormat": "{{go_test_name}} {{gen_name}} VUs" + } + ] + }, + { + "id": 3, + "type": "stat", + "title": "Responses/sec (Now)", + "datasource": {"type": "loki", "uid": "loki"}, + "gridPos": {"h": 4, "w": 4, "x": 8, "y": 1}, + "options": { + "reduceOptions": {"calcs": ["lastNotNull"], "fields": "", "values": false}, + "orientation": "horizontal", + "textMode": "value_and_name" + }, + "targets": [ + { + "refId": "A", + "queryType": "range", + "expr": "sum(count_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\"} [1s])) by (node_id, go_test_name, gen_name)", + "legendFormat": "{{go_test_name}} {{gen_name}} Responses/sec" + } + ] + }, + { + "id": 4, + "type": "stat", + "title": "Successful requests (Total)", + "datasource": {"type": "loki", "uid": "loki"}, + "gridPos": {"h": 4, "w": 4, "x": 12, "y": 1}, + "options": { + "reduceOptions": {"calcs": ["lastNotNull"], "fields": "", "values": false}, + "orientation": "horizontal", + "textMode": "value_and_name" + }, + "targets": [ + { + "refId": "A", + "queryType": "instant", + "expr": "sum(max_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"stats\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap success [$__range]) by (node_id, go_test_name, gen_name)) by (__stream_shard__)", + "legendFormat": "{{go_test_name}} {{gen_name}} Successful requests" + } + ] + }, + { + "id": 5, + "type": "stat", + "title": "Errored requests (Total)", + "datasource": {"type": "loki", "uid": "loki"}, + "gridPos": {"h": 4, "w": 4, "x": 16, "y": 1}, + "options": { + "reduceOptions": {"calcs": ["lastNotNull"], "fields": "", "values": false}, + "orientation": "horizontal", + "textMode": "value_and_name", + "colorMode": "value" + }, + "fieldConfig": { + "defaults": {"color": {"mode": "thresholds"}, "thresholds": {"mode": "absolute", "steps": [{"color": "green", "value": null}, {"color": "red", "value": 1}]}} + }, + "targets": [ + { + "refId": "A", + "queryType": "instant", + "expr": "sum(max_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"stats\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap failed [$__range]) by (node_id, go_test_name, gen_name)) by (__stream_shard__)", + "legendFormat": "{{go_test_name}} {{gen_name}} Errored requests" + } + ] + }, + { + "id": 6, + "type": "stat", + "title": "Timed out requests (Total)", + "datasource": {"type": "loki", "uid": "loki"}, + "gridPos": {"h": 4, "w": 4, "x": 20, "y": 1}, + "options": { + "reduceOptions": {"calcs": ["lastNotNull"], "fields": "", "values": false}, + "orientation": "horizontal", + "textMode": "value_and_name", + "colorMode": "value" + }, + "fieldConfig": { + "defaults": {"color": {"mode": "thresholds"}, "thresholds": {"mode": "absolute", "steps": [{"color": "green", "value": null}, {"color": "red", "value": 1}]}} + }, + "targets": [ + { + "refId": "A", + "queryType": "instant", + "expr": "sum(max_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"stats\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap callTimeout [$__range]) by (node_id, go_test_name, gen_name)) by (__stream_shard__)", + "legendFormat": "{{go_test_name}} {{gen_name}} Timed out requests" + } + ] + }, + { + "id": 10, + "type": "timeseries", + "title": "RPS/VUs per schedule segments", + "datasource": {"type": "loki", "uid": "loki"}, + "gridPos": {"h": 8, "w": 12, "x": 0, "y": 5}, + "options": {"legend": {"displayMode": "list", "placement": "bottom"}}, + "targets": [ + { + "refId": "A", + "queryType": "range", + "expr": "max_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"stats\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap current_rps [$__interval]) by (node_id, go_test_name, gen_name)", + "legendFormat": "{{go_test_name}} {{gen_name}} RPS" + }, + { + "refId": "B", + "queryType": "range", + "expr": "sum(last_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"stats\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap current_rps [$__interval]) by (node_id, go_test_name, gen_name))", + "legendFormat": "{{go_test_name}} Total RPS" + }, + { + "refId": "C", + "queryType": "range", + "expr": "max_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"stats\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap current_instances [$__interval]) by (node_id, go_test_name, gen_name)", + "legendFormat": "{{go_test_name}} {{gen_name}} VUs" + }, + { + "refId": "D", + "queryType": "range", + "expr": "sum(last_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"stats\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap current_instances [$__interval]) by (node_id, go_test_name, gen_name))", + "legendFormat": "{{go_test_name}} Total VUs" + } + ] + }, + { + "id": 11, + "type": "timeseries", + "title": "Responses/sec (Generator, CallGroup)", + "datasource": {"type": "loki", "uid": "loki"}, + "gridPos": {"h": 8, "w": 12, "x": 12, "y": 5}, + "fieldConfig": {"defaults": {"unit": "short"}}, + "options": {"legend": {"displayMode": "list", "placement": "bottom"}}, + "targets": [ + { + "refId": "A", + "queryType": "range", + "expr": "sum(count_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\", call_group=~\"${call_group:pipe}\"} [1s])) by (node_id, go_test_name, gen_name, call_group)", + "legendFormat": "{{go_test_name}} {{gen_name}} {{call_group}} responses/sec" + }, + { + "refId": "B", + "queryType": "range", + "expr": "sum(count_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\"} [1s])) by (node_id, go_test_name, gen_name)", + "legendFormat": "{{go_test_name}} Total responses/sec" + } + ] + }, + { + "id": 12, + "type": "timeseries", + "title": "Latency quantiles over groups (99, 95, 50)", + "datasource": {"type": "loki", "uid": "loki"}, + "gridPos": {"h": 8, "w": 12, "x": 0, "y": 13}, + "fieldConfig": {"defaults": {"unit": "ms"}}, + "options": {"legend": {"displayMode": "list", "placement": "bottom"}}, + "targets": [ + { + "refId": "Q99", + "queryType": "range", + "expr": "quantile_over_time(0.99, {branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap duration [$__interval]) by (go_test_name, gen_name) / 1e6", + "legendFormat": "{{go_test_name}} {{gen_name}} Q 99 - {{error}}" + }, + { + "refId": "Q95", + "queryType": "range", + "expr": "quantile_over_time(0.95, {branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap duration [$__interval]) by (go_test_name, gen_name) / 1e6", + "legendFormat": "{{go_test_name}} {{gen_name}} Q 95 - {{error}}" + }, + { + "refId": "Q50", + "queryType": "range", + "expr": "quantile_over_time(0.50, {branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap duration [$__interval]) by (go_test_name, gen_name) / 1e6", + "legendFormat": "{{go_test_name}} {{gen_name}} Q 50 - {{error}}" + } + ] + }, + { + "id": 13, + "type": "timeseries", + "title": "Responses latencies by types over time (Generator, CallGroup)", + "datasource": {"type": "loki", "uid": "loki"}, + "gridPos": {"h": 8, "w": 12, "x": 12, "y": 13}, + "fieldConfig": {"defaults": {"unit": "ms"}}, + "options": {"legend": {"displayMode": "list", "placement": "bottom"}}, + "targets": [ + { + "refId": "A", + "queryType": "range", + "expr": "last_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\", call_group=~\"${call_group}\"}\n| json\n| unwrap duration [$__interval]) / 1e6", + "legendFormat": "{{go_test_name}} {{gen_name}} {{call_group}} T: {{timeout}} E: {{error}}" + }, + { + "refId": "B", + "queryType": "range", + "expr": "last_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap duration [$__interval]) / 1e6", + "legendFormat": "{{go_test_name}} {{gen_name}} all groups T: {{timeout}} E: {{error}}" + } + ] + }, + { + "collapsed": false, + "gridPos": {"h": 1, "w": 24, "x": 0, "y": 21}, + "id": 200, + "title": "WASP Debug", + "type": "row", + "panels": [] + }, + { + "id": 20, + "type": "stat", + "title": "Latest segment stats", + "datasource": {"type": "loki", "uid": "loki"}, + "gridPos": {"h": 6, "w": 24, "x": 0, "y": 22}, + "options": { + "reduceOptions": {"calcs": ["lastNotNull"], "fields": "", "values": false}, + "graphMode": "area", + "textMode": "value_and_name", + "colorMode": "value" + }, + "targets": [ + { + "refId": "A", + "queryType": "range", + "expr": "sum(bytes_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", gen_name=~\"${gen_name:pipe}\"} [$__range]) * 1e-6)", + "legendFormat": "Overall logs size" + }, + { + "refId": "B", + "queryType": "range", + "expr": "sum(bytes_rate({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", gen_name=~\"${gen_name:pipe}\"} [$__interval]) * 1e-6)", + "legendFormat": "Logs size per second" + } + ] + }, + { + "id": 21, + "type": "timeseries", + "title": "CallResult sampling (successful results)", + "datasource": {"type": "loki", "uid": "loki"}, + "gridPos": {"h": 8, "w": 24, "x": 0, "y": 28}, + "options": {"legend": {"displayMode": "list", "placement": "bottom"}}, + "targets": [ + { + "refId": "REC", + "queryType": "range", + "expr": "sum(last_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"stats\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap samples_recorded [$__interval])) by (go_test_name, gen_name)", + "legendFormat": "{{go_test_name}} {{gen_name}} recorded" + }, + { + "refId": "SKIP", + "queryType": "range", + "expr": "sum(last_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"stats\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap samples_skipped [$__interval])) by (go_test_name, gen_name)", + "legendFormat": "{{go_test_name}} {{gen_name}} skipped" + } + ] + }, + { + "id": 30, + "type": "logs", + "title": "Stats logs", + "datasource": {"type": "loki", "uid": "loki"}, + "gridPos": {"h": 8, "w": 24, "x": 0, "y": 36}, + "options": {"showTime": true, "wrapLogMessage": true, "sortOrder": "Descending"}, + "targets": [ + { + "refId": "A", + "queryType": "range", + "expr": "{branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"stats\", gen_name=~\"${gen_name:pipe}\"}" + } + ] + }, + { + "id": 31, + "type": "logs", + "title": "Failed responses", + "datasource": {"type": "loki", "uid": "loki"}, + "gridPos": {"h": 8, "w": 12, "x": 0, "y": 44}, + "options": {"showTime": true, "wrapLogMessage": true, "sortOrder": "Descending"}, + "targets": [ + { + "refId": "A", + "queryType": "range", + "expr": "{branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\"} |~ \"failed\\\":true\"" + } + ] + }, + { + "id": 32, + "type": "logs", + "title": "Timed out responses", + "datasource": {"type": "loki", "uid": "loki"}, + "gridPos": {"h": 8, "w": 12, "x": 12, "y": 44}, + "options": {"showTime": true, "wrapLogMessage": true, "sortOrder": "Descending"}, + "targets": [ + { + "refId": "A", + "queryType": "range", + "expr": "{branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\"} |~ \"timeout\\\":true\"" + } + ] + } + ], + "refresh": "5s", + "schemaVersion": 39, + "tags": ["generated", "load-test", "wasp", "loki"], + "templating": { + "list": [ + { + "name": "go_test_name", + "label": "Go test name", + "type": "query", + "datasource": {"type": "loki", "uid": "loki"}, + "query": {"label": "go_test_name", "type": 1, "refId": "LokiVariableQueryEditor-VariableQuery"}, + "refresh": 2, + "multi": true, + "includeAll": true, + "sort": 3 + }, + { + "name": "gen_name", + "label": "Generator name", + "type": "query", + "datasource": {"type": "loki", "uid": "loki"}, + "query": {"label": "gen_name", "type": 1, "refId": "LokiVariableQueryEditor-VariableQuery"}, + "refresh": 2, + "multi": true, + "includeAll": true, + "sort": 3 + }, + { + "name": "branch", + "label": "Branch", + "type": "query", + "datasource": {"type": "loki", "uid": "loki"}, + "query": {"label": "branch", "type": 1, "refId": "LokiVariableQueryEditor-VariableQuery"}, + "refresh": 2, + "multi": true, + "includeAll": true, + "sort": 3 + }, + { + "name": "commit", + "label": "Commit", + "type": "query", + "datasource": {"type": "loki", "uid": "loki"}, + "query": {"label": "commit", "type": 1, "refId": "LokiVariableQueryEditor-VariableQuery"}, + "refresh": 2, + "multi": true, + "includeAll": true, + "sort": 3 + }, + { + "name": "call_group", + "label": "Call group", + "type": "query", + "datasource": {"type": "loki", "uid": "loki"}, + "query": {"label": "call_group", "type": 1, "refId": "LokiVariableQueryEditor-VariableQuery"}, + "refresh": 2, + "multi": true, + "includeAll": true, + "sort": 3 + } + ] + }, + "time": {"from": "now-30m", "to": "now"}, + "timepicker": {}, + "timezone": "browser", + "title": "WASP (Loki)", + "uid": "wasp-loki", + "version": 1, + "weekStart": "" +} diff --git a/wasp/dashboard/grafanasdk/panels.go b/wasp/dashboard/grafanasdk/panels.go deleted file mode 100644 index 99add4f9f..000000000 --- a/wasp/dashboard/grafanasdk/panels.go +++ /dev/null @@ -1,381 +0,0 @@ -package grafanasdk - -import ( - "github.com/grafana/grafana-foundation-sdk/go/common" - "github.com/grafana/grafana-foundation-sdk/go/dashboard" - "github.com/grafana/grafana-foundation-sdk/go/logs" - "github.com/grafana/grafana-foundation-sdk/go/prometheus" - "github.com/grafana/grafana-foundation-sdk/go/stat" - "github.com/grafana/grafana-foundation-sdk/go/timeseries" -) - -func RPSNowPanel(queryPrefix string, panelID uint32, datasource dashboard.DataSourceRef) *stat.PanelBuilder { - panelName := "RPS (Now)" - query := `sum(last_over_time({` + queryPrefix + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} - | json - | unwrap current_rps [1s]) by (node_id, go_test_name, gen_name)) by (__stream_shard__)` - legend := "{{go_test_name}} {{gen_name}} RPS" - - return stat.NewPanelBuilder().Title(panelName). - Id(panelID). - Datasource(datasource). - Orientation(common.VizOrientationVertical). - Text(common.NewVizTextDisplayOptionsBuilder().TitleSize(12).ValueSize(20)). - TextMode(common.BigValueTextModeValueAndName). - GraphMode(common.BigValueGraphModeNone). - Thresholds(dashboard.NewThresholdsConfigBuilder().Mode(dashboard.ThresholdsModeAbsolute).Steps([]dashboard.Threshold{})). - ReduceOptions(common.NewReduceDataOptionsBuilder().Calcs([]string{"last"}).Values(false)). - Span(2). - Height(6). - Transparent(true). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(query). - Format("time_series"). - LegendFormat(legend), - ) -} - -func VUsNowPanel(queryPrefix string, panelID uint32, datasource dashboard.DataSourceRef) *stat.PanelBuilder { - panelName := "VUs (Now)" - query := `sum(max_over_time({` + queryPrefix + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} - | json - | unwrap current_instances [$__range]) by (node_id, go_test_name, gen_name)) by (__stream_shard__)` - legend := "{{go_test_name}} {{gen_name}} VUs" - - return stat.NewPanelBuilder().Title(panelName). - Id(panelID). - Datasource(datasource). - Orientation(common.VizOrientationVertical). - Text(common.NewVizTextDisplayOptionsBuilder().TitleSize(12).ValueSize(20)). - TextMode(common.BigValueTextModeValueAndName). - GraphMode(common.BigValueGraphModeNone). - Thresholds(dashboard.NewThresholdsConfigBuilder().Mode(dashboard.ThresholdsModeAbsolute).Steps([]dashboard.Threshold{})). - ReduceOptions(common.NewReduceDataOptionsBuilder().Calcs([]string{"last"}).Values(false)). - Span(2). - Height(6). - Transparent(true). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(query). - Format("time_series"). - LegendFormat(legend), - ) -} - -func ResponsesPerSecNowPanel(queryPrefix string, panelID uint32, datasource dashboard.DataSourceRef) *stat.PanelBuilder { - panelName := "Responses/sec (Now)" - query := `sum(count_over_time({` + queryPrefix + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}"} [1s])) by (node_id, go_test_name, gen_name)` - legend := "{{go_test_name}} {{gen_name}} Responses/sec" - - return stat.NewPanelBuilder().Title(panelName). - Id(panelID). - Datasource(datasource). - Orientation(common.VizOrientationHorizontal). - Text(common.NewVizTextDisplayOptionsBuilder().TitleSize(12).ValueSize(12)). - TextMode(common.BigValueTextModeValueAndName). - GraphMode(common.BigValueGraphModeNone). - Thresholds(dashboard.NewThresholdsConfigBuilder().Mode(dashboard.ThresholdsModeAbsolute).Steps([]dashboard.Threshold{})). - ReduceOptions(common.NewReduceDataOptionsBuilder().Calcs([]string{"last"}).Values(false)). - Span(8). - Height(6). - Transparent(true). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(query). - Format("time_series"). - LegendFormat(legend), - ) -} - -func TotalSuccessfulRequestsPanel(queryPrefix string, panelID uint32, datasource dashboard.DataSourceRef) *stat.PanelBuilder { - panelName := "Successful requests (Total)" - query := ` - sum(max_over_time({` + queryPrefix + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} - | json - | unwrap success [$__range]) by (node_id, go_test_name, gen_name)) by (__stream_shard__) - ` - legend := "{{go_test_name}} {{gen_name}} Successful requests" - - return stat.NewPanelBuilder().Title(panelName). - Id(panelID). - Datasource(datasource). - Orientation(common.VizOrientationVertical). - Text(common.NewVizTextDisplayOptionsBuilder().TitleSize(12).ValueSize(20)). - TextMode(common.BigValueTextModeValueAndName). - GraphMode(common.BigValueGraphModeNone). - Thresholds(dashboard.NewThresholdsConfigBuilder().Mode(dashboard.ThresholdsModeAbsolute).Steps([]dashboard.Threshold{})). - ReduceOptions(common.NewReduceDataOptionsBuilder().Calcs([]string{"last"}).Values(false)). - Span(4). - Height(6). - Transparent(true). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(query). - Format("time_series"). - LegendFormat(legend), - ) -} - -func TotalErroredRequestsPanel(queryPrefix string, panelID uint32, datasource dashboard.DataSourceRef) *stat.PanelBuilder { - panelName := "Errored requests (Total)" - query := ` - sum(max_over_time({` + queryPrefix + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} - | json - | unwrap failed [$__range]) by (node_id, go_test_name, gen_name)) by (__stream_shard__) - ` - legend := "{{go_test_name}} {{gen_name}} Errored requests" - - return stat.NewPanelBuilder().Title(panelName). - Id(panelID). - Datasource(datasource). - Orientation(common.VizOrientationVertical). - Text(common.NewVizTextDisplayOptionsBuilder().TitleSize(12).ValueSize(20)). - TextMode(common.BigValueTextModeValueAndName). - GraphMode(common.BigValueGraphModeNone). - Thresholds(dashboard.NewThresholdsConfigBuilder().Mode(dashboard.ThresholdsModeAbsolute).Steps([]dashboard.Threshold{})). - ReduceOptions(common.NewReduceDataOptionsBuilder().Calcs([]string{"last"}).Values(false)). - Span(4). - Height(6). - Transparent(true). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(query). - Format("time_series"). - LegendFormat(legend), - ) -} - -func TimedOutRequestsPanel(queryPrefix string, panelID uint32, datasource dashboard.DataSourceRef) *stat.PanelBuilder { - panelName := "Timed out requests (Total)" - query := ` - sum(max_over_time({` + queryPrefix + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} - | json - | unwrap callTimeout [$__range]) by (node_id, go_test_name, gen_name)) by (__stream_shard__) - ` - legend := "{{go_test_name}} {{gen_name}} Timed out requests" - - return stat.NewPanelBuilder().Title(panelName). - Id(panelID). - Datasource(datasource). - Orientation(common.VizOrientationVertical). - Text(common.NewVizTextDisplayOptionsBuilder().TitleSize(12).ValueSize(20)). - TextMode(common.BigValueTextModeValueAndName). - GraphMode(common.BigValueGraphModeNone). - Thresholds(dashboard.NewThresholdsConfigBuilder().Mode(dashboard.ThresholdsModeAbsolute).Steps([]dashboard.Threshold{})). - ReduceOptions(common.NewReduceDataOptionsBuilder().Calcs([]string{"last"}).Values(false)). - Span(4). - Height(6). - Transparent(true). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(query). - Format("time_series"). - LegendFormat(legend), - ) -} - -func LatestSegmentStatPanel(queryPrefix string, panelID uint32, datasource dashboard.DataSourceRef) *stat.PanelBuilder { - return stat.NewPanelBuilder().Title("Latest segment stats"). - Id(panelID). - Datasource(datasource). - Orientation(common.VizOrientationVertical). - Text(common.NewVizTextDisplayOptionsBuilder().TitleSize(12).ValueSize(20)). - TextMode(common.BigValueTextModeValueAndName). - GraphMode(common.BigValueGraphModeNone). - ReduceOptions(common.NewReduceDataOptionsBuilder().Calcs([]string{"last"}).Values(true)). - Span(24). - Height(6). - ColorMode(common.BigValueColorModeValue). - Transparent(true). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(`sum(bytes_over_time({` + queryPrefix + `go_test_name=~"${go_test_name:pipe}", gen_name=~"${gen_name:pipe}"} [$__range]) * 1e-6)`). - LegendFormat("Overall logs size"), - ). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(`sum(bytes_rate({` + queryPrefix + `go_test_name=~"${go_test_name:pipe}", gen_name=~"${gen_name:pipe}"} [$__interval]) * 1e-6)`). - LegendFormat("{{go_test_name}} {{gen_name}} Timed out requests"), - ) -} - -func RPSPanel(queryString string, panelID uint32, promDatasource dashboard.DataSourceRef) *timeseries.PanelBuilder { - return timeseries.NewPanelBuilder().Title("Responses/sec (Generator, CallGroup)"). - Id(panelID). - Datasource(promDatasource). - Height(8). - Span(12). - Transparent(true). - GradientMode(common.GraphGradientModeOpacity). - FillOpacity(25). - AxisLabel("Responses"). - Legend(common.NewVizLegendOptionsBuilder().ShowLegend(true).Placement(common.LegendPlacementBottom).DisplayMode(common.LegendDisplayModeList).Calcs([]string{})). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(`sum(count_over_time({` + queryString + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}", call_group=~"${call_group:pipe}"} [1s])) by (node_id, go_test_name, gen_name, call_group)`). - LegendFormat("{{go_test_name}} {{gen_name}} {{call_group}} responses/sec"), - ). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(`sum(count_over_time({` + queryString + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}"} [1s])) by (node_id, go_test_name, gen_name)`). - LegendFormat("{{go_test_name}} Total responses/sec"), - ) -} - -func RPSVUPerScheduleSegmentsPanel(queryString string, panelID uint32, datasource dashboard.DataSourceRef) *timeseries.PanelBuilder { - return timeseries.NewPanelBuilder().Title("RPS/VUs per schedule segments"). - Id(panelID). - Datasource(datasource). - Height(8). - Span(12). - Transparent(true). - FillOpacity(25). - GradientMode(common.GraphGradientModeOpacity). - ShowPoints(""). - Stacking(common.NewStackingConfigBuilder().Group("").Mode("")). - LineStyle(common.NewLineStyleBuilder().Fill(common.LineStyleFillSolid)). - Thresholds(dashboard.NewThresholdsConfigBuilder().Mode(dashboard.ThresholdsModeAbsolute).Steps([]dashboard.Threshold{})). - ThresholdsStyle(common.NewGraphThresholdsStyleConfigBuilder().Mode("")). - Tooltip(common.NewVizTooltipOptionsBuilder().Mode(common.TooltipDisplayModeSingle).Sort(common.SortOrderNone)). - Unit(""). - Legend(common.NewVizLegendOptionsBuilder().ShowLegend(true).Placement(common.LegendPlacementBottom).DisplayMode(common.LegendDisplayModeList).Calcs([]string{})). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(`max_over_time({` + queryString + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} | json | unwrap current_rps [$__interval]) by (node_id, go_test_name, gen_name)`). - Format("time_series"). - LegendFormat("{{go_test_name}} {{gen_name}} RPS"), - ). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(`sum(last_over_time({` + queryString + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} | json | unwrap current_rps [$__interval]) by (node_id, go_test_name, gen_name))`). - Format("time_series"). - LegendFormat("{{go_test_name}} Total RPS"), - ). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(`max_over_time({` + queryString + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} | json | unwrap current_instances [$__interval]) by (node_id, go_test_name, gen_name)`). - Format("time_series"). - LegendFormat("{{go_test_name}} {{gen_name}} VUs"), - ). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(`sum(last_over_time({` + queryString + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} | json | unwrap current_instances [$__interval]) by (node_id, go_test_name, gen_name))`). - Format("time_series"). - LegendFormat("{{go_test_name}} Total VUs"), - ) -} - -func LatencyQuantilesPanel(queryString string, panelID uint32, promDatasource dashboard.DataSourceRef) *timeseries.PanelBuilder { - return timeseries.NewPanelBuilder().Title("Latency quantiles over groups (99, 95, 50)"). - Id(panelID). - Datasource(promDatasource). - Height(8). - Span(12). - Transparent(true). - AxisLabel("ms"). - Legend(common.NewVizLegendOptionsBuilder().ShowLegend(true).Placement(common.LegendPlacementBottom).DisplayMode(common.LegendDisplayModeList).Calcs([]string{})). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(`quantile_over_time(0.99, {` + queryString + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}"} | json | unwrap duration [$__interval]) by (go_test_name, gen_name) / 1e6`). - LegendFormat("{{go_test_name}} {{gen_name}} Q 99 - {{error}}"), - ). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(`quantile_over_time(0.95, {` + queryString + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}"} | json | unwrap duration [$__interval]) by (go_test_name, gen_name) / 1e6`). - LegendFormat("{{go_test_name}} {{gen_name}} Q 95 - {{error}}"), - ). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(`quantile_over_time(0.50, {` + queryString + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}"} | json | unwrap duration [$__interval]) by (go_test_name, gen_name) / 1e6`). - LegendFormat("{{go_test_name}} {{gen_name}} Q 50 - {{error}}"), - ) -} - -func ResponseLatenciesPanel(queryString string, panelID uint32, promDatasource dashboard.DataSourceRef) *timeseries.PanelBuilder { - return timeseries.NewPanelBuilder().Title("Responses latencies by types over time (Generator, CallGroup)"). - Id(panelID). - Datasource(promDatasource). - Height(8). - Span(12). - Transparent(true). - AxisLabel("ms"). - Legend(common.NewVizLegendOptionsBuilder().ShowLegend(true).Placement(common.LegendPlacementBottom).DisplayMode(common.LegendDisplayModeList).Calcs([]string{})). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(`last_over_time({` + queryString + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}", call_group=~"${call_group}"} | json | unwrap duration [$__interval]) / 1e6`). - LegendFormat("{{go_test_name}} {{gen_name}} {{call_group}} T: {{timeout}} E: {{error}}"), - ). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(`last_over_time({` + queryString + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}"} | json | unwrap duration [$__interval]) / 1e6`). - LegendFormat("{{go_test_name}} {{gen_name}} all groups T: {{timeout}} E: {{error}}"), - ) -} - -func CallResultSamplingPanel(queryString string, panelID uint32, promDatasource dashboard.DataSourceRef) *timeseries.PanelBuilder { - return timeseries.NewPanelBuilder(). - Title("CallResult sampling (successful results)"). - Id(panelID). - Datasource(promDatasource). - Height(6). - Span(24). - Transparent(true). - AxisLabel("CallResults"). - Legend(common.NewVizLegendOptionsBuilder().ShowLegend(true).Placement(common.LegendPlacementBottom).DisplayMode(common.LegendDisplayModeList).Calcs([]string{})). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(`sum(last_over_time({` + queryString + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} | json | unwrap samples_recorded [$__interval])) by (go_test_name, gen_name)`). - LegendFormat("{{go_test_name}} {{gen_name}} recorded"), - ). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(`sum(last_over_time({` + queryString + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} | json | unwrap samples_skipped [$__interval])) by (go_test_name, gen_name)`). - LegendFormat("{{go_test_name}} {{gen_name}} skipped"), - ) -} - -func StatsLogsPanel(queryString string, panelID uint32, promDatasource dashboard.DataSourceRef) *logs.PanelBuilder { - return logs.NewPanelBuilder(). - Title("Stats logs"). - Id(panelID). - Datasource(promDatasource). - Height(8). - Span(24). - Transparent(true). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(`{` + queryString + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"}`). - LegendFormat("__auto"), - ) -} - -func FailedResponsesPanel(queryString string, panelID uint32, promDatasource dashboard.DataSourceRef) *logs.PanelBuilder { - return logs.NewPanelBuilder(). - Title("Failed responses"). - Id(panelID). - Datasource(promDatasource). - Height(8). - Span(12). - Transparent(true). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(`{` + queryString + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}"} |~ "failed\":true"`). - LegendFormat("__auto"), - ) -} - -func TimedOutResponsesPanel(queryString string, panelID uint32, promDatasource dashboard.DataSourceRef) *logs.PanelBuilder { - return logs.NewPanelBuilder(). - Title("Timed out responses"). - Id(panelID). - Datasource(promDatasource). - Height(8). - Span(12). - Transparent(true). - WithTarget( - prometheus.NewDataqueryBuilder(). - Expr(`{` + queryString + `go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}"} |~ "timeout\":true"`). - LegendFormat("__auto"), - ) -} diff --git a/wasp/dashboard/panels.go b/wasp/dashboard/panels.go deleted file mode 100644 index 8db760fd1..000000000 --- a/wasp/dashboard/panels.go +++ /dev/null @@ -1,85 +0,0 @@ -package dashboard - -import ( - "github.com/K-Phoen/grabana/row" - "github.com/K-Phoen/grabana/target/prometheus" - "github.com/K-Phoen/grabana/timeseries" - "github.com/K-Phoen/grabana/timeseries/axis" -) - -// RPSPanel creates a time series panel displaying responses per second -// grouped by generator and call group. It is used to monitor -// response rates in the dashboard. -func RPSPanel(dataSource string, query map[string]string) row.Option { - queryString := "" - for key, value := range query { - queryString += key + value + ", " - } - return row.WithTimeSeries( - "Responses/sec (Generator, CallGroup)", - timeseries.Legend(timeseries.Hide), - timeseries.Transparent(), - timeseries.Span(6), - timeseries.Height("300px"), - timeseries.DataSource(dataSource), - timeseries.Axis( - axis.Unit("Responses"), - axis.Label("Responses"), - ), - timeseries.Legend(timeseries.Bottom), - timeseries.WithPrometheusTarget( - `sum(count_over_time({`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}", call_group=~"${call_group:pipe}"} [1s])) by (node_id, go_test_name, gen_name, call_group)`, - prometheus.Legend("{{go_test_name}} {{gen_name}} {{call_group}} responses/sec"), - ), - timeseries.WithPrometheusTarget( - `sum(count_over_time({`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"responses", gen_name=~"${gen_name:pipe}"} [1s])) by (node_id, go_test_name, gen_name)`, - prometheus.Legend("{{go_test_name}} Total responses/sec"), - ), - ) -} - -// RPSVUPerScheduleSegmentsPanel creates a dashboard panel displaying Requests Per Second and Virtual Users segmented by schedule. -// It is used to monitor performance metrics over time for different test configurations. -func RPSVUPerScheduleSegmentsPanel(dataSource string, query map[string]string) row.Option { - queryString := "" - for key, value := range query { - queryString += key + value + ", " - } - return row.WithTimeSeries( - "RPS/VUs per schedule segments", - timeseries.Transparent(), - timeseries.Span(6), - timeseries.Height("300px"), - timeseries.DataSource(dataSource), - timeseries.WithPrometheusTarget( - ` - max_over_time({`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} - | json - | unwrap current_rps [$__interval]) by (node_id, go_test_name, gen_name) - `, prometheus.Legend("{{go_test_name}} {{gen_name}} RPS"), - ), - timeseries.WithPrometheusTarget( - ` - sum(last_over_time({`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} - | json - | unwrap current_rps [$__interval]) by (node_id, go_test_name, gen_name)) - `, - prometheus.Legend("{{go_test_name}} Total RPS"), - ), - timeseries.WithPrometheusTarget( - ` - max_over_time({`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} - | json - | unwrap current_instances [$__interval]) by (node_id, go_test_name, gen_name) - `, prometheus.Legend("{{go_test_name}} {{gen_name}} VUs"), - ), - timeseries.WithPrometheusTarget( - ` - sum(last_over_time({`+queryString+`go_test_name=~"${go_test_name:pipe}", test_data_type=~"stats", gen_name=~"${gen_name:pipe}"} - | json - | unwrap current_instances [$__interval]) by (node_id, go_test_name, gen_name)) - `, - prometheus.Legend("{{go_test_name}} Total VUs"), - ), - ) -} diff --git a/wasp/examples/go.mod b/wasp/examples/go.mod index 426862114..4aa8e2d0b 100644 --- a/wasp/examples/go.mod +++ b/wasp/examples/go.mod @@ -60,6 +60,7 @@ require ( github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 // indirect github.com/cdk8s-team/cdk8s-core-go/cdk8s/v2 v2.7.5 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect + github.com/cenkalti/backoff/v5 v5.0.3 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/chai2010/gettext-go v1.0.2 // indirect github.com/chaos-mesh/chaos-mesh/api v0.0.0-20240821051457-da69c6d9617a // indirect @@ -142,6 +143,7 @@ require ( github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect github.com/hashicorp/consul/api v1.31.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect @@ -265,9 +267,14 @@ require ( go.opentelemetry.io/collector/semconv v0.118.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.59.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect - go.opentelemetry.io/otel v1.43.0 // indirect - go.opentelemetry.io/otel/metric v1.43.0 // indirect - go.opentelemetry.io/otel/trace v1.43.0 // indirect + go.opentelemetry.io/otel v1.44.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.20.0 // indirect + go.opentelemetry.io/otel/log v0.20.0 // indirect + go.opentelemetry.io/otel/metric v1.44.0 // indirect + go.opentelemetry.io/otel/sdk v1.44.0 // indirect + go.opentelemetry.io/otel/sdk/log v0.20.0 // indirect + go.opentelemetry.io/otel/trace v1.44.0 // indirect + go.opentelemetry.io/proto/otlp v1.10.0 // indirect go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/goleak v1.3.0 // indirect @@ -275,22 +282,22 @@ require ( go.uber.org/zap v1.27.0 // indirect go4.org/netipx v0.0.0-20230125063823-8449b0a6169f // indirect golang.org/x/arch v0.8.0 // indirect - golang.org/x/crypto v0.48.0 // indirect + golang.org/x/crypto v0.51.0 // indirect golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect - golang.org/x/mod v0.32.0 // indirect - golang.org/x/net v0.51.0 // indirect + golang.org/x/mod v0.35.0 // indirect + golang.org/x/net v0.55.0 // indirect golang.org/x/oauth2 v0.36.0 // indirect golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.42.0 // indirect - golang.org/x/term v0.40.0 // indirect - golang.org/x/text v0.34.0 // indirect + golang.org/x/sys v0.45.0 // indirect + golang.org/x/term v0.43.0 // indirect + golang.org/x/text v0.37.0 // indirect golang.org/x/time v0.11.0 // indirect - golang.org/x/tools v0.41.0 // indirect + golang.org/x/tools v0.44.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/api v0.221.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect - google.golang.org/grpc v1.81.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect + google.golang.org/grpc v1.81.1 // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/wasp/examples/go.sum b/wasp/examples/go.sum index d336483c0..89e40fae2 100644 --- a/wasp/examples/go.sum +++ b/wasp/examples/go.sum @@ -133,6 +133,8 @@ github.com/cdk8s-team/cdk8s-core-go/cdk8s/v2 v2.7.5 h1:rvc39Ol6z3MvaBzXkxFC6Nfsn github.com/cdk8s-team/cdk8s-core-go/cdk8s/v2 v2.7.5/go.mod h1:R/pdNYDYFQk+tuuOo7QES1kkv6OLmp5ze2XBZQIVffM= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM= +github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= @@ -416,6 +418,8 @@ github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrR github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk= github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= github.com/hashicorp/consul/api v1.31.2 h1:NicObVJHcCmyOIl7Z9iHPvvFrocgTYo9cITSGg0/7pw= github.com/hashicorp/consul/api v1.31.2/go.mod h1:Z8YgY0eVPukT/17ejW+l+C7zJmKwgPHtjU1q16v/Y40= github.com/hashicorp/consul/sdk v0.16.2 h1:cGX/djeEe9r087ARiKVWwVWCF64J+yW0G6ftZMZYbj0= @@ -867,16 +871,26 @@ go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0. go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.59.0/go.mod h1:54CaSNqYEXvpzDh8KPjiMVoWm60t5R0dZRt0leEPgAs= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU= +go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.20.0 h1:owlhcJ3QO3X0YTDTCcDZ4V+6aVDkWbNmBoQ5NUp7Oww= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.20.0/go.mod h1:MP4eemTiI9zC8fgg+DYynhYDYf3ba72S376TvP+Ye0Q= +go.opentelemetry.io/otel/log v0.20.0 h1:/5i0vuHxCLWUfChWG41K9wkM0jafruPw9NU1/RCJirs= +go.opentelemetry.io/otel/log v0.20.0/go.mod h1:wOcMcjsZpG8x7Bak7IhSi/lg8wscV2C1VdrKCLPlt0E= +go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc= +go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo= +go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58= +go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0= +go.opentelemetry.io/otel/sdk/log v0.20.0 h1:vM3xI7TQgKPiSghe6urZtAkyFY7SodrSpC83CffDFuY= +go.opentelemetry.io/otel/sdk/log v0.20.0/go.mod h1:Knej2nmsTUzN79T2eeXdRsjjPcoxoq2pUyUHz9TFyyU= +go.opentelemetry.io/otel/sdk/log/logtest v0.20.0 h1:OqdRZ1guyzamK3M6LlRsmGqRrjkHWw6WZOKKli5ELpg= +go.opentelemetry.io/otel/sdk/log/logtest v0.20.0/go.mod h1:PuMIlm7zAt7c3z8zfOI5ox4iT1Z87We+PF6YoINux/M= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk= +go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE= +go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g= +go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk= go.starlark.net v0.0.0-20230525235612-a134d8f9ddca h1:VdD38733bfYv5tUZwEIskMM93VanwNIi5bIKnDrJdEY= go.starlark.net v0.0.0-20230525235612-a134d8f9ddca/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= @@ -900,8 +914,8 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= -golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= +golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= +golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA= golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU= @@ -910,8 +924,8 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c= -golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU= +golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM= +golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -928,8 +942,8 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= -golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo= -golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y= +golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= +golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= @@ -981,18 +995,18 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= -golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= +golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= -golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM= +golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4= +golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= -golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= +golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= +golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1004,8 +1018,8 @@ golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc= -golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg= +golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= +golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1023,16 +1037,16 @@ google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoA google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 h1:tu/dtnW1o3wfaxCOjSLn5IRX4YDcJrtlpzYkhHhGaC4= -google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171/go.mod h1:M5krXqk4GhBKvB596udGL3UyjL4I1+cTbK0orROM9ng= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 h1:ggcbiqK8WWh6l1dnltU4BgWGIGo+EVYxCaAPih/zQXQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= +google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.81.0 h1:W3G9N3KQf3BU+YuCtGKJk0CmxQNbAISICD/9AORxLIw= -google.golang.org/grpc v1.81.0/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= +google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/wasp/examples/profiles/node_background_load_test.go b/wasp/examples/profiles/node_background_load_test.go index 8a1827e9d..a3156596b 100644 --- a/wasp/examples/profiles/node_background_load_test.go +++ b/wasp/examples/profiles/node_background_load_test.go @@ -32,7 +32,7 @@ func TestBackgroundLoadSimple(t *testing.T) { Schedule: zetaSchedule, Gun: NewExampleHTTPGun(srv.URL()), Labels: labels, - LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), })) // start load generation without waiting for it to finish @@ -59,7 +59,7 @@ func TestBackgroundLoadSimple(t *testing.T) { Schedule: etaSchedule, VU: NewExampleScenario(srv.URL()), Labels: labels, - LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), })). Add(wasp.NewGenerator(&wasp.Config{ T: t, @@ -68,7 +68,7 @@ func TestBackgroundLoadSimple(t *testing.T) { Schedule: iotaSchedule, VU: NewExampleScenario(srv.URL()), Labels: labels, - LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), })). Run(true) // check if VU Profile did not return an error (e.g. due to invalid configuration or alerts triggered) @@ -108,7 +108,7 @@ func TestBackgroundLoadGoRoutines(t *testing.T) { Schedule: zetaSchedule, Gun: NewExampleHTTPGun(srv.URL()), Labels: labels, - LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), })) go func() { @@ -137,7 +137,7 @@ func TestBackgroundLoadGoRoutines(t *testing.T) { Schedule: etaSchedule, VU: NewExampleScenario(srv.URL()), Labels: labels, - LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), })). Add(wasp.NewGenerator(&wasp.Config{ T: t, @@ -146,7 +146,7 @@ func TestBackgroundLoadGoRoutines(t *testing.T) { Schedule: iotaSchedule, VU: NewExampleScenario(srv.URL()), Labels: labels, - LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), })). Run(true) // check if VU Profile did not return an error (e.g. due to invalid configuration or alerts triggered) @@ -192,7 +192,7 @@ func TestParallelLoad(t *testing.T) { GenName: "Kappa", Labels: labels, Gun: NewExampleHTTPGun(srv.URL()), - LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), }) require.NoError(t, err) @@ -203,7 +203,7 @@ func TestParallelLoad(t *testing.T) { GenName: "Lambda", Labels: labels, VU: NewExampleScenario(srv.URL()), - LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), }) require.NoError(t, err) @@ -214,7 +214,7 @@ func TestParallelLoad(t *testing.T) { Labels: labels, // here both VUs use the same VirtualUser implementation to keep it simple, but in a real-world use case they would different ones VU: NewExampleScenario(srv.URL()), - LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), }) require.NoError(t, err) diff --git a/wasp/examples/profiles/node_mixed_test.go b/wasp/examples/profiles/node_mixed_test.go index b12a272ae..5fa1c4ddf 100644 --- a/wasp/examples/profiles/node_mixed_test.go +++ b/wasp/examples/profiles/node_mixed_test.go @@ -35,6 +35,7 @@ func TestNodeMixed(t *testing.T) { VU: NewExampleScenario(srv.URL()), Labels: labels, LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), })). Add(wasp.NewGenerator(&wasp.Config{ T: t, @@ -44,6 +45,7 @@ func TestNodeMixed(t *testing.T) { Gun: NewExampleHTTPGun(srv.URL()), Labels: labels, LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), })). Run(true) require.NoError(t, err) diff --git a/wasp/examples/profiles/node_rps_test.go b/wasp/examples/profiles/node_rps_test.go index 2627bf6ca..020272dc9 100644 --- a/wasp/examples/profiles/node_rps_test.go +++ b/wasp/examples/profiles/node_rps_test.go @@ -30,7 +30,7 @@ func TestNodeRPS(t *testing.T) { ), Gun: NewExampleHTTPGun(srv.URL()), Labels: labels, - LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), })). Add(wasp.NewGenerator(&wasp.Config{ LoadType: wasp.RPS, @@ -42,7 +42,7 @@ func TestNodeRPS(t *testing.T) { ), Gun: NewExampleHTTPGun(srv.URL()), Labels: labels, - LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), })). Run(true) require.NoError(t, err) diff --git a/wasp/examples/profiles/node_vu_grafana_opts_test.go b/wasp/examples/profiles/node_vu_grafana_opts_test.go index cc514a594..c014d6b62 100644 --- a/wasp/examples/profiles/node_vu_grafana_opts_test.go +++ b/wasp/examples/profiles/node_vu_grafana_opts_test.go @@ -27,7 +27,7 @@ func TestGrafanaOptsVU(t *testing.T) { Schedule: wasp.Steps(1, 1, 10, 30*time.Second), VU: NewExampleScenario(srv.URL()), Labels: labels, - LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), })). Add(wasp.NewGenerator(&wasp.Config{ T: t, @@ -36,7 +36,7 @@ func TestGrafanaOptsVU(t *testing.T) { Schedule: wasp.Steps(1, 2, 10, 30*time.Second), VU: NewExampleScenario(srv.URL()), Labels: labels, - LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), })). WithGrafana(&wasp.GrafanaOpts{ GrafanaURL: os.Getenv("GRAFANA_URL"), diff --git a/wasp/examples/profiles/node_vu_test.go b/wasp/examples/profiles/node_vu_test.go index ee45fca1f..15a588c97 100644 --- a/wasp/examples/profiles/node_vu_test.go +++ b/wasp/examples/profiles/node_vu_test.go @@ -26,7 +26,7 @@ func TestNodeVU(t *testing.T) { Schedule: wasp.Steps(1, 1, 10, 30*time.Second), VU: NewExampleScenario(srv.URL()), Labels: labels, - LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), })). Add(wasp.NewGenerator(&wasp.Config{ T: t, @@ -35,7 +35,7 @@ func TestNodeVU(t *testing.T) { Schedule: wasp.Steps(1, 2, 10, 30*time.Second), VU: NewExampleScenario(srv.URL()), Labels: labels, - LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), })). Run(true) require.NoError(t, err) diff --git a/wasp/examples/scenario/main_test.go b/wasp/examples/scenario/main_test.go index dd1277aa9..aae43cce2 100644 --- a/wasp/examples/scenario/main_test.go +++ b/wasp/examples/scenario/main_test.go @@ -27,7 +27,7 @@ func TestScenario(t *testing.T) { wasp.Plain(2, 30*time.Second), wasp.Plain(3, 30*time.Second), ), - LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), })).Run(true) require.NoError(t, err) } diff --git a/wasp/examples/simple_rps/gun.go b/wasp/examples/simple_rps/gun.go index 5f2de9867..5dea2401e 100644 --- a/wasp/examples/simple_rps/gun.go +++ b/wasp/examples/simple_rps/gun.go @@ -22,7 +22,7 @@ func NewExampleHTTPGun(target string) *ExampleGun { // Call implements example gun call, assertions on response bodies should be done here func (m *ExampleGun) Call(l *wasp.Generator) *wasp.Response { - var result map[string]interface{} + var result map[string]any r, err := m.client.R(). SetResult(&result). Get(m.target) diff --git a/wasp/examples/simple_rps/main_test.go b/wasp/examples/simple_rps/main_test.go index d3da4b59c..d10b8157c 100644 --- a/wasp/examples/simple_rps/main_test.go +++ b/wasp/examples/simple_rps/main_test.go @@ -29,7 +29,7 @@ func TestGun(t *testing.T) { Schedule: wasp.Plain(5, 60*time.Second), Gun: NewExampleHTTPGun(srv.URL()), Labels: labels, - LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), }) if err != nil { panic(err) diff --git a/wasp/examples/simple_vu/main_test.go b/wasp/examples/simple_vu/main_test.go index d1776a6b2..d8e368004 100644 --- a/wasp/examples/simple_vu/main_test.go +++ b/wasp/examples/simple_vu/main_test.go @@ -27,7 +27,7 @@ func TestVirtualUser(t *testing.T) { Schedule: wasp.Plain(5, 60*time.Second), VU: NewExampleWSVirtualUser(srv.URL()), Labels: labels, - LokiConfig: wasp.NewEnvLokiConfig(), + OTELConfig: wasp.NewEnvOTELConfig(), }) if err != nil { panic(err) diff --git a/wasp/go.mod b/wasp/go.mod index 59fb04f35..7938ad4a5 100644 --- a/wasp/go.mod +++ b/wasp/go.mod @@ -10,6 +10,10 @@ require ( github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.33.0 github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.20.0 + go.opentelemetry.io/otel/log v0.20.0 + go.opentelemetry.io/otel/sdk v1.44.0 + go.opentelemetry.io/otel/sdk/log v0.20.0 k8s.io/api v0.32.2 k8s.io/apimachinery v0.32.2 k8s.io/client-go v0.32.2 @@ -57,11 +61,11 @@ require ( github.com/spf13/pflag v1.0.6 // indirect github.com/x448/float16 v0.8.4 // indirect golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect - golang.org/x/net v0.51.0 // indirect + golang.org/x/net v0.55.0 // indirect golang.org/x/oauth2 v0.36.0 // indirect - golang.org/x/sys v0.42.0 // indirect - golang.org/x/term v0.40.0 // indirect - golang.org/x/text v0.34.0 // indirect + golang.org/x/sys v0.45.0 // indirect + golang.org/x/term v0.43.0 // indirect + golang.org/x/text v0.37.0 // indirect golang.org/x/time v0.11.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/protobuf v1.36.11 // indirect @@ -90,7 +94,7 @@ require ( github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.20-0.20250106135623-15722ca32b64 github.com/stretchr/testify v1.11.1 go.uber.org/ratelimit v0.3.1 - google.golang.org/grpc v1.81.0 // indirect + google.golang.org/grpc v1.81.1 // indirect ) require ( @@ -292,9 +296,9 @@ require ( go.opentelemetry.io/collector/semconv v0.118.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.59.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect - go.opentelemetry.io/otel v1.43.0 // indirect - go.opentelemetry.io/otel/metric v1.43.0 // indirect - go.opentelemetry.io/otel/trace v1.43.0 // indirect + go.opentelemetry.io/otel v1.44.0 + go.opentelemetry.io/otel/metric v1.44.0 // indirect + go.opentelemetry.io/otel/trace v1.44.0 // indirect go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/goleak v1.3.0 // indirect @@ -302,13 +306,13 @@ require ( go.uber.org/zap v1.27.0 // indirect go4.org/netipx v0.0.0-20230125063823-8449b0a6169f // indirect golang.org/x/arch v0.8.0 // indirect - golang.org/x/crypto v0.48.0 // indirect - golang.org/x/mod v0.32.0 // indirect + golang.org/x/crypto v0.51.0 // indirect + golang.org/x/mod v0.35.0 // indirect golang.org/x/sync v0.20.0 - golang.org/x/tools v0.41.0 // indirect + golang.org/x/tools v0.44.0 // indirect google.golang.org/api v0.221.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect k8s.io/cli-runtime v0.31.2 // indirect k8s.io/component-base v0.31.2 // indirect k8s.io/kubectl v0.31.2 // indirect @@ -317,10 +321,12 @@ require ( ) require ( + github.com/cenkalti/backoff/v5 v5.0.3 // indirect github.com/containerd/errdefs v1.0.0 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect github.com/ebitengine/purego v0.10.0 // indirect github.com/google/go-github/v72 v72.0.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect github.com/hashicorp/consul/sdk v0.16.2 // indirect github.com/hashicorp/go-metrics v0.5.4 // indirect github.com/moby/go-archive v0.2.0 // indirect @@ -328,6 +334,7 @@ require ( github.com/moby/moby/client v0.4.0 // indirect github.com/shirou/gopsutil/v4 v4.26.3 // indirect github.com/tjhop/slog-gokit v0.1.3 // indirect + go.opentelemetry.io/proto/otlp v1.10.0 // indirect ) retract [v1.999.0-test-release, v1.999.999-test-release] diff --git a/wasp/go.sum b/wasp/go.sum index e9b027fb8..dca6b8977 100644 --- a/wasp/go.sum +++ b/wasp/go.sum @@ -140,6 +140,8 @@ github.com/cdk8s-team/cdk8s-core-go/cdk8s/v2 v2.7.5 h1:rvc39Ol6z3MvaBzXkxFC6Nfsn github.com/cdk8s-team/cdk8s-core-go/cdk8s/v2 v2.7.5/go.mod h1:R/pdNYDYFQk+tuuOo7QES1kkv6OLmp5ze2XBZQIVffM= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM= +github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= @@ -430,6 +432,8 @@ github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrR github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk= github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= github.com/hashicorp/consul/api v1.31.2 h1:NicObVJHcCmyOIl7Z9iHPvvFrocgTYo9cITSGg0/7pw= github.com/hashicorp/consul/api v1.31.2/go.mod h1:Z8YgY0eVPukT/17ejW+l+C7zJmKwgPHtjU1q16v/Y40= github.com/hashicorp/consul/sdk v0.16.2 h1:cGX/djeEe9r087ARiKVWwVWCF64J+yW0G6ftZMZYbj0= @@ -881,16 +885,26 @@ go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0. go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.59.0/go.mod h1:54CaSNqYEXvpzDh8KPjiMVoWm60t5R0dZRt0leEPgAs= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU= +go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.20.0 h1:owlhcJ3QO3X0YTDTCcDZ4V+6aVDkWbNmBoQ5NUp7Oww= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.20.0/go.mod h1:MP4eemTiI9zC8fgg+DYynhYDYf3ba72S376TvP+Ye0Q= +go.opentelemetry.io/otel/log v0.20.0 h1:/5i0vuHxCLWUfChWG41K9wkM0jafruPw9NU1/RCJirs= +go.opentelemetry.io/otel/log v0.20.0/go.mod h1:wOcMcjsZpG8x7Bak7IhSi/lg8wscV2C1VdrKCLPlt0E= +go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc= +go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo= +go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58= +go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0= +go.opentelemetry.io/otel/sdk/log v0.20.0 h1:vM3xI7TQgKPiSghe6urZtAkyFY7SodrSpC83CffDFuY= +go.opentelemetry.io/otel/sdk/log v0.20.0/go.mod h1:Knej2nmsTUzN79T2eeXdRsjjPcoxoq2pUyUHz9TFyyU= +go.opentelemetry.io/otel/sdk/log/logtest v0.20.0 h1:OqdRZ1guyzamK3M6LlRsmGqRrjkHWw6WZOKKli5ELpg= +go.opentelemetry.io/otel/sdk/log/logtest v0.20.0/go.mod h1:PuMIlm7zAt7c3z8zfOI5ox4iT1Z87We+PF6YoINux/M= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk= +go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE= +go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g= +go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk= go.starlark.net v0.0.0-20230525235612-a134d8f9ddca h1:VdD38733bfYv5tUZwEIskMM93VanwNIi5bIKnDrJdEY= go.starlark.net v0.0.0-20230525235612-a134d8f9ddca/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= @@ -914,8 +928,8 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= -golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= +golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= +golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -934,8 +948,8 @@ golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCc golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c= -golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU= +golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM= +golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -951,8 +965,8 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= -golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo= -golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y= +golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= +golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= @@ -1005,18 +1019,18 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= -golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= +golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= -golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM= +golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4= +golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= -golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= +golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= +golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1031,8 +1045,8 @@ golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc= -golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg= +golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= +golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1053,16 +1067,16 @@ google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoA google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 h1:tu/dtnW1o3wfaxCOjSLn5IRX4YDcJrtlpzYkhHhGaC4= -google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171/go.mod h1:M5krXqk4GhBKvB596udGL3UyjL4I1+cTbK0orROM9ng= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 h1:ggcbiqK8WWh6l1dnltU4BgWGIGo+EVYxCaAPih/zQXQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= +google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.81.0 h1:W3G9N3KQf3BU+YuCtGKJk0CmxQNbAISICD/9AORxLIw= -google.golang.org/grpc v1.81.0/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= +google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/wasp/loki_client.go b/wasp/loki_client.go index 10716c3c4..48e7839d2 100644 --- a/wasp/loki_client.go +++ b/wasp/loki_client.go @@ -43,7 +43,7 @@ func (m *LokiLogWrapper) SetClient(c *LokiClient) { // Log processes and forwards log entries to Loki, handling malformed messages and recording errors. // It ensures error limits are respected and logs at appropriate levels for monitoring purposes. -func (m *LokiLogWrapper) Log(kvars ...interface{}) error { +func (m *LokiLogWrapper) Log(kvars ...any) error { if len(m.errors) > m.MaxErrors { return nil } @@ -89,7 +89,7 @@ func (m *LokiClient) Handle(ls model.LabelSet, t time.Time, s string) error { // HandleStruct marshals the provided struct to JSON and sends it to Loki with the specified labels and timestamp. // Use this function to log structured data in a decentralized logging system. -func (m *LokiClient) HandleStruct(ls model.LabelSet, t time.Time, st interface{}) error { +func (m *LokiClient) HandleStruct(ls model.LabelSet, t time.Time, st any) error { d, err := json.Marshal(st) if err != nil { return fmt.Errorf("failed to marshal struct in response: %v", st) @@ -138,10 +138,12 @@ type LokiConfig struct { MaxLineSizeTruncate bool } -// DefaultLokiConfig returns a LokiConfig initialized with default parameters. -// It serves as a base configuration for Loki clients, allowing users to customize settings as needed. +// DefaultLokiConfig returns a LokiConfig initialized with default parameters +// pointing at the local compose/ Loki instance (host port 3030). +// Override URL for production use. func DefaultLokiConfig() *LokiConfig { return &LokiConfig{ + URL: "http://localhost:3030/loki/api/v1/push", MaxErrors: 5, BatchWait: 3 * time.Second, BatchSize: 500 * 1024, @@ -164,10 +166,18 @@ func LocalCTFObsConfig() *LokiConfig { // NewEnvLokiConfig creates a LokiConfig populated with settings from environment variables. func NewEnvLokiConfig() *LokiConfig { d := DefaultLokiConfig() - d.TenantID = os.Getenv("LOKI_TENANT_ID") - d.URL = os.Getenv("LOKI_URL") - d.Token = os.Getenv("LOKI_TOKEN") - d.BasicAuth = os.Getenv("LOKI_BASIC_AUTH") + if v := os.Getenv("LOKI_URL"); v != "" { + d.URL = v + } + if v := os.Getenv("LOKI_TENANT_ID"); v != "" { + d.TenantID = v + } + if v := os.Getenv("LOKI_TOKEN"); v != "" { + d.Token = v + } + if v := os.Getenv("LOKI_BASIC_AUTH"); v != "" { + d.BasicAuth = v + } return d } @@ -193,6 +203,9 @@ func NewLokiConfig(endpoint *string, tenant *string, basicAuth *string, token *s // NewLokiClient initializes a new LokiClient with the given LokiConfig. // It validates the configuration, sets up authentication, and prepares the client for interacting with Loki for logging purposes. func NewLokiClient(extCfg *LokiConfig) (*LokiClient, error) { + if extCfg == nil || extCfg.URL == "" { + return nil, errors.New("Loki URL is empty") + } _, err := http.Get(extCfg.URL) if err != nil { return nil, err diff --git a/wasp/otel_client.go b/wasp/otel_client.go new file mode 100644 index 000000000..1c450e7de --- /dev/null +++ b/wasp/otel_client.go @@ -0,0 +1,160 @@ +package wasp + +import ( + "context" + "encoding/json" + "fmt" + "os" + "time" + + "github.com/prometheus/common/model" + "github.com/rs/zerolog/log" + "go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp" + otellog "go.opentelemetry.io/otel/log" + sdklog "go.opentelemetry.io/otel/sdk/log" + "go.opentelemetry.io/otel/sdk/resource" + semconv "go.opentelemetry.io/otel/semconv/v1.26.0" +) + +// OTELConfig is a simplified subset of an OTEL OTLP log client configuration. +type OTELConfig struct { + // Endpoint is the OTLP HTTP endpoint host:port (e.g. "localhost:4318"). + Endpoint string `yaml:"endpoint"` + // URLPath is the OTLP HTTP path for log ingestion (defaults to "/v1/logs"). + URLPath string `yaml:"url_path"` + // Insecure disables TLS for the OTLP HTTP exporter. + Insecure bool `yaml:"insecure"` + // Headers are additional request headers (e.g. for auth tokens). + Headers map[string]string `yaml:"headers"` + // ServiceName populates the OTEL service.name resource attribute. + ServiceName string `yaml:"service_name"` + // BatchTimeout is the max time the batch processor waits before flushing. + BatchTimeout time.Duration + // ExportTimeout is the per-batch export timeout. + ExportTimeout time.Duration +} + +// DefaultOTELConfig returns an OTELConfig initialized with reasonable defaults +// pointing at the local compose-victoria-metrics OTEL Collector (OTLP HTTP on :4318), +// which forwards logs to VictoriaLogs. Override Endpoint for production use. +func DefaultOTELConfig() *OTELConfig { + return &OTELConfig{ + Endpoint: "localhost:4318", + URLPath: "/v1/logs", + Insecure: true, + ServiceName: "wasp", + BatchTimeout: 3 * time.Second, + ExportTimeout: 20 * time.Second, + } +} + +// NewEnvOTELConfig creates an OTELConfig populated from environment variables. +// Recognized: OTEL_EXPORTER_OTLP_ENDPOINT, OTEL_EXPORTER_OTLP_INSECURE, +// OTEL_SERVICE_NAME. +func NewEnvOTELConfig() *OTELConfig { + d := DefaultOTELConfig() + if v := os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT"); v != "" { + d.Endpoint = v + } + if os.Getenv("OTEL_EXPORTER_OTLP_INSECURE") == "false" { + d.Insecure = false + } + if v := os.Getenv("OTEL_SERVICE_NAME"); v != "" { + d.ServiceName = v + } + return d +} + +// OTELClient is a thin wrapper over an OTLP HTTP log exporter + batch provider. +type OTELClient struct { + provider *sdklog.LoggerProvider + logger otellog.Logger +} + +// NewOTELClient initializes an OTELClient that pushes logs via OTLP HTTP to the +// configured endpoint. Use StopNow to flush and shut down cleanly. +func NewOTELClient(extCfg *OTELConfig) (*OTELClient, error) { + if extCfg.Endpoint == "" { + return nil, fmt.Errorf("OTEL endpoint is empty") + } + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() + + opts := []otlploghttp.Option{ + otlploghttp.WithEndpoint(extCfg.Endpoint), + otlploghttp.WithURLPath(extCfg.URLPath), + } + if extCfg.Insecure { + opts = append(opts, otlploghttp.WithInsecure()) + } + if len(extCfg.Headers) > 0 { + opts = append(opts, otlploghttp.WithHeaders(extCfg.Headers)) + } + if extCfg.ExportTimeout > 0 { + opts = append(opts, otlploghttp.WithTimeout(extCfg.ExportTimeout)) + } + + exp, err := otlploghttp.New(ctx, opts...) + if err != nil { + return nil, fmt.Errorf("create OTLP log exporter: %w", err) + } + + res, err := resource.New(ctx, resource.WithAttributes( + semconv.ServiceName(extCfg.ServiceName), + )) + if err != nil { + return nil, fmt.Errorf("create OTEL resource: %w", err) + } + + processorOpts := []sdklog.BatchProcessorOption{} + if extCfg.BatchTimeout > 0 { + processorOpts = append(processorOpts, sdklog.WithExportInterval(extCfg.BatchTimeout)) + } + + provider := sdklog.NewLoggerProvider( + sdklog.WithResource(res), + sdklog.WithProcessor(sdklog.NewBatchProcessor(exp, processorOpts...)), + ) + + return &OTELClient{ + provider: provider, + logger: provider.Logger("wasp"), + }, nil +} + +// Handle emits a log record with the given labels (as attributes), timestamp, and body string. +func (m *OTELClient) Handle(ls model.LabelSet, t time.Time, body string) error { + var rec otellog.Record + observedTime := time.Now() + rec.SetTimestamp(t) + rec.SetObservedTimestamp(observedTime) + rec.SetSeverity(otellog.SeverityInfo) + rec.SetBody(otellog.StringValue(body)) + log.Trace(). + Interface("Labels", ls). + Time("Time", t). + Time("ObservedTime", observedTime). + Str("Data", body). + Msg("Sending data to OTEL") + for k, v := range ls { + rec.AddAttributes(otellog.String(string(k), string(v))) + } + m.logger.Emit(context.Background(), rec) + return nil +} + +// HandleStruct marshals the given struct to JSON and emits it as an OTEL log record body. +func (m *OTELClient) HandleStruct(ls model.LabelSet, t time.Time, st any) error { + d, err := json.Marshal(st) + if err != nil { + return fmt.Errorf("failed to marshal struct: %v", st) + } + return m.Handle(ls, t, string(d)) +} + +// StopNow flushes and shuts down the OTEL provider. +func (m *OTELClient) StopNow() { + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() + _ = m.provider.Shutdown(ctx) +} diff --git a/wasp/tmpl_generator.go b/wasp/tmpl_generator.go index 07a8eff8a..df9a8aef1 100644 --- a/wasp/tmpl_generator.go +++ b/wasp/tmpl_generator.go @@ -195,8 +195,9 @@ func (m *ExampleGun) Call(l *wasp.Generator) *wasp.Response { Schedule: wasp.Plain(5, 60*time.Second), Gun: NewExampleHTTPGun(serviceUnderLoadURL), Labels: labels, - // TODO: by default we are sending data to CTF obs stack, use wasp. - LokiConfig: wasp.LocalCTFObsConfig(), + // By default we send data to the local OTEL Collector (see compose-victoria-metrics/). + // Override with OTEL_EXPORTER_OTLP_ENDPOINT for production deployments. + OTELConfig: wasp.NewEnvOTELConfig(), }) require.NoError(t, err) diff --git a/wasp/wasp.go b/wasp/wasp.go index 773d4155f..5fd59ca36 100644 --- a/wasp/wasp.go +++ b/wasp/wasp.go @@ -2,6 +2,7 @@ package wasp import ( "context" + "fmt" "math" "os" "sync" @@ -24,6 +25,12 @@ const ( DefaultRateLimitUnitDuration = 1 * time.Second DefaultCallResultBufLen = 50000 DefaultGenName = "Generator" + + // LogSendMethodEnvVar selects the log backend used by the Generator at runtime. + // Accepted values: "otel" (default) or "loki". Any other value returns an error. + LogSendMethodEnvVar = "WASP_LOG_SEND_METHOD" + LogSendMethodLoki = "loki" + LogSendMethodOTEL = "otel" ) var ( @@ -145,6 +152,7 @@ type Config struct { LoadType ScheduleType `json:"load_type"` Labels map[string]string `json:"-"` LokiConfig *LokiConfig `json:"-"` + OTELConfig *OTELConfig `json:"-"` Schedule []*Segment `json:"schedule"` RateLimitUnitDuration time.Duration `json:"rate_limit_unit_duration"` CallResultBufLen int `json:"-"` @@ -156,7 +164,7 @@ type Config struct { Gun Gun `json:"-"` VU VirtualUser `json:"-"` Logger zerolog.Logger `json:"-"` - SharedData interface{} `json:"-"` + SharedData any `json:"-"` SamplerConfig *SamplerConfig `json:"-"` // calculated fields duration time.Duration @@ -266,6 +274,7 @@ type Generator struct { stats *Stats loki *LokiClient lokiResponsesChan chan *Response + otel *OTELClient } // NewGenerator initializes a Generator with the provided configuration. @@ -346,6 +355,12 @@ func NewGenerator(cfg *Config) (*Generator, error) { return nil, err } } + if cfg.OTELConfig != nil { + g.otel, err = NewOTELClient(cfg.OTELConfig) + if err != nil { + return nil, err + } + } return g, nil } @@ -554,7 +569,7 @@ func (g *Generator) storeResponses(res *Response) { if !g.sampler.ShouldRecord(res, g.stats) { return } - if g.Cfg.LokiConfig != nil { + if g.hasLogBackend() { g.lokiResponsesChan <- res } g.responsesData.okDataMu.Lock() @@ -655,9 +670,9 @@ func (g *Generator) pacedCall() { func (g *Generator) Run(wait bool) (interface{}, bool) { g.Log.Info().Msg("Load generator started") g.printStatsLoop() - if g.Cfg.LokiConfig != nil { - g.sendResponsesToLoki() - g.sendStatsToLoki() + if g.hasLogBackend() { + g.sendResponsesToLogBackend() + g.sendStatsToLogBackend() } g.runScheduleLoop() g.collectVUResults() @@ -702,9 +717,7 @@ func (g *Generator) Wait() (interface{}, bool) { g.stats.CurrentTimeUnit = g.Cfg.RateLimitUnitDuration.Nanoseconds() g.dataCancel() g.dataWaitGroup.Wait() - if g.Cfg.LokiConfig != nil { - g.stopLokiStream() - } + g.stopLogStream() return g.GetData(), g.stats.RunFailed.Load() } @@ -732,90 +745,190 @@ func (g *Generator) Stats() *Stats { return g.stats } -/* Loki's methods to handle CallResult/Stats and stream it to Loki */ +/* Log backend dispatch (Loki / OTEL) — selected at runtime via LOG_SEND_METHOD */ -// stopLokiStream gracefully terminates the Loki streaming service if it is configured. -// It ensures that all Loki-related processes are properly stopped. -func (g *Generator) stopLokiStream() { - if g.Cfg.LokiConfig != nil && g.Cfg.LokiConfig.URL != "" { - g.Log.Info().Msg("Stopping Loki") - g.loki.StopNow() - g.Log.Info().Msg("Loki exited") +// hasLogBackend reports whether any log backend has been configured on this Generator. +func (g *Generator) hasLogBackend() bool { + return g.Cfg.LokiConfig != nil || g.Cfg.OTELConfig != nil +} + +// logSendMethod returns the configured log backend. Defaults to OTEL when +// LOG_SEND_METHOD is unset. Returns an error for any value that is not "otel" or "loki". +func (g *Generator) logSendMethod() (string, error) { + m := os.Getenv(LogSendMethodEnvVar) + switch m { + case "": + return LogSendMethodOTEL, nil // default + case LogSendMethodOTEL: + return LogSendMethodOTEL, nil + case LogSendMethodLoki: + return LogSendMethodLoki, nil + default: + return "", fmt.Errorf("unsupported %s value %q: expected %q or %q", LogSendMethodEnvVar, m, LogSendMethodOTEL, LogSendMethodLoki) } } -// handleLokiResponsePayload enriches a Response with additional labels and submits it to Loki for centralized logging. -// It optimizes the payload by removing unnecessary timestamps and handles any errors that occur during submission. -func (g *Generator) handleLokiResponsePayload(r *Response) { - labels := g.labels.Merge(model.LabelSet{ - "test_data_type": "responses", - CallGroupLabel: model.LabelValue(r.Group), - }) - // we are removing time.Time{} because when it marshalled to string it creates N responses for some Loki queries - // and to minimize the payload, duration is already calculated at that point - ts := r.FinishedAt - r.StartedAt = nil - r.FinishedAt = nil - err := g.loki.HandleStruct(labels, *ts, r) +// handleResponsePayload dispatches a Response to the configured log backend. +func (g *Generator) handleResponsePayload(r *Response) { + method, err := g.logSendMethod() if err != nil { g.Log.Err(err).Send() g.Stop() + return + } + switch method { + case LogSendMethodOTEL: + if g.otel != nil { + g.handleOTELResponsePayload(r) + } + case LogSendMethodLoki: + if g.loki != nil { + g.handleLokiResponsePayload(r) + } } } -// handleLokiStatsPayload transmits the generator’s current statistics to Loki for monitoring. -// It merges relevant labels with the stats data and handles any transmission errors by logging and stopping the generator. -func (g *Generator) handleLokiStatsPayload() { - ls := g.labels.Merge(model.LabelSet{ - "test_data_type": "stats", - }) - err := g.loki.HandleStruct(ls, time.Now(), g.StatsJSON()) +// handleStatsPayload dispatches a stats sample to the configured log backend. +func (g *Generator) handleStatsPayload() { + method, err := g.logSendMethod() if err != nil { g.Log.Err(err).Send() g.Stop() + return + } + switch method { + case LogSendMethodOTEL: + if g.otel != nil { + g.handleOTELStatsPayload() + } + case LogSendMethodLoki: + if g.loki != nil { + g.handleLokiStatsPayload() + } } } -// sendResponsesToLoki starts streaming response data to Loki using the generator's configuration. -// It handles incoming responses for monitoring and logging purposes. -func (g *Generator) sendResponsesToLoki() { +// stopLogStream gracefully terminates whichever log backend is configured. +func (g *Generator) stopLogStream() { + if g.loki != nil && g.Cfg.LokiConfig != nil && g.Cfg.LokiConfig.URL != "" { + g.Log.Info().Msg("Stopping Loki") + g.loki.StopNow() + g.Log.Info().Msg("Loki exited") + } + if g.otel != nil { + g.Log.Info().Msg("Stopping OTEL") + g.otel.StopNow() + g.Log.Info().Msg("OTEL exited") + } +} + +// sendResponsesToLogBackend streams response data to the configured log backend. +func (g *Generator) sendResponsesToLogBackend() { + method, err := g.logSendMethod() + if err != nil { + g.Log.Err(err).Send() + g.Stop() + return + } g.Log.Info(). - Str("URL", g.Cfg.LokiConfig.URL). + Str("Method", method). Interface("DefaultLabels", g.Cfg.Labels). - Msg("Streaming data to Loki") + Msg("Streaming responses to log backend") g.dataWaitGroup.Add(1) go func() { defer g.dataWaitGroup.Done() for { select { case <-g.dataCtx.Done(): - g.Log.Info().Msg("Loki responses exited") + g.Log.Info().Msg("Log backend responses exited") return case r := <-g.lokiResponsesChan: - g.handleLokiResponsePayload(r) + g.handleResponsePayload(r) } } }() } -// sendStatsToLoki starts a background goroutine that periodically sends generator statistics to Loki for monitoring. -func (g *Generator) sendStatsToLoki() { +// sendStatsToLogBackend periodically pushes generator stats to the configured log backend. +func (g *Generator) sendStatsToLogBackend() { g.dataWaitGroup.Add(1) go func() { defer g.dataWaitGroup.Done() for { select { case <-g.dataCtx.Done(): - g.Log.Info().Msg("Loki stats exited") + g.Log.Info().Msg("Log backend stats exited") return default: time.Sleep(g.Cfg.StatsPollInterval) - g.handleLokiStatsPayload() + g.handleStatsPayload() } } }() } +/* Loki payload handlers */ + +// handleLokiResponsePayload enriches a Response with additional labels and submits it to Loki. +func (g *Generator) handleLokiResponsePayload(r *Response) { + labels := g.labels.Merge(model.LabelSet{ + "test_data_type": "responses", + CallGroupLabel: model.LabelValue(r.Group), + }) + // we are removing time.Time{} because when it marshalled to string it creates N responses for some Loki queries + // and to minimize the payload, duration is already calculated at that point + ts := r.FinishedAt + r.StartedAt = nil + r.FinishedAt = nil + err := g.loki.HandleStruct(labels, *ts, r) + if err != nil { + g.Log.Err(err).Send() + g.Stop() + } +} + +// handleLokiStatsPayload transmits the generator’s current statistics to Loki. +func (g *Generator) handleLokiStatsPayload() { + ls := g.labels.Merge(model.LabelSet{ + "test_data_type": "stats", + }) + err := g.loki.HandleStruct(ls, time.Now(), g.StatsJSON()) + if err != nil { + g.Log.Err(err).Send() + g.Stop() + } +} + +/* OTEL payload handlers */ + +// handleOTELResponsePayload enriches a Response with additional labels and submits it as an OTEL log record. +func (g *Generator) handleOTELResponsePayload(r *Response) { + labels := g.labels.Merge(model.LabelSet{ + "test_data_type": "responses", + CallGroupLabel: model.LabelValue(r.Group), + }) + ts := r.FinishedAt + r.StartedAt = nil + r.FinishedAt = nil + err := g.otel.HandleStruct(labels, *ts, r) + if err != nil { + g.Log.Err(err).Send() + g.Stop() + } +} + +// handleOTELStatsPayload transmits the generator’s current statistics as an OTEL log record. +func (g *Generator) handleOTELStatsPayload() { + ls := g.labels.Merge(model.LabelSet{ + "test_data_type": "stats", + }) + err := g.otel.HandleStruct(ls, time.Now(), g.StatsJSON()) + if err != nil { + g.Log.Err(err).Send() + g.Stop() + } +} + /* Local logging methods */ // StatsJSON returns the generator's current statistics as a JSON-compatible map. From a861c10e8a5fb523121931cb2734ea989f958ebb Mon Sep 17 00:00:00 2001 From: skudasov Date: Fri, 29 May 2026 13:10:07 +0200 Subject: [PATCH 02/15] simplify, run tests for both stacks, simplify docs --- book/src/SUMMARY.md | 1 - book/src/libs/wasp/how-to/overview.md | 1 - .../libs/wasp/how-to/run_included_tests.md | 62 ------------- .../how-to/start_local_observability_stack.md | 8 +- framework/go.sum | 74 +++++++++------- .../profiles/node_background_load_test.go | 9 ++ wasp/examples/profiles/node_rps_test.go | 2 + .../profiles/node_vu_grafana_opts_test.go | 2 + wasp/examples/profiles/node_vu_test.go | 2 + wasp/examples/scenario/main_test.go | 1 + wasp/examples/simple_rps/main_test.go | 1 + wasp/examples/simple_vu/main_test.go | 1 + wasp/loki_client.go | 5 ++ wasp/loki_client_test.go | 4 +- wasp/otel_client.go | 8 +- wasp/perf_test.go | 16 ++-- wasp/wasp.go | 88 +++++++------------ 17 files changed, 120 insertions(+), 165 deletions(-) delete mode 100644 book/src/libs/wasp/how-to/run_included_tests.md diff --git a/book/src/SUMMARY.md b/book/src/SUMMARY.md index f429f04bd..782a41dfd 100644 --- a/book/src/SUMMARY.md +++ b/book/src/SUMMARY.md @@ -94,7 +94,6 @@ - [Adding new storage]() - [How to](./libs/wasp/how-to/overview.md) - [Start local observability stack](./libs/wasp/how-to/start_local_observability_stack.md) - - [Try it out quickly](./libs/wasp/how-to/run_included_tests.md) - [Chose between RPS and VUs](./libs/wasp/how-to/chose_rps_vu.md) - [Configure requests per minute or hour](./libs/wasp/how-to/rps_per_minute.md) - [Define NFRs and check alerts](./libs/wasp/how-to/define_nfr_check_alerts.md) diff --git a/book/src/libs/wasp/how-to/overview.md b/book/src/libs/wasp/how-to/overview.md index b7a603fac..6f4b5997f 100644 --- a/book/src/libs/wasp/how-to/overview.md +++ b/book/src/libs/wasp/how-to/overview.md @@ -2,7 +2,6 @@ In this section we will deal with the most common issues or questions: * [How to start local observability stack?](./start_local_observability_stack.md) -* [How to try some tests quickly?](./run_included_tests.md) * [How to chose between RPS and VUs?](./chose_rps_vu.md) * [How to define NFRs and check alerts?](./define_nfr_check_alerts.md) * [How to use labels?](./use_labels.md) diff --git a/book/src/libs/wasp/how-to/run_included_tests.md b/book/src/libs/wasp/how-to/run_included_tests.md deleted file mode 100644 index 76c561ed4..000000000 --- a/book/src/libs/wasp/how-to/run_included_tests.md +++ /dev/null @@ -1,62 +0,0 @@ -# WASP - Try It Out Quickly - ---- - -## Prerequisites - -Ensure you have the following installed: -* [Golang](https://go.dev/doc/install) -* [Docker](https://docs.docker.com/get-docker/) -* [Nix](https://nixos.org/manual/nix/stable/installation/installation.html) -* [Loki and Grafana](./start_local_observability_stack.md) -* [Pyroscope](./start_local_observability_stack.md) - ---- - -### Install Dependencies with Nix - -To install dependencies with Nix, simply execute: - -```bash -nix develop -``` - ---- - -## Running Grafana and Loki Tests - -Assuming you have already started and configured the local observability stack, you can run sample Loki and Grafana tests with: - -```bash -make test_loki -``` - -Once the test is running, you can view the results in the [dashboard](http://localhost:3000/d/wasp/Wasp?orgId=1&refresh=5s&from=now-5m&to=now). - -> [!WARNING] -> If deploying to your own Grafana instance, verify the `DASHBOARD_FOLDER` and `DASHBOARD_NAME`. -> Defaults are the `LoadTests` directory, and the dashboard is named `Wasp`. - ---- - -## Running Pyroscope Tests - -If Grafana, Loki, and Pyroscope are already running, you can execute sample Pyroscope tests with: - -```bash -make test_pyro_rps -``` - -or - -```bash -make test_pyro_vu -``` - -During the test, you can view the results in the [Pyroscope dashboard](http://localhost:4040/). - ---- - -### Additional Debugging Option - -You can also add the `-trace trace.out` flag when running any of your tests with `go test` for additional tracing information. \ No newline at end of file diff --git a/book/src/libs/wasp/how-to/start_local_observability_stack.md b/book/src/libs/wasp/how-to/start_local_observability_stack.md index cb3680183..49fbee273 100644 --- a/book/src/libs/wasp/how-to/start_local_observability_stack.md +++ b/book/src/libs/wasp/how-to/start_local_observability_stack.md @@ -1,18 +1,19 @@ # WASP - How to Start Local Observability Stack -To execute all examples or tests locally, you need to configure a local observability stack. We have 2 versions of popular stacks: LGTM (Grafana, Loki, Prometheus) and VictoriaMetrics + OTEL (Grafana, VictoriaMetrics, VictoriaLogs, OTEL). +To execute all examples or tests locally, you need to configure a local observability stack. +We have 2 versions of popular stacks: LGTM (Grafana, Loki, Prometheus) and VictoriaMetrics + OTEL (Grafana, VictoriaMetrics, VictoriaLogs, OTEL). ---- ## LGTM ```bash just lgtm-up +cd examples/profiles && WASP_LOG_SEND_METHOD=loki go test -v -run TestNodeMixed && cd - just lgtm-down ``` -* [Dashboard](http://localhost:3000/d/wasp-victorialogs/wasp-victorialogs?orgId=1&from=now-5m&to=now&timezone=browser&var-go_test_name=$__all&var-gen_name=$__all&var-call_group=$__all&var-branch=$__all&var-commit=$__all&refresh=5s) +* [Dashboard](http://localhost:3000/d/wasp-loki/wasp-loki?orgId=1&from=now-5m&to=now&timezone=browser&var-go_test_name=$__all&var-gen_name=$__all&var-branch=$__all&var-commit=$__all&var-call_group=$__all&refresh=5s) Don't forget to remove the stack when you are done! @@ -20,6 +21,7 @@ Don't forget to remove the stack when you are done! ```bash just victoria-up +cd examples/profiles && WASP_LOG_SEND_METHOD=otel go test -v -run TestNodeMixed && cd - just victoria-down ``` diff --git a/framework/go.sum b/framework/go.sum index 967e7c8c4..bdded4b8c 100644 --- a/framework/go.sum +++ b/framework/go.sum @@ -117,6 +117,8 @@ github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 h1:6lhrsTEnloDPXye github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM= +github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= @@ -405,6 +407,8 @@ github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKt github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU= github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248= github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= github.com/hashicorp/consul/api v1.31.2 h1:NicObVJHcCmyOIl7Z9iHPvvFrocgTYo9cITSGg0/7pw= github.com/hashicorp/consul/api v1.31.2/go.mod h1:Z8YgY0eVPukT/17ejW+l+C7zJmKwgPHtjU1q16v/Y40= github.com/hashicorp/consul/sdk v0.16.2 h1:cGX/djeEe9r087ARiKVWwVWCF64J+yW0G6ftZMZYbj0= @@ -886,16 +890,26 @@ go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0. go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.59.0/go.mod h1:54CaSNqYEXvpzDh8KPjiMVoWm60t5R0dZRt0leEPgAs= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU= +go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.20.0 h1:owlhcJ3QO3X0YTDTCcDZ4V+6aVDkWbNmBoQ5NUp7Oww= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.20.0/go.mod h1:MP4eemTiI9zC8fgg+DYynhYDYf3ba72S376TvP+Ye0Q= +go.opentelemetry.io/otel/log v0.20.0 h1:/5i0vuHxCLWUfChWG41K9wkM0jafruPw9NU1/RCJirs= +go.opentelemetry.io/otel/log v0.20.0/go.mod h1:wOcMcjsZpG8x7Bak7IhSi/lg8wscV2C1VdrKCLPlt0E= +go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc= +go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo= +go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58= +go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0= +go.opentelemetry.io/otel/sdk/log v0.20.0 h1:vM3xI7TQgKPiSghe6urZtAkyFY7SodrSpC83CffDFuY= +go.opentelemetry.io/otel/sdk/log v0.20.0/go.mod h1:Knej2nmsTUzN79T2eeXdRsjjPcoxoq2pUyUHz9TFyyU= +go.opentelemetry.io/otel/sdk/log/logtest v0.20.0 h1:OqdRZ1guyzamK3M6LlRsmGqRrjkHWw6WZOKKli5ELpg= +go.opentelemetry.io/otel/sdk/log/logtest v0.20.0/go.mod h1:PuMIlm7zAt7c3z8zfOI5ox4iT1Z87We+PF6YoINux/M= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk= +go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE= +go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g= +go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -916,8 +930,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= -golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= +golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= +golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA= golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU= @@ -926,8 +940,8 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c= -golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU= +golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM= +golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -944,8 +958,8 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= -golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo= -golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y= +golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= +golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= @@ -995,17 +1009,17 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= -golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= +golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= -golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM= +golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4= +golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= -golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= +golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= +golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1017,8 +1031,8 @@ golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc= -golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg= +golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= +golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1033,18 +1047,18 @@ google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoA google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200324203455-a04cca1dde73/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 h1:tu/dtnW1o3wfaxCOjSLn5IRX4YDcJrtlpzYkhHhGaC4= -google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171/go.mod h1:M5krXqk4GhBKvB596udGL3UyjL4I1+cTbK0orROM9ng= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 h1:ggcbiqK8WWh6l1dnltU4BgWGIGo+EVYxCaAPih/zQXQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= +google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.81.0 h1:W3G9N3KQf3BU+YuCtGKJk0CmxQNbAISICD/9AORxLIw= -google.golang.org/grpc v1.81.0/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= +google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/wasp/examples/profiles/node_background_load_test.go b/wasp/examples/profiles/node_background_load_test.go index a3156596b..31c72d88a 100644 --- a/wasp/examples/profiles/node_background_load_test.go +++ b/wasp/examples/profiles/node_background_load_test.go @@ -32,6 +32,7 @@ func TestBackgroundLoadSimple(t *testing.T) { Schedule: zetaSchedule, Gun: NewExampleHTTPGun(srv.URL()), Labels: labels, + LokiConfig: wasp.NewEnvLokiConfig(), OTELConfig: wasp.NewEnvOTELConfig(), })) @@ -59,6 +60,7 @@ func TestBackgroundLoadSimple(t *testing.T) { Schedule: etaSchedule, VU: NewExampleScenario(srv.URL()), Labels: labels, + LokiConfig: wasp.NewEnvLokiConfig(), OTELConfig: wasp.NewEnvOTELConfig(), })). Add(wasp.NewGenerator(&wasp.Config{ @@ -68,6 +70,7 @@ func TestBackgroundLoadSimple(t *testing.T) { Schedule: iotaSchedule, VU: NewExampleScenario(srv.URL()), Labels: labels, + LokiConfig: wasp.NewEnvLokiConfig(), OTELConfig: wasp.NewEnvOTELConfig(), })). Run(true) @@ -108,6 +111,7 @@ func TestBackgroundLoadGoRoutines(t *testing.T) { Schedule: zetaSchedule, Gun: NewExampleHTTPGun(srv.URL()), Labels: labels, + LokiConfig: wasp.NewEnvLokiConfig(), OTELConfig: wasp.NewEnvOTELConfig(), })) @@ -137,6 +141,7 @@ func TestBackgroundLoadGoRoutines(t *testing.T) { Schedule: etaSchedule, VU: NewExampleScenario(srv.URL()), Labels: labels, + LokiConfig: wasp.NewEnvLokiConfig(), OTELConfig: wasp.NewEnvOTELConfig(), })). Add(wasp.NewGenerator(&wasp.Config{ @@ -146,6 +151,7 @@ func TestBackgroundLoadGoRoutines(t *testing.T) { Schedule: iotaSchedule, VU: NewExampleScenario(srv.URL()), Labels: labels, + LokiConfig: wasp.NewEnvLokiConfig(), OTELConfig: wasp.NewEnvOTELConfig(), })). Run(true) @@ -192,6 +198,7 @@ func TestParallelLoad(t *testing.T) { GenName: "Kappa", Labels: labels, Gun: NewExampleHTTPGun(srv.URL()), + LokiConfig: wasp.NewEnvLokiConfig(), OTELConfig: wasp.NewEnvOTELConfig(), }) @@ -203,6 +210,7 @@ func TestParallelLoad(t *testing.T) { GenName: "Lambda", Labels: labels, VU: NewExampleScenario(srv.URL()), + LokiConfig: wasp.NewEnvLokiConfig(), OTELConfig: wasp.NewEnvOTELConfig(), }) require.NoError(t, err) @@ -214,6 +222,7 @@ func TestParallelLoad(t *testing.T) { Labels: labels, // here both VUs use the same VirtualUser implementation to keep it simple, but in a real-world use case they would different ones VU: NewExampleScenario(srv.URL()), + LokiConfig: wasp.NewEnvLokiConfig(), OTELConfig: wasp.NewEnvOTELConfig(), }) require.NoError(t, err) diff --git a/wasp/examples/profiles/node_rps_test.go b/wasp/examples/profiles/node_rps_test.go index 020272dc9..8c9ce47aa 100644 --- a/wasp/examples/profiles/node_rps_test.go +++ b/wasp/examples/profiles/node_rps_test.go @@ -30,6 +30,7 @@ func TestNodeRPS(t *testing.T) { ), Gun: NewExampleHTTPGun(srv.URL()), Labels: labels, + LokiConfig: wasp.NewEnvLokiConfig(), OTELConfig: wasp.NewEnvOTELConfig(), })). Add(wasp.NewGenerator(&wasp.Config{ @@ -42,6 +43,7 @@ func TestNodeRPS(t *testing.T) { ), Gun: NewExampleHTTPGun(srv.URL()), Labels: labels, + LokiConfig: wasp.NewEnvLokiConfig(), OTELConfig: wasp.NewEnvOTELConfig(), })). Run(true) diff --git a/wasp/examples/profiles/node_vu_grafana_opts_test.go b/wasp/examples/profiles/node_vu_grafana_opts_test.go index c014d6b62..6dd627505 100644 --- a/wasp/examples/profiles/node_vu_grafana_opts_test.go +++ b/wasp/examples/profiles/node_vu_grafana_opts_test.go @@ -27,6 +27,7 @@ func TestGrafanaOptsVU(t *testing.T) { Schedule: wasp.Steps(1, 1, 10, 30*time.Second), VU: NewExampleScenario(srv.URL()), Labels: labels, + LokiConfig: wasp.NewEnvLokiConfig(), OTELConfig: wasp.NewEnvOTELConfig(), })). Add(wasp.NewGenerator(&wasp.Config{ @@ -36,6 +37,7 @@ func TestGrafanaOptsVU(t *testing.T) { Schedule: wasp.Steps(1, 2, 10, 30*time.Second), VU: NewExampleScenario(srv.URL()), Labels: labels, + LokiConfig: wasp.NewEnvLokiConfig(), OTELConfig: wasp.NewEnvOTELConfig(), })). WithGrafana(&wasp.GrafanaOpts{ diff --git a/wasp/examples/profiles/node_vu_test.go b/wasp/examples/profiles/node_vu_test.go index 15a588c97..2f3ed92c8 100644 --- a/wasp/examples/profiles/node_vu_test.go +++ b/wasp/examples/profiles/node_vu_test.go @@ -26,6 +26,7 @@ func TestNodeVU(t *testing.T) { Schedule: wasp.Steps(1, 1, 10, 30*time.Second), VU: NewExampleScenario(srv.URL()), Labels: labels, + LokiConfig: wasp.NewEnvLokiConfig(), OTELConfig: wasp.NewEnvOTELConfig(), })). Add(wasp.NewGenerator(&wasp.Config{ @@ -35,6 +36,7 @@ func TestNodeVU(t *testing.T) { Schedule: wasp.Steps(1, 2, 10, 30*time.Second), VU: NewExampleScenario(srv.URL()), Labels: labels, + LokiConfig: wasp.NewEnvLokiConfig(), OTELConfig: wasp.NewEnvOTELConfig(), })). Run(true) diff --git a/wasp/examples/scenario/main_test.go b/wasp/examples/scenario/main_test.go index aae43cce2..c277c21ae 100644 --- a/wasp/examples/scenario/main_test.go +++ b/wasp/examples/scenario/main_test.go @@ -27,6 +27,7 @@ func TestScenario(t *testing.T) { wasp.Plain(2, 30*time.Second), wasp.Plain(3, 30*time.Second), ), + LokiConfig: wasp.NewEnvLokiConfig(), OTELConfig: wasp.NewEnvOTELConfig(), })).Run(true) require.NoError(t, err) diff --git a/wasp/examples/simple_rps/main_test.go b/wasp/examples/simple_rps/main_test.go index d10b8157c..384a30dd7 100644 --- a/wasp/examples/simple_rps/main_test.go +++ b/wasp/examples/simple_rps/main_test.go @@ -29,6 +29,7 @@ func TestGun(t *testing.T) { Schedule: wasp.Plain(5, 60*time.Second), Gun: NewExampleHTTPGun(srv.URL()), Labels: labels, + LokiConfig: wasp.NewEnvLokiConfig(), OTELConfig: wasp.NewEnvOTELConfig(), }) if err != nil { diff --git a/wasp/examples/simple_vu/main_test.go b/wasp/examples/simple_vu/main_test.go index d8e368004..628e201f1 100644 --- a/wasp/examples/simple_vu/main_test.go +++ b/wasp/examples/simple_vu/main_test.go @@ -27,6 +27,7 @@ func TestVirtualUser(t *testing.T) { Schedule: wasp.Plain(5, 60*time.Second), VU: NewExampleWSVirtualUser(srv.URL()), Labels: labels, + LokiConfig: wasp.NewEnvLokiConfig(), OTELConfig: wasp.NewEnvOTELConfig(), }) if err != nil { diff --git a/wasp/loki_client.go b/wasp/loki_client.go index 48e7839d2..b509f642a 100644 --- a/wasp/loki_client.go +++ b/wasp/loki_client.go @@ -164,7 +164,12 @@ func LocalCTFObsConfig() *LokiConfig { } // NewEnvLokiConfig creates a LokiConfig populated with settings from environment variables. +// Returns nil unless LOG_SEND_METHOD=loki — this lets callers set both LokiConfig and +// OTELConfig on wasp.Config and have only the selected backend become non-nil. func NewEnvLokiConfig() *LokiConfig { + if logSendMethod() != LogSendMethodLoki { + return nil + } d := DefaultLokiConfig() if v := os.Getenv("LOKI_URL"); v != "" { d.URL = v diff --git a/wasp/loki_client_test.go b/wasp/loki_client_test.go index 5b8daefac..adfc430d2 100644 --- a/wasp/loki_client_test.go +++ b/wasp/loki_client_test.go @@ -18,7 +18,7 @@ func lokiLogTupleMsg() []interface{} { } func TestSmokeLokiFailIfURLIsNotResolving(t *testing.T) { - cfg := NewEnvLokiConfig() + cfg := DefaultLokiConfig() cfg.URL = "http://nothing:3000" _, err := NewLokiClient(cfg) require.Error(t, err) @@ -49,7 +49,7 @@ func TestLokiErrors(t *testing.T) { for _, tc := range tests { t.Run(tc.name, func(t *testing.T) { - cfg := NewEnvLokiConfig() + cfg := DefaultLokiConfig() cfg.MaxErrors = tc.maxErrors lc, err := NewLokiClient(cfg) require.NoError(t, err) diff --git a/wasp/otel_client.go b/wasp/otel_client.go index 1c450e7de..e76dfc27f 100644 --- a/wasp/otel_client.go +++ b/wasp/otel_client.go @@ -49,9 +49,13 @@ func DefaultOTELConfig() *OTELConfig { } // NewEnvOTELConfig creates an OTELConfig populated from environment variables. -// Recognized: OTEL_EXPORTER_OTLP_ENDPOINT, OTEL_EXPORTER_OTLP_INSECURE, -// OTEL_SERVICE_NAME. +// Recognized: OTEL_EXPORTER_OTLP_ENDPOINT, OTEL_EXPORTER_OTLP_INSECURE, OTEL_SERVICE_NAME. +// Returns nil unless LOG_SEND_METHOD is unset or "otel" — this lets callers set both +// LokiConfig and OTELConfig on wasp.Config and have only the selected backend become non-nil. func NewEnvOTELConfig() *OTELConfig { + if logSendMethod() != LogSendMethodOTEL { + return nil + } d := DefaultOTELConfig() if v := os.Getenv("OTEL_EXPORTER_OTLP_ENDPOINT"); v != "" { d.Endpoint = v diff --git a/wasp/perf_test.go b/wasp/perf_test.go index fb0c9d861..39c2864c1 100644 --- a/wasp/perf_test.go +++ b/wasp/perf_test.go @@ -65,7 +65,7 @@ func TestPyroscopeLocalTraceRPSCalls(t *testing.T) { pyroscope.TagWrapper(context.Background(), pyroscope.Labels("scope", "loadgen_impl"), func(c context.Context) { gen, err := NewGenerator(&Config{ T: t, - LokiConfig: NewEnvLokiConfig(), + LokiConfig: DefaultLokiConfig(), Labels: labels, CallTimeout: 100 * time.Millisecond, LoadType: RPS, @@ -89,7 +89,7 @@ func TestPyroscopeLocalTraceVUCalls(t *testing.T) { pyroscope.TagWrapper(context.Background(), pyroscope.Labels("scope", "loadgen_impl"), func(c context.Context) { gen, err := NewGenerator(&Config{ T: t, - LokiConfig: NewEnvLokiConfig(), + LokiConfig: DefaultLokiConfig(), Labels: labels, CallTimeout: 100 * time.Millisecond, LoadType: VU, @@ -111,7 +111,7 @@ func TestPerfRenderLokiRPSRun(t *testing.T) { t.Parallel() gen, err := NewGenerator(&Config{ T: t, - LokiConfig: NewEnvLokiConfig(), + LokiConfig: DefaultLokiConfig(), GenName: "rps", Labels: labels, CallTimeout: 100 * time.Millisecond, @@ -137,7 +137,7 @@ func TestPerfRenderLokiVUsRun(t *testing.T) { t.Parallel() gen, err := NewGenerator(&Config{ T: t, - LokiConfig: NewEnvLokiConfig(), + LokiConfig: DefaultLokiConfig(), GenName: "vu", Labels: labels, CallTimeout: 100 * time.Millisecond, @@ -165,7 +165,7 @@ func TestRenderLokiParallelGenerators(t *testing.T) { for i := 0; i < 50; i++ { p.Add(NewGenerator(&Config{ T: t, - LokiConfig: NewEnvLokiConfig(), + LokiConfig: DefaultLokiConfig(), GenName: fmt.Sprintf("rps-%d", i), Labels: labels, CallTimeout: 100 * time.Millisecond, @@ -190,7 +190,7 @@ func TestRenderLokiSpikeMaxLoadRun(t *testing.T) { t.Parallel() gen, err := NewGenerator(&Config{ T: t, - LokiConfig: NewEnvLokiConfig(), + LokiConfig: DefaultLokiConfig(), GenName: "spike", Labels: labels, CallTimeout: 100 * time.Millisecond, @@ -215,7 +215,7 @@ func TestRenderWS(t *testing.T) { gen, err := NewGenerator(&Config{ T: t, - LokiConfig: NewEnvLokiConfig(), + LokiConfig: DefaultLokiConfig(), GenName: "ws", Labels: labels, LoadType: VU, @@ -238,7 +238,7 @@ func TestRenderHTTP(t *testing.T) { gen, err := NewGenerator(&Config{ T: t, - LokiConfig: NewEnvLokiConfig(), + LokiConfig: DefaultLokiConfig(), GenName: "http", Labels: labels, LoadType: RPS, diff --git a/wasp/wasp.go b/wasp/wasp.go index 5fd59ca36..ca67fd81c 100644 --- a/wasp/wasp.go +++ b/wasp/wasp.go @@ -2,7 +2,6 @@ package wasp import ( "context" - "fmt" "math" "os" "sync" @@ -745,72 +744,56 @@ func (g *Generator) Stats() *Stats { return g.stats } -/* Log backend dispatch (Loki / OTEL) — selected at runtime via LOG_SEND_METHOD */ +/* Log backend dispatch (Loki / OTEL) */ -// hasLogBackend reports whether any log backend has been configured on this Generator. -func (g *Generator) hasLogBackend() bool { - return g.Cfg.LokiConfig != nil || g.Cfg.OTELConfig != nil -} - -// logSendMethod returns the configured log backend. Defaults to OTEL when -// LOG_SEND_METHOD is unset. Returns an error for any value that is not "otel" or "loki". -func (g *Generator) logSendMethod() (string, error) { +// logSendMethod returns the log backend selected via the LOG_SEND_METHOD env var. +// Defaults to "otel" when unset. Unknown values are logged as a warning and treated as the default. +// Used inside NewEnvLokiConfig / NewEnvOTELConfig to early-return nil when the corresponding +// backend isn't selected. +func logSendMethod() string { m := os.Getenv(LogSendMethodEnvVar) switch m { case "": - return LogSendMethodOTEL, nil // default - case LogSendMethodOTEL: - return LogSendMethodOTEL, nil - case LogSendMethodLoki: - return LogSendMethodLoki, nil + return LogSendMethodOTEL + case LogSendMethodOTEL, LogSendMethodLoki: + return m default: - return "", fmt.Errorf("unsupported %s value %q: expected %q or %q", LogSendMethodEnvVar, m, LogSendMethodOTEL, LogSendMethodLoki) + log.Warn(). + Str("value", m). + Str("expected", LogSendMethodOTEL+"|"+LogSendMethodLoki). + Msgf("unknown %s, defaulting to %q", LogSendMethodEnvVar, LogSendMethodOTEL) + return LogSendMethodOTEL } } -// handleResponsePayload dispatches a Response to the configured log backend. +// hasLogBackend reports whether any log backend has been configured on this Generator. +func (g *Generator) hasLogBackend() bool { + return g.loki != nil || g.otel != nil +} + +// handleResponsePayload dispatches a Response to whichever log backend was constructed. func (g *Generator) handleResponsePayload(r *Response) { - method, err := g.logSendMethod() - if err != nil { - g.Log.Err(err).Send() - g.Stop() - return - } - switch method { - case LogSendMethodOTEL: - if g.otel != nil { - g.handleOTELResponsePayload(r) - } - case LogSendMethodLoki: - if g.loki != nil { - g.handleLokiResponsePayload(r) - } + switch { + case g.otel != nil: + g.handleOTELResponsePayload(r) + case g.loki != nil: + g.handleLokiResponsePayload(r) } } -// handleStatsPayload dispatches a stats sample to the configured log backend. +// handleStatsPayload dispatches a stats sample to whichever log backend was constructed. func (g *Generator) handleStatsPayload() { - method, err := g.logSendMethod() - if err != nil { - g.Log.Err(err).Send() - g.Stop() - return - } - switch method { - case LogSendMethodOTEL: - if g.otel != nil { - g.handleOTELStatsPayload() - } - case LogSendMethodLoki: - if g.loki != nil { - g.handleLokiStatsPayload() - } + switch { + case g.otel != nil: + g.handleOTELStatsPayload() + case g.loki != nil: + g.handleLokiStatsPayload() } } // stopLogStream gracefully terminates whichever log backend is configured. func (g *Generator) stopLogStream() { - if g.loki != nil && g.Cfg.LokiConfig != nil && g.Cfg.LokiConfig.URL != "" { + if g.loki != nil { g.Log.Info().Msg("Stopping Loki") g.loki.StopNow() g.Log.Info().Msg("Loki exited") @@ -824,14 +807,7 @@ func (g *Generator) stopLogStream() { // sendResponsesToLogBackend streams response data to the configured log backend. func (g *Generator) sendResponsesToLogBackend() { - method, err := g.logSendMethod() - if err != nil { - g.Log.Err(err).Send() - g.Stop() - return - } g.Log.Info(). - Str("Method", method). Interface("DefaultLabels", g.Cfg.Labels). Msg("Streaming responses to log backend") g.dataWaitGroup.Add(1) From 1e04d1e38d774bee26c960b6ced221403db680e3 Mon Sep 17 00:00:00 2001 From: skudasov Date: Fri, 29 May 2026 13:11:10 +0200 Subject: [PATCH 03/15] rm grabana --- wasp/go.mod | 6 +----- wasp/go.sum | 8 -------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/wasp/go.mod b/wasp/go.mod index 7938ad4a5..7735f710a 100644 --- a/wasp/go.mod +++ b/wasp/go.mod @@ -43,7 +43,7 @@ require ( github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/grafana/grafana-foundation-sdk/go v0.0.0-20240326122733-6f96a993222b + github.com/grafana/grafana-foundation-sdk/go v0.0.0-20240326122733-6f96a993222b // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -82,7 +82,6 @@ require ( ) require ( - github.com/K-Phoen/grabana v0.22.2 github.com/coder/websocket v1.8.12 github.com/gin-gonic/gin v1.10.0 github.com/grafana/dskit v0.0.0-20241007172036-53283a0f6b41 @@ -108,7 +107,6 @@ require ( github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 // indirect github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect - github.com/K-Phoen/sdk v0.12.4 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver/v3 v3.4.0 // indirect @@ -191,8 +189,6 @@ require ( github.com/googleapis/gax-go/v2 v2.14.1 // indirect github.com/gorilla/mux v1.8.1 // indirect github.com/gorilla/websocket v1.5.3 // indirect - github.com/gosimple/slug v1.13.1 // indirect - github.com/gosimple/unidecode v1.0.1 // indirect github.com/grafana/gomemcache v0.0.0-20240229205252-cd6a66d6fb56 // indirect github.com/grafana/jsonparser v0.0.0-20241004153430-023329977675 // indirect github.com/grafana/loki/pkg/push v0.0.0-20240924133635-758364c7775f // indirect diff --git a/wasp/go.sum b/wasp/go.sum index dca6b8977..79d6f5704 100644 --- a/wasp/go.sum +++ b/wasp/go.sum @@ -38,10 +38,6 @@ github.com/Code-Hex/go-generics-cache v1.5.1/go.mod h1:qxcC9kRVrct9rHeiYpFWSoW1v github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= -github.com/K-Phoen/grabana v0.22.2 h1:tMiSvcKHnDbXi3IgBCax2+sg5qL6x0G6wMURHgjGDag= -github.com/K-Phoen/grabana v0.22.2/go.mod h1:TbgU7jM55UlExzQyzu6AMiSUXr9jiaXmCu9AN28WXHk= -github.com/K-Phoen/sdk v0.12.4 h1:j2EYuBJm3zDTD0fGKACVFWxAXtkR0q5QzfVqxmHSeGQ= -github.com/K-Phoen/sdk v0.12.4/go.mod h1:qmM0wO23CtoDux528MXPpYvS4XkRWkWX6rvX9Za8EVU= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= @@ -408,10 +404,6 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gosimple/slug v1.13.1 h1:bQ+kpX9Qa6tHRaK+fZR0A0M2Kd7Pa5eHPPsb1JpHD+Q= -github.com/gosimple/slug v1.13.1/go.mod h1:UiRaFH+GEilHstLUmcBgWcI42viBN7mAb818JrYOeFQ= -github.com/gosimple/unidecode v1.0.1 h1:hZzFTMMqSswvf0LBJZCZgThIZrpDHFXux9KeGmn6T/o= -github.com/gosimple/unidecode v1.0.1/go.mod h1:CP0Cr1Y1kogOtx0bJblKzsVWrqYaqfNOnHzpgWw4Awc= github.com/grafana/dskit v0.0.0-20241007172036-53283a0f6b41 h1:a4O59OU3FJZ+EJUVnlvvNTvdAc4uRN1P6EaGwqL9CnA= github.com/grafana/dskit v0.0.0-20241007172036-53283a0f6b41/go.mod h1:SPLNCARd4xdjCkue0O6hvuoveuS1dGJjDnfxYe405YQ= github.com/grafana/gomemcache v0.0.0-20240229205252-cd6a66d6fb56 h1:X8IKQ0wu40wpvYcKfBcc5T4QnhdQjUhtUtB/1CY89lE= From 5086509a52953eb2be832c938b98c290d0e1e53f Mon Sep 17 00:00:00 2001 From: skudasov Date: Fri, 29 May 2026 13:12:26 +0200 Subject: [PATCH 04/15] gomods --- book/go.mod | 16 ++-- book/go.sum | 40 ++++----- .../gql/internal/generated/generated.go | 1 + framework/components/chiprouter/go.mod | 18 ++-- framework/components/chiprouter/go.sum | 44 +++++----- framework/components/dockercompose/go.mod | 28 +++--- framework/components/dockercompose/go.sum | 62 ++++++------- framework/components/fake/go.mod | 16 ++-- framework/components/fake/go.sum | 40 ++++----- framework/examples/chip_ingress/go.mod | 28 +++--- framework/examples/chip_ingress/go.sum | 62 ++++++------- framework/examples/chip_router/go.mod | 14 +-- framework/examples/chip_router/go.sum | 36 ++++---- framework/examples/myproject/go.mod | 34 ++++--- framework/examples/myproject/go.sum | 88 ++++++++++--------- framework/examples/myproject_cll/go.mod | 20 ++--- framework/examples/myproject_cll/go.sum | 48 +++++----- framework/go.mod | 34 ++++--- 18 files changed, 325 insertions(+), 304 deletions(-) diff --git a/book/go.mod b/book/go.mod index e937a26f0..15b9963d4 100644 --- a/book/go.mod +++ b/book/go.mod @@ -51,7 +51,7 @@ require ( github.com/testcontainers/testcontainers-go v0.42.0 // indirect github.com/x448/float16 v0.8.4 // indirect golang.org/x/oauth2 v0.36.0 // indirect - golang.org/x/term v0.40.0 // indirect + golang.org/x/term v0.43.0 // indirect golang.org/x/time v0.11.0 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect @@ -144,16 +144,16 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect - go.opentelemetry.io/otel v1.43.0 // indirect - go.opentelemetry.io/otel/metric v1.43.0 // indirect - go.opentelemetry.io/otel/trace v1.43.0 // indirect + go.opentelemetry.io/otel v1.44.0 // indirect + go.opentelemetry.io/otel/metric v1.44.0 // indirect + go.opentelemetry.io/otel/trace v1.44.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.11.0 // indirect - golang.org/x/crypto v0.48.0 // indirect - golang.org/x/net v0.51.0 // indirect + golang.org/x/crypto v0.51.0 // indirect + golang.org/x/net v0.55.0 // indirect golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.42.0 // indirect - golang.org/x/text v0.34.0 // indirect + golang.org/x/sys v0.45.0 // indirect + golang.org/x/text v0.37.0 // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/guregu/null.v4 v4.0.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/book/go.sum b/book/go.sum index 3ff9da2ea..323888f53 100644 --- a/book/go.sum +++ b/book/go.sum @@ -447,16 +447,16 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= +go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU= +go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc= +go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc= +go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo= +go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58= +go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0= go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk= +go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/arch v0.11.0 h1:KXV8WWKCXm6tRpLirl2szsO5j/oOODwZf4hATmGVNs4= @@ -464,8 +464,8 @@ golang.org/x/arch v0.11.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= -golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= +golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= +golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA= golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU= @@ -488,8 +488,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo= -golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y= +golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= +golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= @@ -524,19 +524,19 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= -golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= +golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= -golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM= +golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4= +golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= -golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= +golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= +golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -548,8 +548,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc= -golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg= +golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= +golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/framework/clclient/gql/internal/generated/generated.go b/framework/clclient/gql/internal/generated/generated.go index ddba48219..e1ab57d5a 100644 --- a/framework/clclient/gql/internal/generated/generated.go +++ b/framework/clclient/gql/internal/generated/generated.go @@ -8,6 +8,7 @@ import ( "fmt" "github.com/Khan/genqlient/graphql" + "github.com/smartcontractkit/chainlink-testing-framework/framework/clclient/gql/gqlscalar" ) diff --git a/framework/components/chiprouter/go.mod b/framework/components/chiprouter/go.mod index b8c03d2e5..453ab050d 100644 --- a/framework/components/chiprouter/go.mod +++ b/framework/components/chiprouter/go.mod @@ -13,7 +13,7 @@ require ( github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.8 github.com/testcontainers/testcontainers-go v0.42.0 golang.org/x/sync v0.20.0 - google.golang.org/grpc v1.81.0 + google.golang.org/grpc v1.81.1 ) require ( @@ -71,17 +71,17 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect - go.opentelemetry.io/otel v1.43.0 // indirect - go.opentelemetry.io/otel/metric v1.43.0 // indirect - go.opentelemetry.io/otel/trace v1.43.0 // indirect + go.opentelemetry.io/otel v1.44.0 // indirect + go.opentelemetry.io/otel/metric v1.44.0 // indirect + go.opentelemetry.io/otel/trace v1.44.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.49.0 // indirect + golang.org/x/crypto v0.51.0 // indirect golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect - golang.org/x/net v0.52.0 // indirect - golang.org/x/sys v0.42.0 // indirect - golang.org/x/text v0.35.0 // indirect + golang.org/x/net v0.55.0 // indirect + golang.org/x/sys v0.45.0 // indirect + golang.org/x/text v0.37.0 // indirect golang.org/x/time v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/framework/components/chiprouter/go.sum b/framework/components/chiprouter/go.sum index 7e9312d9c..c323eab93 100644 --- a/framework/components/chiprouter/go.sum +++ b/framework/components/chiprouter/go.sum @@ -225,24 +225,24 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= +go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU= +go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc= +go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc= +go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo= +go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58= +go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0= go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk= +go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4= -golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA= +golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= +golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= golang.org/x/exp v0.0.0-20260112195511-716be5621a96 h1:Z/6YuSHTLOHfNFdb8zVZomZr7cqNgTJvA8+Qz75D8gU= golang.org/x/exp v0.0.0-20260112195511-716be5621a96/go.mod h1:nzimsREAkjBCIEFtHiYkrJyT+2uy9YZJB7H1k68CXZU= -golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= -golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= +golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= +golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= @@ -254,20 +254,20 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= -golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU= -golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A= -golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8= -golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= +golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= +golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4= +golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk= +golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= +golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 h1:m8qni9SQFH0tJc1X0vmnpw/0t+AImlSvp30sEupozUg= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.0 h1:W3G9N3KQf3BU+YuCtGKJk0CmxQNbAISICD/9AORxLIw= -google.golang.org/grpc v1.81.0/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= +google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/framework/components/dockercompose/go.mod b/framework/components/dockercompose/go.mod index cd4362111..6cb2ba4f4 100644 --- a/framework/components/dockercompose/go.mod +++ b/framework/components/dockercompose/go.mod @@ -81,7 +81,7 @@ require ( github.com/google/go-querystring v1.1.0 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect @@ -150,32 +150,32 @@ require ( go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect - go.opentelemetry.io/otel v1.43.0 // indirect + go.opentelemetry.io/otel v1.44.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.42.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.43.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 // indirect - go.opentelemetry.io/otel/metric v1.43.0 // indirect - go.opentelemetry.io/otel/sdk v1.43.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect - go.opentelemetry.io/otel/trace v1.43.0 // indirect + go.opentelemetry.io/otel/metric v1.44.0 // indirect + go.opentelemetry.io/otel/sdk v1.44.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.44.0 // indirect + go.opentelemetry.io/otel/trace v1.44.0 // indirect go.opentelemetry.io/proto/otlp v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.1 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect go.yaml.in/yaml/v4 v4.0.0-rc.4 // indirect - golang.org/x/crypto v0.49.0 // indirect + golang.org/x/crypto v0.51.0 // indirect golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect - golang.org/x/net v0.52.0 // indirect + golang.org/x/net v0.55.0 // indirect golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.42.0 // indirect - golang.org/x/term v0.41.0 // indirect - golang.org/x/text v0.35.0 // indirect + golang.org/x/sys v0.45.0 // indirect + golang.org/x/term v0.43.0 // indirect + golang.org/x/text v0.37.0 // indirect golang.org/x/time v0.14.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect - google.golang.org/grpc v1.81.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect + google.golang.org/grpc v1.81.1 // indirect gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/framework/components/dockercompose/go.sum b/framework/components/dockercompose/go.sum index c934f1d1d..6133a365f 100644 --- a/framework/components/dockercompose/go.sum +++ b/framework/components/dockercompose/go.sum @@ -317,8 +317,8 @@ github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWS github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo= github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= github.com/hamba/avro v1.5.6/go.mod h1:3vNT0RLXXpFm2Tb/5KC71ZRJlOroggq1Rcitb6k4Fr8= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= @@ -600,8 +600,8 @@ go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0. go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0/go.mod h1:rjbQTDEPQymPE0YnRQp9/NuPwwtL0sesz/fnqRW/v84= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= +go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU= +go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.42.0 h1:MdKucPl/HbzckWWEisiNqMPhRrAOQX8r4jTuGr636gk= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.42.0/go.mod h1:RolT8tWtfHcjajEH5wFIZ4Dgh5jpPdFXYV9pTAk/qjc= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.43.0 h1:w1K+pCJoPpQifuVpsKamUdn9U0zM3xUziVOqsGksUrY= @@ -612,14 +612,16 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0 h1:zWWrB go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0/go.mod h1:2qXPNBX1OVRC0IwOnfo1ljoid+RD0QK3443EaqVlsOU= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 h1:3iZJKlCZufyRzPzlQhUIWVmfltrXuGyfjREgGP3UUjc= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0/go.mod h1:/G+nUPfhq2e+qiXMGxMwumDrP5jtzU+mWN7/sjT2rak= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc= +go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo= +go.opentelemetry.io/otel/metric/x v0.66.0 h1:YkCrx1zLOChi9ZcZ6euupOcsgzbVlec7D/xoEU1+cTA= +go.opentelemetry.io/otel/metric/x v0.66.0/go.mod h1:d1+BDj9t96do0/1LoU1ayfCv79ZgNE41qbhBvnMOBZk= +go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58= +go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk= +go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g= go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk= @@ -640,8 +642,8 @@ go.yaml.in/yaml/v4 v4.0.0-rc.4/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfP golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4= -golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA= +golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= +golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20260112195511-716be5621a96 h1:Z/6YuSHTLOHfNFdb8zVZomZr7cqNgTJvA8+Qz75D8gU= golang.org/x/exp v0.0.0-20260112195511-716be5621a96/go.mod h1:nzimsREAkjBCIEFtHiYkrJyT+2uy9YZJB7H1k68CXZU= @@ -650,8 +652,8 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8= -golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w= +golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM= +golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -666,8 +668,8 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= -golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= +golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= +golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= @@ -700,17 +702,17 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= -golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= +golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU= -golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A= +golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4= +golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8= -golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= +golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= +golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -736,10 +738,10 @@ google.golang.org/genproto v0.0.0-20200324203455-a04cca1dde73/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20220503193339-ba3ae3f07e29/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= -google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA= -google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:7QBABkRtR8z+TEnmXTqIqwJLlzrZKVfAUm7tY3yGv0M= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 h1:m8qni9SQFH0tJc1X0vmnpw/0t+AImlSvp30sEupozUg= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= +google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= @@ -749,8 +751,8 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc v1.81.0 h1:W3G9N3KQf3BU+YuCtGKJk0CmxQNbAISICD/9AORxLIw= -google.golang.org/grpc v1.81.0/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= +google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/framework/components/fake/go.mod b/framework/components/fake/go.mod index abd1d2a93..b808cc2b3 100644 --- a/framework/components/fake/go.mod +++ b/framework/components/fake/go.mod @@ -98,19 +98,19 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect - go.opentelemetry.io/otel v1.43.0 // indirect - go.opentelemetry.io/otel/metric v1.43.0 // indirect + go.opentelemetry.io/otel v1.44.0 // indirect + go.opentelemetry.io/otel/metric v1.44.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect - go.opentelemetry.io/otel/trace v1.43.0 // indirect + go.opentelemetry.io/otel/trace v1.44.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.11.0 // indirect - golang.org/x/crypto v0.48.0 // indirect - golang.org/x/net v0.51.0 // indirect + golang.org/x/crypto v0.51.0 // indirect + golang.org/x/net v0.55.0 // indirect golang.org/x/oauth2 v0.36.0 // indirect golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.42.0 // indirect - golang.org/x/term v0.40.0 // indirect - golang.org/x/text v0.34.0 // indirect + golang.org/x/sys v0.45.0 // indirect + golang.org/x/term v0.43.0 // indirect + golang.org/x/text v0.37.0 // indirect golang.org/x/time v0.11.0 // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect diff --git a/framework/components/fake/go.sum b/framework/components/fake/go.sum index e24558f78..9dffbde21 100644 --- a/framework/components/fake/go.sum +++ b/framework/components/fake/go.sum @@ -283,16 +283,16 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= +go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU= +go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc= +go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc= +go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo= +go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58= +go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0= go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk= +go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/arch v0.11.0 h1:KXV8WWKCXm6tRpLirl2szsO5j/oOODwZf4hATmGVNs4= @@ -300,8 +300,8 @@ golang.org/x/arch v0.11.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= -golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= +golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= +golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA= golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -310,8 +310,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo= -golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y= +golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= +golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -329,22 +329,22 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= -golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= -golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM= +golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= +golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4= +golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= -golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= +golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= +golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc= -golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg= +golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= +golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/framework/examples/chip_ingress/go.mod b/framework/examples/chip_ingress/go.mod index c8f444da9..a1053ebba 100644 --- a/framework/examples/chip_ingress/go.mod +++ b/framework/examples/chip_ingress/go.mod @@ -79,7 +79,7 @@ require ( github.com/google/go-querystring v1.1.0 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect @@ -151,31 +151,31 @@ require ( go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect - go.opentelemetry.io/otel v1.43.0 // indirect + go.opentelemetry.io/otel v1.44.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.42.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.43.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 // indirect - go.opentelemetry.io/otel/metric v1.43.0 // indirect - go.opentelemetry.io/otel/sdk v1.43.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect - go.opentelemetry.io/otel/trace v1.43.0 // indirect + go.opentelemetry.io/otel/metric v1.44.0 // indirect + go.opentelemetry.io/otel/sdk v1.44.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.44.0 // indirect + go.opentelemetry.io/otel/trace v1.44.0 // indirect go.opentelemetry.io/proto/otlp v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.1 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/crypto v0.49.0 // indirect - golang.org/x/net v0.52.0 // indirect + golang.org/x/crypto v0.51.0 // indirect + golang.org/x/net v0.55.0 // indirect golang.org/x/oauth2 v0.36.0 // indirect golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.42.0 // indirect - golang.org/x/term v0.41.0 // indirect - golang.org/x/text v0.35.0 // indirect + golang.org/x/sys v0.45.0 // indirect + golang.org/x/term v0.43.0 // indirect + golang.org/x/text v0.37.0 // indirect golang.org/x/time v0.14.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect - google.golang.org/grpc v1.81.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect + google.golang.org/grpc v1.81.1 // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/framework/examples/chip_ingress/go.sum b/framework/examples/chip_ingress/go.sum index f2eb615b1..426e396e1 100644 --- a/framework/examples/chip_ingress/go.sum +++ b/framework/examples/chip_ingress/go.sum @@ -318,8 +318,8 @@ github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWS github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo= github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= github.com/hamba/avro v1.5.6/go.mod h1:3vNT0RLXXpFm2Tb/5KC71ZRJlOroggq1Rcitb6k4Fr8= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= @@ -597,8 +597,8 @@ go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0. go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0/go.mod h1:rjbQTDEPQymPE0YnRQp9/NuPwwtL0sesz/fnqRW/v84= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= +go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU= +go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.42.0 h1:MdKucPl/HbzckWWEisiNqMPhRrAOQX8r4jTuGr636gk= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.42.0/go.mod h1:RolT8tWtfHcjajEH5wFIZ4Dgh5jpPdFXYV9pTAk/qjc= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.43.0 h1:w1K+pCJoPpQifuVpsKamUdn9U0zM3xUziVOqsGksUrY= @@ -609,14 +609,16 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0 h1:zWWrB go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0/go.mod h1:2qXPNBX1OVRC0IwOnfo1ljoid+RD0QK3443EaqVlsOU= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 h1:3iZJKlCZufyRzPzlQhUIWVmfltrXuGyfjREgGP3UUjc= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0/go.mod h1:/G+nUPfhq2e+qiXMGxMwumDrP5jtzU+mWN7/sjT2rak= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc= +go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo= +go.opentelemetry.io/otel/metric/x v0.66.0 h1:YkCrx1zLOChi9ZcZ6euupOcsgzbVlec7D/xoEU1+cTA= +go.opentelemetry.io/otel/metric/x v0.66.0/go.mod h1:d1+BDj9t96do0/1LoU1ayfCv79ZgNE41qbhBvnMOBZk= +go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58= +go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk= +go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g= go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk= @@ -637,8 +639,8 @@ go.yaml.in/yaml/v4 v4.0.0-rc.4/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfP golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4= -golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA= +golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= +golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20260112195511-716be5621a96 h1:Z/6YuSHTLOHfNFdb8zVZomZr7cqNgTJvA8+Qz75D8gU= golang.org/x/exp v0.0.0-20260112195511-716be5621a96/go.mod h1:nzimsREAkjBCIEFtHiYkrJyT+2uy9YZJB7H1k68CXZU= @@ -647,8 +649,8 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8= -golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w= +golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM= +golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -662,8 +664,8 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= -golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= +golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= +golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= @@ -696,17 +698,17 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= -golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= +golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU= -golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A= +golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4= +golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8= -golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= +golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= +golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -731,10 +733,10 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20220503193339-ba3ae3f07e29/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= -google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA= -google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:7QBABkRtR8z+TEnmXTqIqwJLlzrZKVfAUm7tY3yGv0M= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 h1:m8qni9SQFH0tJc1X0vmnpw/0t+AImlSvp30sEupozUg= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= +google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= @@ -743,8 +745,8 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc v1.81.0 h1:W3G9N3KQf3BU+YuCtGKJk0CmxQNbAISICD/9AORxLIw= -google.golang.org/grpc v1.81.0/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= +google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/framework/examples/chip_router/go.mod b/framework/examples/chip_router/go.mod index 91200cc58..f894427be 100644 --- a/framework/examples/chip_router/go.mod +++ b/framework/examples/chip_router/go.mod @@ -76,14 +76,14 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect - go.opentelemetry.io/otel v1.43.0 // indirect - go.opentelemetry.io/otel/metric v1.43.0 // indirect - go.opentelemetry.io/otel/trace v1.43.0 // indirect + go.opentelemetry.io/otel v1.44.0 // indirect + go.opentelemetry.io/otel/metric v1.44.0 // indirect + go.opentelemetry.io/otel/trace v1.44.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.49.0 // indirect - golang.org/x/net v0.52.0 // indirect + golang.org/x/crypto v0.51.0 // indirect + golang.org/x/net v0.55.0 // indirect golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.42.0 // indirect - golang.org/x/text v0.35.0 // indirect + golang.org/x/sys v0.45.0 // indirect + golang.org/x/text v0.37.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/framework/examples/chip_router/go.sum b/framework/examples/chip_router/go.sum index f5d8ace72..e56869903 100644 --- a/framework/examples/chip_router/go.sum +++ b/framework/examples/chip_router/go.sum @@ -220,24 +220,24 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= +go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU= +go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc= +go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc= +go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo= +go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58= +go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0= go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk= +go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4= -golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA= +golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= +golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= golang.org/x/exp v0.0.0-20260112195511-716be5621a96 h1:Z/6YuSHTLOHfNFdb8zVZomZr7cqNgTJvA8+Qz75D8gU= golang.org/x/exp v0.0.0-20260112195511-716be5621a96/go.mod h1:nzimsREAkjBCIEFtHiYkrJyT+2uy9YZJB7H1k68CXZU= -golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0= -golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= +golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= +golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= @@ -249,12 +249,12 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= -golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU= -golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A= -golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8= -golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= +golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= +golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4= +golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk= +golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= +golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= diff --git a/framework/examples/myproject/go.mod b/framework/examples/myproject/go.mod index bd51ffdfc..0955100fc 100644 --- a/framework/examples/myproject/go.mod +++ b/framework/examples/myproject/go.mod @@ -28,6 +28,7 @@ require ( github.com/btcsuite/btcutil v1.0.2 // indirect github.com/bufbuild/protocompile v0.14.1 // indirect github.com/buger/goterm v1.0.4 // indirect + github.com/cenkalti/backoff/v5 v5.0.3 // indirect github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2 // indirect github.com/containerd/errdefs v1.0.0 // indirect github.com/containerd/errdefs/pkg v0.3.0 // indirect @@ -39,7 +40,7 @@ require ( github.com/evanphx/json-patch v5.6.0+incompatible // indirect github.com/go-ini/ini v1.67.0 // indirect github.com/go-jose/go-jose/v4 v4.1.4 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect github.com/jonboulle/clockwork v0.5.0 // indirect github.com/minio/crc64nvme v1.0.0 // indirect github.com/minio/md5-simd v1.1.2 // indirect @@ -57,9 +58,14 @@ require ( github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect github.com/tjhop/slog-gokit v0.1.3 // indirect github.com/urfave/cli v1.22.16 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.20.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.31.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.31.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 // indirect + go.opentelemetry.io/otel/log v0.20.0 // indirect + go.opentelemetry.io/otel/sdk v1.44.0 // indirect + go.opentelemetry.io/otel/sdk/log v0.20.0 // indirect + go.opentelemetry.io/proto/otlp v1.10.0 // indirect ) require ( @@ -285,9 +291,9 @@ require ( go.opentelemetry.io/collector/semconv v0.118.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.59.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect - go.opentelemetry.io/otel v1.43.0 // indirect - go.opentelemetry.io/otel/metric v1.43.0 // indirect - go.opentelemetry.io/otel/trace v1.43.0 // indirect + go.opentelemetry.io/otel v1.44.0 // indirect + go.opentelemetry.io/otel/metric v1.44.0 // indirect + go.opentelemetry.io/otel/trace v1.44.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/goleak v1.3.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -295,22 +301,22 @@ require ( go.uber.org/zap v1.27.0 // indirect go4.org/netipx v0.0.0-20230125063823-8449b0a6169f // indirect golang.org/x/arch v0.11.0 // indirect - golang.org/x/crypto v0.48.0 // indirect + golang.org/x/crypto v0.51.0 // indirect golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect - golang.org/x/mod v0.32.0 // indirect - golang.org/x/net v0.51.0 // indirect + golang.org/x/mod v0.35.0 // indirect + golang.org/x/net v0.55.0 // indirect golang.org/x/oauth2 v0.36.0 // indirect golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.42.0 // indirect - golang.org/x/term v0.40.0 // indirect - golang.org/x/text v0.34.0 // indirect + golang.org/x/sys v0.45.0 // indirect + golang.org/x/term v0.43.0 // indirect + golang.org/x/text v0.37.0 // indirect golang.org/x/time v0.11.0 // indirect - golang.org/x/tools v0.41.0 // indirect + golang.org/x/tools v0.44.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/api v0.221.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect - google.golang.org/grpc v1.81.0 + google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect + google.golang.org/grpc v1.81.1 google.golang.org/protobuf v1.36.11 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/guregu/null.v4 v4.0.0 // indirect diff --git a/framework/examples/myproject/go.sum b/framework/examples/myproject/go.sum index 98f7c867c..4a238562a 100644 --- a/framework/examples/myproject/go.sum +++ b/framework/examples/myproject/go.sum @@ -183,6 +183,8 @@ github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEe github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM= +github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/cp v1.1.1 h1:nCb6ZLdB7NRaqsm91JtQTAme2SKJzXVsdPIPkyJr1MU= github.com/cespare/cp v1.1.1/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= @@ -586,8 +588,8 @@ github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0 h1:FbSCl+KggFl+Ocym490i/E github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0/go.mod h1:qOchhhIlmRcqk/O9uCo/puJlyo07YINaIqdZfZG3Jkc= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is= @@ -1271,12 +1273,12 @@ go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0. go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.59.0/go.mod h1:54CaSNqYEXvpzDh8KPjiMVoWm60t5R0dZRt0leEPgAs= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= +go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU= +go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.0.0-20240823153156-2a54df7bffb9 h1:UiRNKd1OgqsLbFwE+wkAWTdiAxXtCBqKIHeBIse4FUA= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.0.0-20240823153156-2a54df7bffb9/go.mod h1:eqZlW3pJWhjyexnDPrdQxix1pn0wwhI4AO4GKpP/bMI= -go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.6.0 h1:QSKmLBzbFULSyHzOdO9JsN9lpE4zkrz1byYGmJecdVE= -go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.6.0/go.mod h1:sTQ/NH8Yrirf0sJ5rWqVu+oT82i4zL9FaF6rWcqnptM= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.20.0 h1:owlhcJ3QO3X0YTDTCcDZ4V+6aVDkWbNmBoQ5NUp7Oww= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.20.0/go.mod h1:MP4eemTiI9zC8fgg+DYynhYDYf3ba72S376TvP+Ye0Q= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.31.0 h1:FZ6ei8GFW7kyPYdxJaV2rgI6M+4tvZzhYsQ2wgyVC08= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.31.0/go.mod h1:MdEu/mC6j3D+tTEfvI15b5Ci2Fn7NneJ71YMoiS3tpI= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.31.0 h1:ZsXq73BERAiNuuFXYqP4MR5hBrjXfMGSO+Cx7qoOZiM= @@ -1293,20 +1295,22 @@ go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0 h1:BJee2iLkfRfl9l go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.28.0/go.mod h1:DIzlHs3DRscCIBU3Y9YSzPfScwnYnzfnCd4g8zA7bZc= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 h1:UGZ1QwZWY67Z6BmckTU+9Rxn04m2bD3gD6Mk0OIOCPk= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0/go.mod h1:fcwWuDuaObkkChiDlhEpSq9+X1C0omv+s5mBtToAQ64= -go.opentelemetry.io/otel/log v0.6.0 h1:nH66tr+dmEgW5y+F9LanGJUBYPrRgP4g2EkmPE3LeK8= -go.opentelemetry.io/otel/log v0.6.0/go.mod h1:KdySypjQHhP069JX0z/t26VHwa8vSwzgaKmXtIB3fJM= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/log v0.6.0 h1:4J8BwXY4EeDE9Mowg+CyhWVBhTSLXVXodiXxS/+PGqI= -go.opentelemetry.io/otel/sdk/log v0.6.0/go.mod h1:L1DN8RMAduKkrwRAFDEX3E3TLOq46+XMGSbUfHU/+vE= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= -go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A= -go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4= +go.opentelemetry.io/otel/log v0.20.0 h1:/5i0vuHxCLWUfChWG41K9wkM0jafruPw9NU1/RCJirs= +go.opentelemetry.io/otel/log v0.20.0/go.mod h1:wOcMcjsZpG8x7Bak7IhSi/lg8wscV2C1VdrKCLPlt0E= +go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc= +go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo= +go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58= +go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0= +go.opentelemetry.io/otel/sdk/log v0.20.0 h1:vM3xI7TQgKPiSghe6urZtAkyFY7SodrSpC83CffDFuY= +go.opentelemetry.io/otel/sdk/log v0.20.0/go.mod h1:Knej2nmsTUzN79T2eeXdRsjjPcoxoq2pUyUHz9TFyyU= +go.opentelemetry.io/otel/sdk/log/logtest v0.20.0 h1:OqdRZ1guyzamK3M6LlRsmGqRrjkHWw6WZOKKli5ELpg= +go.opentelemetry.io/otel/sdk/log/logtest v0.20.0/go.mod h1:PuMIlm7zAt7c3z8zfOI5ox4iT1Z87We+PF6YoINux/M= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk= +go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE= +go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g= +go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -1329,8 +1333,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= -golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= +golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= +golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA= golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU= @@ -1339,8 +1343,8 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c= -golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU= +golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM= +golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1358,8 +1362,8 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= -golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo= -golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y= +golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= +golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= @@ -1411,19 +1415,19 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= -golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 h1:O1cMQHRfwNpDfDJerqRoE2oD+AFlyid87D40L/OkkJo= -golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2/go.mod h1:b7fPSJ0pKZ3ccUh8gnTONJxhn3c/PS6tyzQvyqw4iA8= +golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= +golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/telemetry v0.0.0-20260409153401-be6f6cb8b1fa h1:efT73AJZfAAUV7SOip6pWGkwJDzIGiKBZGVzHYa+ve4= +golang.org/x/telemetry v0.0.0-20260409153401-be6f6cb8b1fa/go.mod h1:kHjTxDEnAu6/Nl9lDkzjWpR+bmKfxeiRuSDlsMb70gE= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= -golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM= +golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4= +golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= -golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= +golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= +golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1435,8 +1439,8 @@ golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc= -golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg= +golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= +golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1457,18 +1461,18 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200324203455-a04cca1dde73/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20250122153221-138b5a5a4fd4 h1:Pw6WnI9W/LIdRxqK7T6XGugGbHIRl5Q7q3BssH6xk4s= google.golang.org/genproto v0.0.0-20250122153221-138b5a5a4fd4/go.mod h1:qbZzneIOXSq+KFAFut9krLfRLZiFLzZL5u2t8SV83EE= -google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 h1:tu/dtnW1o3wfaxCOjSLn5IRX4YDcJrtlpzYkhHhGaC4= -google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171/go.mod h1:M5krXqk4GhBKvB596udGL3UyjL4I1+cTbK0orROM9ng= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 h1:ggcbiqK8WWh6l1dnltU4BgWGIGo+EVYxCaAPih/zQXQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= +google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.81.0 h1:W3G9N3KQf3BU+YuCtGKJk0CmxQNbAISICD/9AORxLIw= -google.golang.org/grpc v1.81.0/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= +google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/framework/examples/myproject_cll/go.mod b/framework/examples/myproject_cll/go.mod index 541fc607d..1efbebdab 100644 --- a/framework/examples/myproject_cll/go.mod +++ b/framework/examples/myproject_cll/go.mod @@ -124,22 +124,22 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect - go.opentelemetry.io/otel v1.43.0 // indirect - go.opentelemetry.io/otel/metric v1.43.0 // indirect - go.opentelemetry.io/otel/trace v1.43.0 // indirect + go.opentelemetry.io/otel v1.44.0 // indirect + go.opentelemetry.io/otel/metric v1.44.0 // indirect + go.opentelemetry.io/otel/trace v1.44.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/arch v0.11.0 // indirect - golang.org/x/crypto v0.48.0 // indirect + golang.org/x/crypto v0.51.0 // indirect golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect - golang.org/x/net v0.51.0 // indirect + golang.org/x/net v0.55.0 // indirect golang.org/x/oauth2 v0.36.0 // indirect golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.42.0 // indirect - golang.org/x/term v0.40.0 // indirect - golang.org/x/text v0.34.0 // indirect + golang.org/x/sys v0.45.0 // indirect + golang.org/x/term v0.43.0 // indirect + golang.org/x/text v0.37.0 // indirect golang.org/x/time v0.11.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect - google.golang.org/grpc v1.81.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect + google.golang.org/grpc v1.81.1 // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/guregu/null.v4 v4.0.0 // indirect diff --git a/framework/examples/myproject_cll/go.sum b/framework/examples/myproject_cll/go.sum index 59dac52b9..7f4809f11 100644 --- a/framework/examples/myproject_cll/go.sum +++ b/framework/examples/myproject_cll/go.sum @@ -372,16 +372,16 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= +go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU= +go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc= +go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc= +go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo= +go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58= +go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0= go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk= +go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/arch v0.11.0 h1:KXV8WWKCXm6tRpLirl2szsO5j/oOODwZf4hATmGVNs4= @@ -389,8 +389,8 @@ golang.org/x/arch v0.11.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= -golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= +golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= +golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA= golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -399,8 +399,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo= -golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y= +golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= +golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -418,32 +418,32 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= -golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= -golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM= +golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= +golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4= +golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= -golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= +golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= +golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc= -golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg= +golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= +golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 h1:ggcbiqK8WWh6l1dnltU4BgWGIGo+EVYxCaAPih/zQXQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.0 h1:W3G9N3KQf3BU+YuCtGKJk0CmxQNbAISICD/9AORxLIw= -google.golang.org/grpc v1.81.0/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= +google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/framework/go.mod b/framework/go.mod index e4179a979..50cd0a04c 100644 --- a/framework/go.mod +++ b/framework/go.mod @@ -36,12 +36,12 @@ require ( github.com/stretchr/testify v1.11.1 github.com/testcontainers/testcontainers-go v0.42.0 github.com/urfave/cli/v2 v2.27.7 - go.opentelemetry.io/otel v1.43.0 - go.opentelemetry.io/otel/sdk v1.43.0 - go.opentelemetry.io/otel/trace v1.43.0 + go.opentelemetry.io/otel v1.44.0 + go.opentelemetry.io/otel/sdk v1.44.0 + go.opentelemetry.io/otel/trace v1.44.0 go.uber.org/multierr v1.11.0 golang.org/x/sync v0.20.0 - google.golang.org/grpc v1.81.0 + google.golang.org/grpc v1.81.1 gopkg.in/guregu/null.v4 v4.0.0 k8s.io/api v0.32.3 k8s.io/apimachinery v0.32.3 @@ -78,6 +78,7 @@ require ( github.com/bytedance/sonic/loader v0.1.1 // indirect github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect + github.com/cenkalti/backoff/v5 v5.0.3 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cloudwego/base64x v0.1.4 // indirect github.com/cloudwego/iasm v0.2.0 // indirect @@ -156,6 +157,7 @@ require ( github.com/grafana/loki/v3 v3.0.0-20250221202516-b37eefe24f82 // indirect github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect github.com/hashicorp/consul/api v1.31.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect @@ -278,26 +280,30 @@ require ( go.opentelemetry.io/collector/semconv v0.118.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.59.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect - go.opentelemetry.io/otel/metric v1.43.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.20.0 // indirect + go.opentelemetry.io/otel/log v0.20.0 // indirect + go.opentelemetry.io/otel/metric v1.44.0 // indirect + go.opentelemetry.io/otel/sdk/log v0.20.0 // indirect + go.opentelemetry.io/proto/otlp v1.10.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/goleak v1.3.0 // indirect go.uber.org/ratelimit v0.3.1 // indirect go.uber.org/zap v1.27.0 // indirect go4.org/netipx v0.0.0-20230125063823-8449b0a6169f // indirect golang.org/x/arch v0.8.0 // indirect - golang.org/x/crypto v0.48.0 // indirect + golang.org/x/crypto v0.51.0 // indirect golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect - golang.org/x/mod v0.32.0 // indirect - golang.org/x/net v0.51.0 // indirect + golang.org/x/mod v0.35.0 // indirect + golang.org/x/net v0.55.0 // indirect golang.org/x/oauth2 v0.36.0 // indirect - golang.org/x/sys v0.42.0 // indirect - golang.org/x/term v0.40.0 // indirect - golang.org/x/text v0.34.0 // indirect + golang.org/x/sys v0.45.0 // indirect + golang.org/x/term v0.43.0 // indirect + golang.org/x/text v0.37.0 // indirect golang.org/x/time v0.11.0 // indirect - golang.org/x/tools v0.41.0 // indirect + golang.org/x/tools v0.44.0 // indirect google.golang.org/api v0.221.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect From 5a08bf2546c1da338e385a1eae72edad584ccf5e Mon Sep 17 00:00:00 2001 From: skudasov Date: Fri, 29 May 2026 13:31:02 +0200 Subject: [PATCH 05/15] fix lint --- wasp/loki_client.go | 2 +- wasp/perf_test.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wasp/loki_client.go b/wasp/loki_client.go index b509f642a..6ea801322 100644 --- a/wasp/loki_client.go +++ b/wasp/loki_client.go @@ -209,7 +209,7 @@ func NewLokiConfig(endpoint *string, tenant *string, basicAuth *string, token *s // It validates the configuration, sets up authentication, and prepares the client for interacting with Loki for logging purposes. func NewLokiClient(extCfg *LokiConfig) (*LokiClient, error) { if extCfg == nil || extCfg.URL == "" { - return nil, errors.New("Loki URL is empty") + return nil, errors.New("loki URL is empty") } _, err := http.Get(extCfg.URL) if err != nil { diff --git a/wasp/perf_test.go b/wasp/perf_test.go index 39c2864c1..ec02ac3ec 100644 --- a/wasp/perf_test.go +++ b/wasp/perf_test.go @@ -63,6 +63,7 @@ func TestPyroscopeLocalTraceRPSCalls(t *testing.T) { t.Run("trace test", func(t *testing.T) { t.Parallel() pyroscope.TagWrapper(context.Background(), pyroscope.Labels("scope", "loadgen_impl"), func(c context.Context) { + //nolint:contextcheck // NewGenerator does not accept a context; the pyroscope tag wrapper's ctx is for profile tagging only gen, err := NewGenerator(&Config{ T: t, LokiConfig: DefaultLokiConfig(), @@ -87,6 +88,7 @@ func TestPyroscopeLocalTraceVUCalls(t *testing.T) { t.Run("trace test", func(t *testing.T) { t.Parallel() pyroscope.TagWrapper(context.Background(), pyroscope.Labels("scope", "loadgen_impl"), func(c context.Context) { + //nolint:contextcheck // NewGenerator does not accept a context; the pyroscope tag wrapper's ctx is for profile tagging only gen, err := NewGenerator(&Config{ T: t, LokiConfig: DefaultLokiConfig(), From f84a3da5427a95be593d2363a3245300490269a1 Mon Sep 17 00:00:00 2001 From: skudasov Date: Fri, 29 May 2026 13:59:20 +0200 Subject: [PATCH 06/15] review part 1 --- wasp/loki_client.go | 2 -- wasp/otel_client.go | 3 -- wasp/wasp.go | 74 +++++++++++++++++++++------------------------ 3 files changed, 35 insertions(+), 44 deletions(-) diff --git a/wasp/loki_client.go b/wasp/loki_client.go index 6ea801322..a04d92456 100644 --- a/wasp/loki_client.go +++ b/wasp/loki_client.go @@ -164,8 +164,6 @@ func LocalCTFObsConfig() *LokiConfig { } // NewEnvLokiConfig creates a LokiConfig populated with settings from environment variables. -// Returns nil unless LOG_SEND_METHOD=loki — this lets callers set both LokiConfig and -// OTELConfig on wasp.Config and have only the selected backend become non-nil. func NewEnvLokiConfig() *LokiConfig { if logSendMethod() != LogSendMethodLoki { return nil diff --git a/wasp/otel_client.go b/wasp/otel_client.go index e76dfc27f..ffc91660f 100644 --- a/wasp/otel_client.go +++ b/wasp/otel_client.go @@ -49,9 +49,6 @@ func DefaultOTELConfig() *OTELConfig { } // NewEnvOTELConfig creates an OTELConfig populated from environment variables. -// Recognized: OTEL_EXPORTER_OTLP_ENDPOINT, OTEL_EXPORTER_OTLP_INSECURE, OTEL_SERVICE_NAME. -// Returns nil unless LOG_SEND_METHOD is unset or "otel" — this lets callers set both -// LokiConfig and OTELConfig on wasp.Config and have only the selected backend become non-nil. func NewEnvOTELConfig() *OTELConfig { if logSendMethod() != LogSendMethodOTEL { return nil diff --git a/wasp/wasp.go b/wasp/wasp.go index ca67fd81c..db07b387d 100644 --- a/wasp/wasp.go +++ b/wasp/wasp.go @@ -26,7 +26,7 @@ const ( DefaultGenName = "Generator" // LogSendMethodEnvVar selects the log backend used by the Generator at runtime. - // Accepted values: "otel" (default) or "loki". Any other value returns an error. + // Accepted values: "otel" (default) or "loki". LogSendMethodEnvVar = "WASP_LOG_SEND_METHOD" LogSendMethodLoki = "loki" LogSendMethodOTEL = "otel" @@ -247,33 +247,33 @@ type ResponseData struct { // Generator generates load with some RPS type Generator struct { - Cfg *Config - sampler *Sampler - Log zerolog.Logger - labels model.LabelSet - rl atomic.Pointer[ratelimit.Limiter] - rpsLoopOnce *sync.Once - scheduleSegments []*Segment - currentSegmentMu *sync.Mutex - currentSegment *Segment - ResponsesWaitGroup *sync.WaitGroup - dataWaitGroup *sync.WaitGroup - ResponsesCtx context.Context - responsesCancel context.CancelFunc - dataCtx context.Context - dataCancel context.CancelFunc - gun Gun - vu VirtualUser - vus []VirtualUser - ResponsesChan chan *Response - Responses *Responses - responsesData *ResponseData - errsMu *sync.Mutex - errs *SliceBuffer[string] - stats *Stats - loki *LokiClient - lokiResponsesChan chan *Response - otel *OTELClient + Cfg *Config + sampler *Sampler + Log zerolog.Logger + labels model.LabelSet + rl atomic.Pointer[ratelimit.Limiter] + rpsLoopOnce *sync.Once + scheduleSegments []*Segment + currentSegmentMu *sync.Mutex + currentSegment *Segment + ResponsesWaitGroup *sync.WaitGroup + dataWaitGroup *sync.WaitGroup + ResponsesCtx context.Context + responsesCancel context.CancelFunc + dataCtx context.Context + dataCancel context.CancelFunc + gun Gun + vu VirtualUser + vus []VirtualUser + ResponsesChan chan *Response + Responses *Responses + responsesData *ResponseData + errsMu *sync.Mutex + errs *SliceBuffer[string] + stats *Stats + loki *LokiClient + backendResponsesChan chan *Response + otel *OTELClient } // NewGenerator initializes a Generator with the provided configuration. @@ -341,11 +341,11 @@ func NewGenerator(cfg *Config) (*Generator, error) { failResponsesMu: &sync.Mutex{}, FailResponses: NewSliceBuffer[*Response](cfg.CallResultBufLen), }, - errsMu: &sync.Mutex{}, - errs: NewSliceBuffer[string](cfg.CallResultBufLen), - stats: &Stats{}, - Log: l, - lokiResponsesChan: make(chan *Response, 50000), + errsMu: &sync.Mutex{}, + errs: NewSliceBuffer[string](cfg.CallResultBufLen), + stats: &Stats{}, + Log: l, + backendResponsesChan: make(chan *Response, 50000), } var err error if cfg.LokiConfig != nil { @@ -569,7 +569,7 @@ func (g *Generator) storeResponses(res *Response) { return } if g.hasLogBackend() { - g.lokiResponsesChan <- res + g.backendResponsesChan <- res } g.responsesData.okDataMu.Lock() g.responsesData.failResponsesMu.Lock() @@ -746,10 +746,6 @@ func (g *Generator) Stats() *Stats { /* Log backend dispatch (Loki / OTEL) */ -// logSendMethod returns the log backend selected via the LOG_SEND_METHOD env var. -// Defaults to "otel" when unset. Unknown values are logged as a warning and treated as the default. -// Used inside NewEnvLokiConfig / NewEnvOTELConfig to early-return nil when the corresponding -// backend isn't selected. func logSendMethod() string { m := os.Getenv(LogSendMethodEnvVar) switch m { @@ -818,7 +814,7 @@ func (g *Generator) sendResponsesToLogBackend() { case <-g.dataCtx.Done(): g.Log.Info().Msg("Log backend responses exited") return - case r := <-g.lokiResponsesChan: + case r := <-g.backendResponsesChan: g.handleResponsePayload(r) } } From f792f7cc5a390dd0bbde0edb75ff6e8f88565603 Mon Sep 17 00:00:00 2001 From: Sergey Kudasov Date: Fri, 29 May 2026 14:00:09 +0200 Subject: [PATCH 07/15] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- wasp/wasp.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wasp/wasp.go b/wasp/wasp.go index db07b387d..f9f7a594c 100644 --- a/wasp/wasp.go +++ b/wasp/wasp.go @@ -850,9 +850,10 @@ func (g *Generator) handleLokiResponsePayload(r *Response) { // we are removing time.Time{} because when it marshalled to string it creates N responses for some Loki queries // and to minimize the payload, duration is already calculated at that point ts := r.FinishedAt - r.StartedAt = nil - r.FinishedAt = nil - err := g.loki.HandleStruct(labels, *ts, r) + payload := *r + payload.StartedAt = nil + payload.FinishedAt = nil + err := g.loki.HandleStruct(labels, *ts, payload) if err != nil { g.Log.Err(err).Send() g.Stop() From 0554c589173cd52ec829896e4162345631949aae Mon Sep 17 00:00:00 2001 From: Sergey Kudasov Date: Fri, 29 May 2026 14:00:21 +0200 Subject: [PATCH 08/15] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- wasp/wasp.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wasp/wasp.go b/wasp/wasp.go index f9f7a594c..e5c73e6d9 100644 --- a/wasp/wasp.go +++ b/wasp/wasp.go @@ -881,9 +881,10 @@ func (g *Generator) handleOTELResponsePayload(r *Response) { CallGroupLabel: model.LabelValue(r.Group), }) ts := r.FinishedAt - r.StartedAt = nil - r.FinishedAt = nil - err := g.otel.HandleStruct(labels, *ts, r) + payload := *r + payload.StartedAt = nil + payload.FinishedAt = nil + err := g.otel.HandleStruct(labels, *ts, payload) if err != nil { g.Log.Err(err).Send() g.Stop() From 64ae1a916e7842508bd450a35bc8ce3f6abf5ca0 Mon Sep 17 00:00:00 2001 From: skudasov Date: Fri, 29 May 2026 14:30:14 +0200 Subject: [PATCH 09/15] debug metrics --- .../dashboard-victoria-metrics/dashboard.json | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/wasp/dashboard-victoria-metrics/dashboard.json b/wasp/dashboard-victoria-metrics/dashboard.json index 5e81c5e4c..0df43912b 100644 --- a/wasp/dashboard-victoria-metrics/dashboard.json +++ b/wasp/dashboard-victoria-metrics/dashboard.json @@ -71,8 +71,8 @@ { "refId": "A", "queryType": "stats", - "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:responses | stats by (go_test_name, gen_name) count() value", - "legendFormat": "{{go_test_name}} {{gen_name}} Responses" + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses | stats by (go_test_name, gen_name, call_group) count() value", + "legendFormat": "{{go_test_name}} {{gen_name}} {{call_group}} Responses" } ] }, @@ -179,19 +179,19 @@ { "refId": "Q99", "queryType": "statsRange", - "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name) quantile(0.99, duration) value", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name, call_group) quantile(0.99, duration) value", "legendFormat": "{{go_test_name}} {{gen_name}} Q99" }, { "refId": "Q95", "queryType": "statsRange", - "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name) quantile(0.95, duration) value", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name, call_group) quantile(0.95, duration) value", "legendFormat": "{{go_test_name}} {{gen_name}} Q95" }, { "refId": "Q50", "queryType": "statsRange", - "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name) quantile(0.5, duration) value", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name, call_group) quantile(0.5, duration) value", "legendFormat": "{{go_test_name}} {{gen_name}} Q50" } ] @@ -201,7 +201,7 @@ "type": "timeseries", "title": "Response latencies by call_group (latest per interval)", "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, - "gridPos": {"h": 8, "w": 24, "x": 0, "y": 13}, + "gridPos": {"h": 8, "w": 12, "x": 0, "y": 13}, "fieldConfig": {"defaults": {"unit": "ns"}}, "options": {"legend": {"displayMode": "list", "placement": "bottom"}}, "targets": [ @@ -213,6 +213,29 @@ } ] }, + { + "id": 13, + "type": "timeseries", + "title": "Responses/sec (Generator, CallGroup)", + "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, + "gridPos": {"h": 8, "w": 12, "x": 12, "y": 13}, + "fieldConfig": {"defaults": {"unit": "short"}}, + "options": {"legend": {"displayMode": "list", "placement": "bottom"}}, + "targets": [ + { + "refId": "A", + "queryType": "statsRange", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses | stats by (go_test_name, gen_name, call_group) count() value", + "legendFormat": "{{go_test_name}} {{gen_name}} {{call_group}} responses/sec" + }, + { + "refId": "B", + "queryType": "statsRange", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:responses | stats by (go_test_name, gen_name) count() value", + "legendFormat": "{{go_test_name}} {{gen_name}} Total responses/sec" + } + ] + }, { "collapsed": false, "gridPos": {"h": 1, "w": 24, "x": 0, "y": 21}, From a019ed01efa7928ff0a9c98e6da1780d86617bda Mon Sep 17 00:00:00 2001 From: skudasov Date: Fri, 29 May 2026 15:19:44 +0200 Subject: [PATCH 10/15] stats range --- .../dashboard-victoria-metrics/dashboard.json | 122 ++++++++++-------- 1 file changed, 70 insertions(+), 52 deletions(-) diff --git a/wasp/dashboard-victoria-metrics/dashboard.json b/wasp/dashboard-victoria-metrics/dashboard.json index 0df43912b..4a575f463 100644 --- a/wasp/dashboard-victoria-metrics/dashboard.json +++ b/wasp/dashboard-victoria-metrics/dashboard.json @@ -59,7 +59,7 @@ { "id": 3, "type": "stat", - "title": "Responses (Total)", + "title": "Responses/sec (Now)", "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, "gridPos": {"h": 4, "w": 4, "x": 8, "y": 1}, "options": { @@ -70,9 +70,9 @@ "targets": [ { "refId": "A", - "queryType": "stats", - "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses | stats by (go_test_name, gen_name, call_group) count() value", - "legendFormat": "{{go_test_name}} {{gen_name}} {{call_group}} Responses" + "queryType": "statsRange", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:responses | stats by (go_test_name, gen_name) count() value", + "legendFormat": "{{go_test_name}} {{gen_name}} Responses/sec" } ] }, @@ -92,7 +92,7 @@ "refId": "A", "queryType": "stats", "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(success) value", - "legendFormat": "{{go_test_name}} {{gen_name}} Success" + "legendFormat": "{{go_test_name}} {{gen_name}} Successful requests" } ] }, @@ -116,7 +116,7 @@ "refId": "A", "queryType": "stats", "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(failed) value", - "legendFormat": "{{go_test_name}} {{gen_name}} Failed" + "legendFormat": "{{go_test_name}} {{gen_name}} Errored requests" } ] }, @@ -140,14 +140,14 @@ "refId": "A", "queryType": "stats", "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(callTimeout) value", - "legendFormat": "{{go_test_name}} {{gen_name}} Timeouts" + "legendFormat": "{{go_test_name}} {{gen_name}} Timed out requests" } ] }, { "id": 10, "type": "timeseries", - "title": "RPS / VUs per schedule segment", + "title": "RPS/VUs per schedule segments", "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, "gridPos": {"h": 8, "w": 12, "x": 0, "y": 5}, "fieldConfig": {"defaults": {"custom": {"lineInterpolation": "stepBefore", "fillOpacity": 10}}}, @@ -170,69 +170,75 @@ { "id": 11, "type": "timeseries", - "title": "Latency quantiles (99, 95, 50)", + "title": "Responses/sec (Generator, CallGroup)", "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, "gridPos": {"h": 8, "w": 12, "x": 12, "y": 5}, - "fieldConfig": {"defaults": {"unit": "ns"}}, + "fieldConfig": {"defaults": {"unit": "short"}}, "options": {"legend": {"displayMode": "list", "placement": "bottom"}}, "targets": [ { - "refId": "Q99", - "queryType": "statsRange", - "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name, call_group) quantile(0.99, duration) value", - "legendFormat": "{{go_test_name}} {{gen_name}} Q99" - }, - { - "refId": "Q95", + "refId": "A", "queryType": "statsRange", - "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name, call_group) quantile(0.95, duration) value", - "legendFormat": "{{go_test_name}} {{gen_name}} Q95" + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses | stats by (go_test_name, gen_name, call_group) count() value", + "legendFormat": "{{go_test_name}} {{gen_name}} {{call_group}} responses/sec" }, { - "refId": "Q50", + "refId": "B", "queryType": "statsRange", - "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name, call_group) quantile(0.5, duration) value", - "legendFormat": "{{go_test_name}} {{gen_name}} Q50" + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:responses | stats by (go_test_name, gen_name) count() value", + "legendFormat": "{{go_test_name}} {{gen_name}} Total responses/sec" } ] }, { "id": 12, "type": "timeseries", - "title": "Response latencies by call_group (latest per interval)", + "title": "Latency quantiles over groups (99, 95, 50)", "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, "gridPos": {"h": 8, "w": 12, "x": 0, "y": 13}, "fieldConfig": {"defaults": {"unit": "ns"}}, "options": {"legend": {"displayMode": "list", "placement": "bottom"}}, "targets": [ { - "refId": "A", + "refId": "Q99", "queryType": "statsRange", - "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name, call_group) max(duration) value", - "legendFormat": "{{go_test_name}} {{gen_name}} {{call_group}}" + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name, call_group) quantile(0.99, duration) value", + "legendFormat": "{{go_test_name}} {{gen_name}} {{call_group}} Q 99" + }, + { + "refId": "Q95", + "queryType": "statsRange", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name, call_group) quantile(0.95, duration) value", + "legendFormat": "{{go_test_name}} {{gen_name}} {{call_group}} Q 95" + }, + { + "refId": "Q50", + "queryType": "statsRange", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name, call_group) quantile(0.5, duration) value", + "legendFormat": "{{go_test_name}} {{gen_name}} {{call_group}} Q 50" } ] }, { "id": 13, "type": "timeseries", - "title": "Responses/sec (Generator, CallGroup)", + "title": "Responses latencies by types over time (Generator, CallGroup)", "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, "gridPos": {"h": 8, "w": 12, "x": 12, "y": 13}, - "fieldConfig": {"defaults": {"unit": "short"}}, + "fieldConfig": {"defaults": {"unit": "ns"}}, "options": {"legend": {"displayMode": "list", "placement": "bottom"}}, "targets": [ { "refId": "A", "queryType": "statsRange", - "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses | stats by (go_test_name, gen_name, call_group) count() value", - "legendFormat": "{{go_test_name}} {{gen_name}} {{call_group}} responses/sec" + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name, call_group) max(duration) value", + "legendFormat": "{{go_test_name}} {{gen_name}} {{call_group}}" }, { "refId": "B", "queryType": "statsRange", - "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:responses | stats by (go_test_name, gen_name) count() value", - "legendFormat": "{{go_test_name}} {{gen_name}} Total responses/sec" + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:responses | unpack_json | stats by (go_test_name, gen_name) max(duration) value", + "legendFormat": "{{go_test_name}} {{gen_name}} all groups" } ] }, @@ -246,39 +252,51 @@ }, { "id": 20, - "type": "timeseries", - "title": "CallResult sampling (recorded vs skipped)", + "type": "stat", + "title": "Latest segment stats", "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, - "gridPos": {"h": 8, "w": 12, "x": 0, "y": 22}, - "options": {"legend": {"displayMode": "list", "placement": "bottom"}}, + "gridPos": {"h": 6, "w": 24, "x": 0, "y": 22}, + "fieldConfig": {"defaults": {"unit": "decbytes"}}, + "options": { + "reduceOptions": {"calcs": ["lastNotNull"], "fields": "", "values": false}, + "graphMode": "area", + "textMode": "value_and_name", + "colorMode": "value" + }, "targets": [ { - "refId": "REC", - "queryType": "statsRange", - "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(samples_recorded) value", - "legendFormat": "{{go_test_name}} {{gen_name}} recorded" + "refId": "A", + "queryType": "stats", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" | stats sum_len(_msg) value", + "legendFormat": "Overall logs size" }, { - "refId": "SKIP", + "refId": "B", "queryType": "statsRange", - "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(samples_skipped) value", - "legendFormat": "{{go_test_name}} {{gen_name}} skipped" + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" | stats sum_len(_msg) value", + "legendFormat": "Logs size per second" } ] }, { "id": 21, "type": "timeseries", - "title": "Logs ingest rate (records/interval)", + "title": "CallResult sampling (successful results)", "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, - "gridPos": {"h": 8, "w": 12, "x": 12, "y": 22}, + "gridPos": {"h": 8, "w": 24, "x": 0, "y": 28}, "options": {"legend": {"displayMode": "list", "placement": "bottom"}}, "targets": [ { - "refId": "A", - "queryType": "hits", - "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\"", - "legendFormat": "{{go_test_name}} {{gen_name}}" + "refId": "REC", + "queryType": "statsRange", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(samples_recorded) value", + "legendFormat": "{{go_test_name}} {{gen_name}} recorded" + }, + { + "refId": "SKIP", + "queryType": "statsRange", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(samples_skipped) value", + "legendFormat": "{{go_test_name}} {{gen_name}} skipped" } ] }, @@ -287,7 +305,7 @@ "type": "logs", "title": "Stats logs", "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, - "gridPos": {"h": 8, "w": 24, "x": 0, "y": 30}, + "gridPos": {"h": 8, "w": 24, "x": 0, "y": 36}, "options": {"showTime": true, "wrapLogMessage": true, "sortOrder": "Descending"}, "targets": [ { @@ -302,7 +320,7 @@ "type": "logs", "title": "Failed responses", "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, - "gridPos": {"h": 8, "w": 12, "x": 0, "y": 38}, + "gridPos": {"h": 8, "w": 12, "x": 0, "y": 44}, "options": {"showTime": true, "wrapLogMessage": true, "sortOrder": "Descending"}, "targets": [ { @@ -317,7 +335,7 @@ "type": "logs", "title": "Timed out responses", "datasource": {"type": "victoriametrics-logs-datasource", "uid": "victorialogs"}, - "gridPos": {"h": 8, "w": 12, "x": 12, "y": 38}, + "gridPos": {"h": 8, "w": 12, "x": 12, "y": 44}, "options": {"showTime": true, "wrapLogMessage": true, "sortOrder": "Descending"}, "targets": [ { From b88259d6f7e0a9a2facfd0489e0da165d7605199 Mon Sep 17 00:00:00 2001 From: skudasov Date: Fri, 29 May 2026 15:58:05 +0200 Subject: [PATCH 11/15] unify --- wasp/dashboard-victoria-metrics/dashboard.json | 6 +++--- wasp/dashboard/dashboard.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wasp/dashboard-victoria-metrics/dashboard.json b/wasp/dashboard-victoria-metrics/dashboard.json index 4a575f463..fca4daff1 100644 --- a/wasp/dashboard-victoria-metrics/dashboard.json +++ b/wasp/dashboard-victoria-metrics/dashboard.json @@ -91,7 +91,7 @@ { "refId": "A", "queryType": "stats", - "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(success) value", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses AND NOT _msg:\"\\\"failed\\\":true\" | stats by (go_test_name, gen_name) count() value", "legendFormat": "{{go_test_name}} {{gen_name}} Successful requests" } ] @@ -115,7 +115,7 @@ { "refId": "A", "queryType": "stats", - "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(failed) value", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses AND _msg:\"\\\"failed\\\":true\" | stats by (go_test_name, gen_name) count() value", "legendFormat": "{{go_test_name}} {{gen_name}} Errored requests" } ] @@ -139,7 +139,7 @@ { "refId": "A", "queryType": "stats", - "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND test_data_type:stats | unpack_json | stats by (go_test_name, gen_name) max(callTimeout) value", + "expr": "go_test_name:~\"${go_test_name:pipe}\" AND gen_name:~\"${gen_name:pipe}\" AND call_group:~\"${call_group:pipe}\" AND test_data_type:responses AND _msg:\"\\\"timeout\\\":true\" | stats by (go_test_name, gen_name) count() value", "legendFormat": "{{go_test_name}} {{gen_name}} Timed out requests" } ] diff --git a/wasp/dashboard/dashboard.json b/wasp/dashboard/dashboard.json index 27ba94bd5..bfcc997fb 100644 --- a/wasp/dashboard/dashboard.json +++ b/wasp/dashboard/dashboard.json @@ -91,7 +91,7 @@ { "refId": "A", "queryType": "instant", - "expr": "sum(max_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"stats\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap success [$__range]) by (node_id, go_test_name, gen_name)) by (__stream_shard__)", + "expr": "sum(count_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\", call_group=~\"${call_group:pipe}\"} !~ \"failed\\\":true\" [$__range])) by (node_id, go_test_name, gen_name)", "legendFormat": "{{go_test_name}} {{gen_name}} Successful requests" } ] @@ -115,7 +115,7 @@ { "refId": "A", "queryType": "instant", - "expr": "sum(max_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"stats\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap failed [$__range]) by (node_id, go_test_name, gen_name)) by (__stream_shard__)", + "expr": "sum(count_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\", call_group=~\"${call_group:pipe}\"} |~ \"failed\\\":true\" [$__range])) by (node_id, go_test_name, gen_name)", "legendFormat": "{{go_test_name}} {{gen_name}} Errored requests" } ] @@ -139,7 +139,7 @@ { "refId": "A", "queryType": "instant", - "expr": "sum(max_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"stats\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap callTimeout [$__range]) by (node_id, go_test_name, gen_name)) by (__stream_shard__)", + "expr": "sum(count_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\", call_group=~\"${call_group:pipe}\"} |~ \"timeout\\\":true\" [$__range])) by (node_id, go_test_name, gen_name)", "legendFormat": "{{go_test_name}} {{gen_name}} Timed out requests" } ] From 89b2d9ead2d0dc02e52f4b7d73c61d61be8b77e8 Mon Sep 17 00:00:00 2001 From: skudasov Date: Fri, 29 May 2026 16:24:42 +0200 Subject: [PATCH 12/15] simplify --- wasp/dashboard/dashboard.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wasp/dashboard/dashboard.json b/wasp/dashboard/dashboard.json index bfcc997fb..913904c1f 100644 --- a/wasp/dashboard/dashboard.json +++ b/wasp/dashboard/dashboard.json @@ -51,7 +51,7 @@ { "refId": "A", "queryType": "instant", - "expr": "sum(max_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"stats\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap current_instances [$__range]) by (node_id, go_test_name, gen_name)) by (__stream_shard__)", + "expr": "max_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"stats\", gen_name=~\"${gen_name:pipe}\"}\n| json\n| unwrap current_instances [$__range]) by (node_id, go_test_name, gen_name)", "legendFormat": "{{go_test_name}} {{gen_name}} VUs" } ] @@ -115,7 +115,7 @@ { "refId": "A", "queryType": "instant", - "expr": "sum(count_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\", call_group=~\"${call_group:pipe}\"} |~ \"failed\\\":true\" [$__range])) by (node_id, go_test_name, gen_name)", + "expr": "sum by (node_id, go_test_name, gen_name) (count_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\", call_group=~\"${call_group:pipe}\"} |~ \"failed\\\":true\" [$__range])) or sum by (node_id, go_test_name, gen_name) (count_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\", call_group=~\"${call_group:pipe}\"}[$__range])) * 0", "legendFormat": "{{go_test_name}} {{gen_name}} Errored requests" } ] @@ -139,7 +139,7 @@ { "refId": "A", "queryType": "instant", - "expr": "sum(count_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\", call_group=~\"${call_group:pipe}\"} |~ \"timeout\\\":true\" [$__range])) by (node_id, go_test_name, gen_name)", + "expr": "sum by (node_id, go_test_name, gen_name) (count_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\", call_group=~\"${call_group:pipe}\"} |~ \"timeout\\\":true\" [$__range])) or sum by (node_id, go_test_name, gen_name) (count_over_time({branch=~\"${branch:pipe}\", commit=~\"${commit:pipe}\", go_test_name=~\"${go_test_name:pipe}\", test_data_type=~\"responses\", gen_name=~\"${gen_name:pipe}\", call_group=~\"${call_group:pipe}\"}[$__range])) * 0", "legendFormat": "{{go_test_name}} {{gen_name}} Timed out requests" } ] From 2d3017f2a74f9972fa47f788dcbbd585e04baa1f Mon Sep 17 00:00:00 2001 From: skudasov Date: Fri, 29 May 2026 16:37:10 +0200 Subject: [PATCH 13/15] review fix --- book/src/libs/wasp/how-to/start_local_observability_stack.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/book/src/libs/wasp/how-to/start_local_observability_stack.md b/book/src/libs/wasp/how-to/start_local_observability_stack.md index 49fbee273..dcc309754 100644 --- a/book/src/libs/wasp/how-to/start_local_observability_stack.md +++ b/book/src/libs/wasp/how-to/start_local_observability_stack.md @@ -8,7 +8,7 @@ We have 2 versions of popular stacks: LGTM (Grafana, Loki, Prometheus) and Victo ## LGTM ```bash -just lgtm-up +just lgtm-up # from "wasp" directory cd examples/profiles && WASP_LOG_SEND_METHOD=loki go test -v -run TestNodeMixed && cd - just lgtm-down ``` @@ -20,7 +20,7 @@ Don't forget to remove the stack when you are done! ## VictoriaMetrics + OTEL ```bash -just victoria-up +just victoria-up # from "wasp" directory cd examples/profiles && WASP_LOG_SEND_METHOD=otel go test -v -run TestNodeMixed && cd - just victoria-down ``` From 0ade6a80938f759bf61d96e3f89eb96259974bba Mon Sep 17 00:00:00 2001 From: skudasov Date: Fri, 29 May 2026 16:39:24 +0200 Subject: [PATCH 14/15] review fix --- wasp/otel_client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wasp/otel_client.go b/wasp/otel_client.go index ffc91660f..4f774f081 100644 --- a/wasp/otel_client.go +++ b/wasp/otel_client.go @@ -148,7 +148,7 @@ func (m *OTELClient) Handle(ls model.LabelSet, t time.Time, body string) error { func (m *OTELClient) HandleStruct(ls model.LabelSet, t time.Time, st any) error { d, err := json.Marshal(st) if err != nil { - return fmt.Errorf("failed to marshal struct: %v", st) + return fmt.Errorf("failed to marshal struct %T: %w", st, err) } return m.Handle(ls, t, string(d)) } From 3b76ab33cebf7f31ad74f9e64d490e84bea4d230 Mon Sep 17 00:00:00 2001 From: skudasov Date: Fri, 29 May 2026 16:42:23 +0200 Subject: [PATCH 15/15] changeset --- wasp/.changeset/v1.52.0.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 wasp/.changeset/v1.52.0.md diff --git a/wasp/.changeset/v1.52.0.md b/wasp/.changeset/v1.52.0.md new file mode 100644 index 000000000..cdadccd9c --- /dev/null +++ b/wasp/.changeset/v1.52.0.md @@ -0,0 +1 @@ +- VictoriaLogs backend, dashboard, docs simplification and local stack for VictoriaMetrics \ No newline at end of file