Skip to content
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
# Otherwise, set variable to the commit of your branch on
# opentelemetry-python-contrib which is compatible with these Core repo
# changes.
CONTRIB_REPO_SHA: 36275f3cbf00c2021caa1d922bd98215c50b9af3
CONTRIB_REPO_SHA: 635a680ba649ea828eb2bdb944a5115dc57bb4ac

jobs:
build:
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
path: |
.tox
~/.cache/pip
key: v2-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-core
key: v3-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-core
# tox fails on windows and Python3.6 when tox dir is reused between builds so we remove it
- name: fix for windows + py3.6
if: ${{ matrix.os == 'windows-2019' && matrix.python-version == 'py36' }}
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
path: |
.tox
~/.cache/pip
key: v2-tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-core
key: v3-tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-core
- name: run tox
run: tox -e ${{ matrix.tox-environment }}
contrib-build:
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
path: |
.tox
~/.cache/pip
key: v2-tox-cache-${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-contrib
key: v3-tox-cache-${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-contrib
- name: run tox
run: tox -f ${{ matrix.python-version }}-${{ matrix.package }}
contrib-misc:
Expand Down Expand Up @@ -179,6 +179,6 @@ jobs:
path: |
.tox
~/.cache/pip
key: v2-tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-contrib
key: v3-tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-contrib
- name: run tox
run: tox -e ${{ matrix.tox-environment }}
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.5.0-0.24b0...HEAD)
## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.6.0-0.25b0...HEAD)

## [1.6.0-0.25b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.6.0-0.25b0) - 2021-10-12


- Fix race in `set_tracer_provider()`
([#2182](https://github.com/open-telemetry/opentelemetry-python/pull/2182))
- Automatically load OTEL environment variables as options for `opentelemetry-instrument`
Expand Down
4 changes: 2 additions & 2 deletions eachdist.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ sortfirst=
exporter/*

[stable]
version=1.5.0
version=1.6.0

packages=
opentelemetry-sdk
Expand All @@ -31,7 +31,7 @@ packages=
opentelemetry-api

[prerelease]
version=0.24b0
version=0.25b0

packages=
opentelemetry-opentracing-shim
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.5.0"
__version__ = "1.6.0"
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.5.0"
__version__ = "1.6.0"
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-jaeger/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ python_requires = >=3.6

packages=find_namespace:
install_requires =
opentelemetry-exporter-jaeger-proto-grpc == 1.5.0
opentelemetry-exporter-jaeger-thrift == 1.5.0
opentelemetry-exporter-jaeger-proto-grpc == 1.6.0
opentelemetry-exporter-jaeger-thrift == 1.6.0

[options.extras_require]
test =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.5.0"
__version__ = "1.6.0"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.24b0"
__version__ = "0.25b0"
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ install_requires =
googleapis-common-protos ~= 1.52
opentelemetry-api ~= 1.3
opentelemetry-sdk ~= 1.3
opentelemetry-proto == 1.5.0
opentelemetry-proto == 1.6.0
backoff ~= 1.10.0

[options.extras_require]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.5.0"
__version__ = "1.6.0"
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ install_requires =
googleapis-common-protos ~= 1.52
opentelemetry-api ~= 1.3
opentelemetry-sdk ~= 1.3
opentelemetry-proto == 1.5.0
opentelemetry-proto == 1.6.0
backoff ~= 1.10.0

[options.extras_require]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.5.0"
__version__ = "1.6.0"
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-otlp/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ classifiers =
python_requires = >=3.6
packages=find_namespace:
install_requires =
opentelemetry-exporter-otlp-proto-grpc == 1.5.0
opentelemetry-exporter-otlp-proto-http == 1.5.0
opentelemetry-exporter-otlp-proto-grpc == 1.6.0
opentelemetry-exporter-otlp-proto-http == 1.6.0

[options.entry_points]
opentelemetry_traces_exporter =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.5.0"
__version__ = "1.6.0"
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.5.0"
__version__ = "1.6.0"
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ install_requires =
requests ~= 2.7
opentelemetry-api ~= 1.3
opentelemetry-sdk ~= 1.3
opentelemetry-exporter-zipkin-json == 1.5.0
opentelemetry-exporter-zipkin-json == 1.6.0

[options.packages.find]
where = src
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.5.0"
__version__ = "1.6.0"
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-zipkin/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ classifiers =
python_requires = >=3.6
packages=find_namespace:
install_requires =
opentelemetry-exporter-zipkin-json == 1.5.0
opentelemetry-exporter-zipkin-proto-http == 1.5.0
opentelemetry-exporter-zipkin-json == 1.6.0
opentelemetry-exporter-zipkin-proto-http == 1.6.0

[options.extras_require]
test =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.5.0"
__version__ = "1.6.0"
2 changes: 1 addition & 1 deletion opentelemetry-api/src/opentelemetry/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.5.0"
__version__ = "1.6.0"
6 changes: 3 additions & 3 deletions opentelemetry-distro/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ zip_safe = False
include_package_data = True
install_requires =
opentelemetry-api ~= 1.3
opentelemetry-instrumentation == 0.24b0
opentelemetry-sdk == 1.5.0
opentelemetry-instrumentation == 0.25b0
opentelemetry-sdk == 1.6.0

[options.packages.find]
where = src
Expand All @@ -57,4 +57,4 @@ opentelemetry_configurator =
[options.extras_require]
test =
otlp =
opentelemetry-exporter-otlp == 1.5.0
opentelemetry-exporter-otlp == 1.6.0
2 changes: 1 addition & 1 deletion opentelemetry-distro/src/opentelemetry/distro/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.24b0"
__version__ = "0.25b0"
Original file line number Diff line number Diff line change
Expand Up @@ -18,125 +18,125 @@
libraries = {
"aiohttp": {
"library": "aiohttp ~= 3.0",
"instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.24b0",
"instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.25b0",
},
"aiopg": {
"library": "aiopg >= 0.13.0, < 1.3.0",
"instrumentation": "opentelemetry-instrumentation-aiopg==0.24b0",
"instrumentation": "opentelemetry-instrumentation-aiopg==0.25b0",
},
"asgiref": {
"library": "asgiref ~= 3.0",
"instrumentation": "opentelemetry-instrumentation-asgi==0.24b0",
"instrumentation": "opentelemetry-instrumentation-asgi==0.25b0",
},
"asyncpg": {
"library": "asyncpg >= 0.12.0",
"instrumentation": "opentelemetry-instrumentation-asyncpg==0.24b0",
"instrumentation": "opentelemetry-instrumentation-asyncpg==0.25b0",
},
"boto": {
"library": "boto~=2.0",
"instrumentation": "opentelemetry-instrumentation-boto==0.24b0",
"instrumentation": "opentelemetry-instrumentation-boto==0.25b0",
},
"botocore": {
"library": "botocore ~= 1.0",
"instrumentation": "opentelemetry-instrumentation-botocore==0.24b0",
"instrumentation": "opentelemetry-instrumentation-botocore==0.25b0",
},
"celery": {
"library": "celery >= 4.0, < 6.0",
"instrumentation": "opentelemetry-instrumentation-celery==0.24b0",
"instrumentation": "opentelemetry-instrumentation-celery==0.25b0",
},
"django": {
"library": "django >= 1.10",
"instrumentation": "opentelemetry-instrumentation-django==0.24b0",
"instrumentation": "opentelemetry-instrumentation-django==0.25b0",
},
"elasticsearch": {
"library": "elasticsearch >= 2.0",
"instrumentation": "opentelemetry-instrumentation-elasticsearch==0.24b0",
"instrumentation": "opentelemetry-instrumentation-elasticsearch==0.25b0",
},
"falcon": {
"library": "falcon >= 2.0.0, < 4.0.0",
"instrumentation": "opentelemetry-instrumentation-falcon==0.24b0",
"instrumentation": "opentelemetry-instrumentation-falcon==0.25b0",
},
"fastapi": {
"library": "fastapi ~= 0.58",
"instrumentation": "opentelemetry-instrumentation-fastapi==0.24b0",
"instrumentation": "opentelemetry-instrumentation-fastapi==0.25b0",
},
"flask": {
"library": "flask >= 1.0, < 3.0",
"instrumentation": "opentelemetry-instrumentation-flask==0.24b0",
"instrumentation": "opentelemetry-instrumentation-flask==0.25b0",
},
"grpcio": {
"library": "grpcio ~= 1.27",
"instrumentation": "opentelemetry-instrumentation-grpc==0.24b0",
"instrumentation": "opentelemetry-instrumentation-grpc==0.25b0",
},
"httpx": {
"library": "httpx >= 0.18.0, < 0.19.0",
"instrumentation": "opentelemetry-instrumentation-httpx==0.24b0",
"instrumentation": "opentelemetry-instrumentation-httpx==0.25b0",
},
"jinja2": {
"library": "jinja2 >= 2.7, < 4.0",
"instrumentation": "opentelemetry-instrumentation-jinja2==0.24b0",
"instrumentation": "opentelemetry-instrumentation-jinja2==0.25b0",
},
"mysql-connector-python": {
"library": "mysql-connector-python ~= 8.0",
"instrumentation": "opentelemetry-instrumentation-mysql==0.24b0",
"instrumentation": "opentelemetry-instrumentation-mysql==0.25b0",
},
"pika": {
"library": "pika >= 1.1.0",
"instrumentation": "opentelemetry-instrumentation-pika==0.24b0",
"instrumentation": "opentelemetry-instrumentation-pika==0.25b0",
},
"psycopg2": {
"library": "psycopg2 >= 2.7.3.1",
"instrumentation": "opentelemetry-instrumentation-psycopg2==0.24b0",
"instrumentation": "opentelemetry-instrumentation-psycopg2==0.25b0",
},
"pymemcache": {
"library": "pymemcache ~= 1.3",
"instrumentation": "opentelemetry-instrumentation-pymemcache==0.24b0",
"instrumentation": "opentelemetry-instrumentation-pymemcache==0.25b0",
},
"pymongo": {
"library": "pymongo ~= 3.1",
"instrumentation": "opentelemetry-instrumentation-pymongo==0.24b0",
"instrumentation": "opentelemetry-instrumentation-pymongo==0.25b0",
},
"PyMySQL": {
"library": "PyMySQL ~= 0.10.1",
"instrumentation": "opentelemetry-instrumentation-pymysql==0.24b0",
"instrumentation": "opentelemetry-instrumentation-pymysql==0.25b0",
},
"pyramid": {
"library": "pyramid >= 1.7",
"instrumentation": "opentelemetry-instrumentation-pyramid==0.24b0",
"instrumentation": "opentelemetry-instrumentation-pyramid==0.25b0",
},
"redis": {
"library": "redis >= 2.6",
"instrumentation": "opentelemetry-instrumentation-redis==0.24b0",
"instrumentation": "opentelemetry-instrumentation-redis==0.25b0",
},
"requests": {
"library": "requests ~= 2.0",
"instrumentation": "opentelemetry-instrumentation-requests==0.24b0",
"instrumentation": "opentelemetry-instrumentation-requests==0.25b0",
},
"scikit-learn": {
"library": "scikit-learn ~= 0.24.0",
"instrumentation": "opentelemetry-instrumentation-sklearn==0.24b0",
"instrumentation": "opentelemetry-instrumentation-sklearn==0.25b0",
},
"sqlalchemy": {
"library": "sqlalchemy",
"instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.24b0",
"instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.25b0",
},
"starlette": {
"library": "starlette ~= 0.13.0",
"instrumentation": "opentelemetry-instrumentation-starlette==0.24b0",
"instrumentation": "opentelemetry-instrumentation-starlette==0.25b0",
},
"tornado": {
"library": "tornado >= 6.0",
"instrumentation": "opentelemetry-instrumentation-tornado==0.24b0",
"instrumentation": "opentelemetry-instrumentation-tornado==0.25b0",
},
"urllib3": {
"library": "urllib3 >= 1.0.0, < 2.0.0",
"instrumentation": "opentelemetry-instrumentation-urllib3==0.24b0",
"instrumentation": "opentelemetry-instrumentation-urllib3==0.25b0",
},
}
default_instrumentations = [
"opentelemetry-instrumentation-dbapi==0.24b0",
"opentelemetry-instrumentation-logging==0.24b0",
"opentelemetry-instrumentation-sqlite3==0.24b0",
"opentelemetry-instrumentation-urllib==0.24b0",
"opentelemetry-instrumentation-wsgi==0.24b0",
"opentelemetry-instrumentation-dbapi==0.25b0",
"opentelemetry-instrumentation-logging==0.25b0",
"opentelemetry-instrumentation-sqlite3==0.25b0",
"opentelemetry-instrumentation-urllib==0.25b0",
"opentelemetry-instrumentation-wsgi==0.25b0",
]
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.24b0"
__version__ = "0.25b0"
2 changes: 1 addition & 1 deletion opentelemetry-proto/src/opentelemetry/proto/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.5.0"
__version__ = "1.6.0"
Loading