diff --git a/.circleci/config.yml b/.circleci/config.yml index e8a36e0ab..7e0967970 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: environment: S2I_VERSION: "1.1.9a-40ad911d" DOCKER_COMPOSE_VERSION: "1.16.1" - OPENRESTY_VERSION: "1.13.6.1-rover6" + OPENRESTY_VERSION: "1.13.6.1-rover12" steps: - run: apk update && apk add wget make bash curl py-pip git openssh-client - run: | @@ -40,7 +40,7 @@ jobs: make lint-schema build: docker: - - image: quay.io/3scale/s2i-openresty-centos7:1.13.6.1-rover6 + - image: quay.io/3scale/s2i-openresty-centos7:1.13.6.1-rover12 environment: TEST_NGINX_BINARY: openresty LUA_BIN_PATH: /opt/app-root/bin diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ffb0f538..b7a39a864 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +### Added + +- OpenTracing support [PR #669](https://github.com/3scale/apicast/pull/669) + ### Fixed - Fixed set of valid values for the exit param of the Echo policy [PR #684](https://github.com/3scale/apicast/pull/684/) @@ -21,6 +25,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - `export()` now works correctly in policies of the local chain [PR #673](https://github.com/3scale/apicast/pull/673) - caching policy now works correctly when placed after the apicast policy in the chain [PR #674](https://github.com/3scale/apicast/pull/674) +- OpenTracing support [PR #669](https://github.com/3scale/apicast/pull/669) ### Changed diff --git a/doc/parameters.md b/doc/parameters.md index c17ebb5db..1f24ee429 100644 --- a/doc/parameters.md +++ b/doc/parameters.md @@ -243,3 +243,31 @@ URI that includes your password and portal endpoint in the following format: `