diff --git a/Makefile b/Makefile index 480ecf0f..d9ca6558 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ BIN_NAME :=krakend OS := $(shell uname | tr '[:upper:]' '[:lower:]') -VERSION := 2.6.2 +VERSION := 2.6.3 SCHEMA_VERSION := $(shell echo "${VERSION}" | cut -d '.' -f 1,2) GIT_COMMIT := $(shell git rev-parse --short=7 HEAD) PKGNAME := krakend diff --git a/go.mod b/go.mod index ffc2a86a..71ca69f7 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22 require ( github.com/gin-gonic/gin v1.9.1 github.com/go-contrib/uuid v1.2.0 - github.com/krakend/krakend-otel v0.4.0 + github.com/krakend/krakend-otel v0.5.0 github.com/krakendio/bloomfilter/v2 v2.0.4 github.com/krakendio/krakend-amqp/v2 v2.1.0 github.com/krakendio/krakend-audit v0.0.5 diff --git a/go.sum b/go.sum index 9786b416..fca36ccc 100644 --- a/go.sum +++ b/go.sum @@ -474,8 +474,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/krakend/go-auth0 v1.1.0 h1:3/OUeVB5vu94tZgU8gzO4gv1W0tV3/kmPSaEXQodYsM= github.com/krakend/go-auth0 v1.1.0/go.mod h1:lJtS6u8y1mai4lFcE3JC2oSDQaNo2aXexTS0cqTblZU= -github.com/krakend/krakend-otel v0.4.0 h1:ddOBQ0hZiGQgWIIx5MQGBqYnlQQ1ar+8cRWLwltmQ78= -github.com/krakend/krakend-otel v0.4.0/go.mod h1:IfbOfOfdSrYteKI1q8ZnVI2saiqCjJwbYuSWcKttqxc= +github.com/krakend/krakend-otel v0.5.0 h1:ixM2NMspcMUMCKzXLVcqUYUE5Cx+XikhGwWvZJymmcQ= +github.com/krakend/krakend-otel v0.5.0/go.mod h1:IfbOfOfdSrYteKI1q8ZnVI2saiqCjJwbYuSWcKttqxc= github.com/krakendio/binder v0.0.0-20230413105421-1bbe94e65f45 h1:5UbGH+Sa62LMtbBn6m3EEcaA4JFxaDd91X/X0SsZuO8= github.com/krakendio/binder v0.0.0-20230413105421-1bbe94e65f45/go.mod h1:VgJK/LM9NwyIxzYETGXQeRxdDg0IgBw4Fol58JVx2+4= github.com/krakendio/bloomfilter/v2 v2.0.4 h1:+FCe52Izx4mZgFevvifOMF+3WbbhmZT0xZnrnUE4C0U= diff --git a/tests/fixtures/specs/backend_301.json b/tests/fixtures/specs/backend_301.json index 57b6a2cb..d4477fa3 100644 --- a/tests/fixtures/specs/backend_301.json +++ b/tests/fixtures/specs/backend_301.json @@ -5,7 +5,7 @@ }, "out": { "status_code": 200, - "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=301\"],\"User-Agent\":[\"KrakenD Version 2.6.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"301\"]}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=301\"],\"User-Agent\":[\"KrakenD Version 2.6.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"301\"]}}", "header": { "content-type": ["application/json; charset=utf-8"], "Cache-Control": ["public, max-age=3600"], diff --git a/tests/fixtures/specs/backend_302.json b/tests/fixtures/specs/backend_302.json index e2200c78..beac106a 100644 --- a/tests/fixtures/specs/backend_302.json +++ b/tests/fixtures/specs/backend_302.json @@ -5,7 +5,7 @@ }, "out": { "status_code": 200, - "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=302\"],\"User-Agent\":[\"KrakenD Version 2.6.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"302\"]}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=302\"],\"User-Agent\":[\"KrakenD Version 2.6.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"302\"]}}", "header": { "content-type": ["application/json; charset=utf-8"], "Cache-Control": ["public, max-age=3600"], diff --git a/tests/fixtures/specs/backend_303.json b/tests/fixtures/specs/backend_303.json index 67be68ec..5bc4debf 100644 --- a/tests/fixtures/specs/backend_303.json +++ b/tests/fixtures/specs/backend_303.json @@ -5,7 +5,7 @@ }, "out": { "status_code": 200, - "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=303\"],\"User-Agent\":[\"KrakenD Version 2.6.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"303\"]}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=303\"],\"User-Agent\":[\"KrakenD Version 2.6.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"303\"]}}", "header": { "content-type": ["application/json; charset=utf-8"], "Cache-Control": ["public, max-age=3600"], diff --git a/tests/fixtures/specs/backend_307.json b/tests/fixtures/specs/backend_307.json index 598ecb92..03ed9f35 100644 --- a/tests/fixtures/specs/backend_307.json +++ b/tests/fixtures/specs/backend_307.json @@ -5,7 +5,7 @@ }, "out": { "status_code": 200, - "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=307\"],\"User-Agent\":[\"KrakenD Version 2.6.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"307\"]}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Referer\":[\"http://127.0.0.1:8081/redirect/?status=307\"],\"User-Agent\":[\"KrakenD Version 2.6.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{\"status\":[\"307\"]}}", "header": { "content-type": ["application/json; charset=utf-8"], "Cache-Control": ["public, max-age=3600"], diff --git a/tests/fixtures/specs/cel-7.json b/tests/fixtures/specs/cel-7.json index 006296e5..bba3b242 100644 --- a/tests/fixtures/specs/cel-7.json +++ b/tests/fixtures/specs/cel-7.json @@ -12,7 +12,7 @@ "foo":42, "headers":{ "Accept-Encoding":["gzip"], - "User-Agent":["KrakenD Version 2.6.2"], + "User-Agent":["KrakenD Version 2.6.3"], "X-Forwarded-Host":["localhost:8080"] }, "path":"/param_forwarding/ok/1234567890qwertyuio/foobar", diff --git a/tests/fixtures/specs/cors_5.json b/tests/fixtures/specs/cors_5.json index cb894b74..63f4161f 100644 --- a/tests/fixtures/specs/cors_5.json +++ b/tests/fixtures/specs/cors_5.json @@ -9,12 +9,12 @@ }, "out": { "status_code": 200, - "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.6.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.6.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}", "header": { "content-type": ["application/json; charset=utf-8"], "Cache-Control": ["public, max-age=3600"], "X-Krakend-Completed": ["true"], - "X-Krakend": ["Version 2.6.2"], + "X-Krakend": ["Version 2.6.3"], "Vary": ["Origin"], "Access-Control-Allow-Origin": ["*"], "Access-Control-Expose-Headers": ["Content-Length"] diff --git a/tests/fixtures/specs/detail_error.json b/tests/fixtures/specs/detail_error.json index af3bab1a..2e2b0a14 100644 --- a/tests/fixtures/specs/detail_error.json +++ b/tests/fixtures/specs/detail_error.json @@ -14,7 +14,7 @@ "foo": 42, "headers": { "Accept-Encoding": ["gzip"], - "User-Agent": ["KrakenD Version 2.6.2"], + "User-Agent": ["KrakenD Version 2.6.3"], "X-Forwarded-Host": ["localhost:8080"] }, "path": "/param_forwarding/", diff --git a/tests/fixtures/specs/no-op_1.json b/tests/fixtures/specs/no-op_1.json index d4e6625f..9ae935d0 100644 --- a/tests/fixtures/specs/no-op_1.json +++ b/tests/fixtures/specs/no-op_1.json @@ -5,7 +5,7 @@ }, "out": { "status_code": 200, - "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Content-Length\":[\"0\"],\"User-Agent\":[\"KrakenD Version 2.6.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{}}\n", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Content-Length\":[\"0\"],\"User-Agent\":[\"KrakenD Version 2.6.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/\",\"query\":{}}\n", "header": { "content-type": ["application/json"], "Cache-Control": [""], diff --git a/tests/fixtures/specs/param_forwarding_1.json b/tests/fixtures/specs/param_forwarding_1.json index 01c770ba..1d9e509c 100644 --- a/tests/fixtures/specs/param_forwarding_1.json +++ b/tests/fixtures/specs/param_forwarding_1.json @@ -10,7 +10,7 @@ }, "out": { "status_code": 200, - "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"User-Agent\":[\"KrakenD Version 2.6.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"User-Agent\":[\"KrakenD Version 2.6.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}", "header": { "content-type": ["application/json; charset=utf-8"], "Cache-Control": ["public, max-age=3600"], diff --git a/tests/fixtures/specs/param_forwarding_2.json b/tests/fixtures/specs/param_forwarding_2.json index 4aecb40f..b61f9ded 100644 --- a/tests/fixtures/specs/param_forwarding_2.json +++ b/tests/fixtures/specs/param_forwarding_2.json @@ -10,7 +10,7 @@ }, "out": { "status_code": 200, - "body": "{\"foo\":42,\"headers\":{\"A-B-C\":[\"ignore\"],\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"User-Agent\":[\"Go-http-client/1.1\"],\"X-Forwarded-Host\":[\"localhost:8080\"],\"X-Forwarded-Via\":[\"KrakenD Version 2.6.2\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}", + "body": "{\"foo\":42,\"headers\":{\"A-B-C\":[\"ignore\"],\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"User-Agent\":[\"Go-http-client/1.1\"],\"X-Forwarded-Host\":[\"localhost:8080\"],\"X-Forwarded-Via\":[\"KrakenD Version 2.6.3\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}", "header": { "content-type": ["application/json; charset=utf-8"], "Cache-Control": ["public, max-age=3600"], diff --git a/tests/fixtures/specs/param_forwarding_3.json b/tests/fixtures/specs/param_forwarding_3.json index c6f5250a..48b11727 100644 --- a/tests/fixtures/specs/param_forwarding_3.json +++ b/tests/fixtures/specs/param_forwarding_3.json @@ -10,7 +10,7 @@ }, "out": { "status_code": 200, - "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"User-Agent\":[\"KrakenD Version 2.6.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"Authorization\":[\"bearer 123456\"],\"User-Agent\":[\"KrakenD Version 2.6.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"],\"X-Y-Z\":[\"true\"]},\"path\":\"/param_forwarding/bar\",\"query\":{\"foo\":[\"foo\"]}}", "header": { "content-type": ["application/json; charset=utf-8"], "Cache-Control": ["public, max-age=3600"], diff --git a/tests/fixtures/specs/param_forwarding_4.json b/tests/fixtures/specs/param_forwarding_4.json index 91938f8c..f882d60a 100644 --- a/tests/fixtures/specs/param_forwarding_4.json +++ b/tests/fixtures/specs/param_forwarding_4.json @@ -17,7 +17,7 @@ "headers":{ "Accept-Encoding":["gzip"], "Authorization":["bearer 123456"], - "User-Agent":["KrakenD Version 2.6.2"], + "User-Agent":["KrakenD Version 2.6.3"], "X-Forwarded-Host":["localhost:8080"], "X-Y-Z":["true"] }, diff --git a/tests/fixtures/specs/query_forwarding_1.json b/tests/fixtures/specs/query_forwarding_1.json index 37bee4ed..a2b68d7b 100644 --- a/tests/fixtures/specs/query_forwarding_1.json +++ b/tests/fixtures/specs/query_forwarding_1.json @@ -8,7 +8,7 @@ }, "out": { "status_code": 200, - "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.6.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"],\"b\":[\"2\"]}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.6.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"],\"b\":[\"2\"]}}", "header": { "content-type": ["application/json; charset=utf-8"], "Cache-Control": ["public, max-age=3600"], diff --git a/tests/fixtures/specs/query_forwarding_2.json b/tests/fixtures/specs/query_forwarding_2.json index 0c7d4f81..59169a17 100644 --- a/tests/fixtures/specs/query_forwarding_2.json +++ b/tests/fixtures/specs/query_forwarding_2.json @@ -5,7 +5,7 @@ }, "out": { "status_code": 200, - "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.6.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"],\"b\":[\"2\",\"3\"]}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.6.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"],\"b\":[\"2\",\"3\"]}}", "header": { "content-type": ["application/json; charset=utf-8"], "Cache-Control": ["public, max-age=3600"], diff --git a/tests/fixtures/specs/query_forwarding_3.json b/tests/fixtures/specs/query_forwarding_3.json index 82c27379..bb344368 100644 --- a/tests/fixtures/specs/query_forwarding_3.json +++ b/tests/fixtures/specs/query_forwarding_3.json @@ -5,7 +5,7 @@ }, "out": { "status_code": 200, - "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.6.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"]}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.6.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/foo\",\"query\":{\"a\":[\"1\"]}}", "header": { "content-type": ["application/json; charset=utf-8"], "Cache-Control": ["public, max-age=3600"], diff --git a/tests/fixtures/specs/sequential_1.json b/tests/fixtures/specs/sequential_1.json index 911d1e14..495c8db0 100644 --- a/tests/fixtures/specs/sequential_1.json +++ b/tests/fixtures/specs/sequential_1.json @@ -5,7 +5,7 @@ }, "out": { "status_code": 200, - "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.6.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/42\",\"query\":{}}", + "body": "{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.6.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/42\",\"query\":{}}", "header": { "content-type": ["application/json; charset=utf-8"], "Cache-Control": ["public, max-age=3600"], diff --git a/tests/fixtures/specs/timeout.json b/tests/fixtures/specs/timeout.json index e1ad206e..dc93b99c 100644 --- a/tests/fixtures/specs/timeout.json +++ b/tests/fixtures/specs/timeout.json @@ -5,7 +5,7 @@ }, "out": { "status_code": 200, - "body": "{\"first\":{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.6.2\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/123\",\"query\":{}}}", + "body": "{\"first\":{\"foo\":42,\"headers\":{\"Accept-Encoding\":[\"gzip\"],\"User-Agent\":[\"KrakenD Version 2.6.3\"],\"X-Forwarded-Host\":[\"localhost:8080\"]},\"path\":\"/param_forwarding/123\",\"query\":{}}}", "header": { "content-type": ["application/json; charset=utf-8"], "Cache-Control": [""], diff --git a/tests/fixtures/specs/xml_2.json b/tests/fixtures/specs/xml_2.json index ebedde56..fff625e9 100644 --- a/tests/fixtures/specs/xml_2.json +++ b/tests/fixtures/specs/xml_2.json @@ -5,7 +5,7 @@ }, "out": { "status_code": 200, - "body": "42gziphttp://127.0.0.1:8081/param_forwardingKrakenD Version 2.6.2localhost:8080/param_forwarding/", + "body": "42gziphttp://127.0.0.1:8081/param_forwardingKrakenD Version 2.6.3localhost:8080/param_forwarding/", "header": { "content-type": ["application/xml"], "Cache-Control": ["public, max-age=3600"],