From fa82070a38c4b318e3249de332def4d9de8556eb Mon Sep 17 00:00:00 2001 From: Raphael Simon Date: Thu, 26 Oct 2023 11:16:58 -0700 Subject: [PATCH] Update code to work with latest Goa --- example/weather/docker-compose/docker-compose-grafana.yaml | 2 +- example/weather/services/front/cmd/front/main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example/weather/docker-compose/docker-compose-grafana.yaml b/example/weather/docker-compose/docker-compose-grafana.yaml index ff38f5e4..b216fcfe 100644 --- a/example/weather/docker-compose/docker-compose-grafana.yaml +++ b/example/weather/docker-compose/docker-compose-grafana.yaml @@ -6,7 +6,7 @@ services: - ./agent/config:/etc/agent-config - /var/log:/var/log entrypoint: - - /bin/agent + - /bin/grafana-agent - -config.file=/etc/agent-config/agent.yaml - -prometheus.wal-directory=/tmp/agent/wal ports: diff --git a/example/weather/services/front/cmd/front/main.go b/example/weather/services/front/cmd/front/main.go index b41f29f9..a06f7be2 100644 --- a/example/weather/services/front/cmd/front/main.go +++ b/example/weather/services/front/cmd/front/main.go @@ -106,8 +106,8 @@ func main() { endpoints.Use(log.Endpoint) // 5. Create transport - debug.MountDebugLogEnabler(debug.Adapt(mux)) mux.Use(metrics.HTTP(ctx)) + debug.MountDebugLogEnabler(debug.Adapt(mux)) handler := trace.HTTP(ctx)(mux) // 4. Trace request handler = goahttpmiddleware.LogContext(log.AsGoaMiddlewareLogger)(handler) // 3. Log request and response handler = log.HTTP(ctx)(handler) // 2. Add logger to request context (with request ID key)