Skip to content

Commit

Permalink
updating changelogs and version to 1.5.0-0.24b0 (#2069)
Browse files Browse the repository at this point in the history
  • Loading branch information
owais authored Aug 26, 2021
1 parent 4250078 commit 3b190f5
Show file tree
Hide file tree
Showing 33 changed files with 77 additions and 73 deletions.
2 changes: 1 addition & 1 deletion .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: dd65a29b5805397e3b511d6546179e7c03442f82
CONTRIB_REPO_SHA: 3ad534cbba41c2b92618f5f03c4c92cee4a72df6

jobs:
build:
Expand Down
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.4.0-0.23b0...HEAD)
## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.5.0-0.24b0...HEAD)

## [1.5.0-0.24b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.5.0-0.24b0) - 2021-08-26


- Fix documentation on well known exporters and variable OTEL_TRACES_EXPORTER which were misnamed
([#2023](https://github.com/open-telemetry/opentelemetry-python/pull/2023))
- `opentelemetry-sdk` `get_aggregated_resource()` returns default resource and service name
Expand Down
4 changes: 2 additions & 2 deletions eachdist.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ sortfirst=
exporter/*

[stable]
version=1.5.0.dev0
version=1.5.0

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

[prerelease]
version=0.24.dev0
version=0.24b0

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.dev0"
__version__ = "1.5.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.dev0"
__version__ = "1.5.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.dev0
opentelemetry-exporter-jaeger-thrift == 1.5.0.dev0
opentelemetry-exporter-jaeger-proto-grpc == 1.5.0
opentelemetry-exporter-jaeger-thrift == 1.5.0

[options.extras_require]
test =
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.dev0"
__version__ = "1.5.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.24.dev0"
__version__ = "0.24b0"
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg
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.dev0
opentelemetry-proto == 1.5.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.dev0"
__version__ = "1.5.0"
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-otlp-proto-http/setup.cfg
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.dev0
opentelemetry-proto == 1.5.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__ = "0.24.dev0"
__version__ = "1.5.0"
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-otlp/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ classifiers =
python_requires = >=3.6
packages=find_namespace:
install_requires =
opentelemetry-exporter-otlp-proto-grpc == 1.5.0.dev0
opentelemetry-exporter-otlp-proto-grpc == 1.5.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.dev0"
__version__ = "1.5.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.dev0"
__version__ = "1.5.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.dev0
opentelemetry-exporter-zipkin-json == 1.5.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.dev0"
__version__ = "1.5.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.dev0
opentelemetry-exporter-zipkin-proto-http == 1.5.0.dev0
opentelemetry-exporter-zipkin-json == 1.5.0
opentelemetry-exporter-zipkin-proto-http == 1.5.0

[options.extras_require]
test =
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.dev0"
__version__ = "1.5.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.dev0"
__version__ = "1.5.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.24.dev0
opentelemetry-sdk == 1.5.0.dev0
opentelemetry-instrumentation == 0.24b0
opentelemetry-sdk == 1.5.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.dev0
opentelemetry-exporter-otlp == 1.5.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.24.dev0"
__version__ = "0.24b0"
Original file line number Diff line number Diff line change
Expand Up @@ -18,121 +18,121 @@
libraries = {
"aiohttp": {
"library": "aiohttp ~= 3.0",
"instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.24b0",
},
"aiopg": {
"library": "aiopg >= 0.13.0, < 1.3.0",
"instrumentation": "opentelemetry-instrumentation-aiopg==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-aiopg==0.24b0",
},
"asgiref": {
"library": "asgiref ~= 3.0",
"instrumentation": "opentelemetry-instrumentation-asgi==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-asgi==0.24b0",
},
"asyncpg": {
"library": "asyncpg >= 0.12.0",
"instrumentation": "opentelemetry-instrumentation-asyncpg==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-asyncpg==0.24b0",
},
"boto": {
"library": "boto~=2.0",
"instrumentation": "opentelemetry-instrumentation-boto==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-boto==0.24b0",
},
"botocore": {
"library": "botocore ~= 1.0",
"instrumentation": "opentelemetry-instrumentation-botocore==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-botocore==0.24b0",
},
"celery": {
"library": "celery >= 4.0, < 6.0",
"instrumentation": "opentelemetry-instrumentation-celery==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-celery==0.24b0",
},
"django": {
"library": "django >= 1.10",
"instrumentation": "opentelemetry-instrumentation-django==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-django==0.24b0",
},
"elasticsearch": {
"library": "elasticsearch >= 2.0",
"instrumentation": "opentelemetry-instrumentation-elasticsearch==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-elasticsearch==0.24b0",
},
"falcon": {
"library": "falcon ~= 2.0",
"instrumentation": "opentelemetry-instrumentation-falcon==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-falcon==0.24b0",
},
"fastapi": {
"library": "fastapi ~= 0.58.1",
"instrumentation": "opentelemetry-instrumentation-fastapi==0.24.dev0",
"library": "fastapi ~= 0.58",
"instrumentation": "opentelemetry-instrumentation-fastapi==0.24b0",
},
"flask": {
"library": "flask >= 1.0, < 3.0",
"instrumentation": "opentelemetry-instrumentation-flask==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-flask==0.24b0",
},
"grpcio": {
"library": "grpcio ~= 1.27",
"instrumentation": "opentelemetry-instrumentation-grpc==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-grpc==0.24b0",
},
"httpx": {
"library": "httpx >= 0.18.0, < 0.19.0",
"instrumentation": "opentelemetry-instrumentation-httpx==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-httpx==0.24b0",
},
"jinja2": {
"library": "jinja2~=2.7",
"instrumentation": "opentelemetry-instrumentation-jinja2==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-jinja2==0.24b0",
},
"mysql-connector-python": {
"library": "mysql-connector-python ~= 8.0",
"instrumentation": "opentelemetry-instrumentation-mysql==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-mysql==0.24b0",
},
"psycopg2": {
"library": "psycopg2 >= 2.7.3.1",
"instrumentation": "opentelemetry-instrumentation-psycopg2==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-psycopg2==0.24b0",
},
"pymemcache": {
"library": "pymemcache ~= 1.3",
"instrumentation": "opentelemetry-instrumentation-pymemcache==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-pymemcache==0.24b0",
},
"pymongo": {
"library": "pymongo ~= 3.1",
"instrumentation": "opentelemetry-instrumentation-pymongo==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-pymongo==0.24b0",
},
"PyMySQL": {
"library": "PyMySQL ~= 0.10.1",
"instrumentation": "opentelemetry-instrumentation-pymysql==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-pymysql==0.24b0",
},
"pyramid": {
"library": "pyramid >= 1.7",
"instrumentation": "opentelemetry-instrumentation-pyramid==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-pyramid==0.24b0",
},
"redis": {
"library": "redis >= 2.6",
"instrumentation": "opentelemetry-instrumentation-redis==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-redis==0.24b0",
},
"requests": {
"library": "requests ~= 2.0",
"instrumentation": "opentelemetry-instrumentation-requests==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-requests==0.24b0",
},
"scikit-learn": {
"library": "scikit-learn ~= 0.24.0",
"instrumentation": "opentelemetry-instrumentation-sklearn==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-sklearn==0.24b0",
},
"sqlalchemy": {
"library": "sqlalchemy",
"instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.24b0",
},
"starlette": {
"library": "starlette ~= 0.13.0",
"instrumentation": "opentelemetry-instrumentation-starlette==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-starlette==0.24b0",
},
"tornado": {
"library": "tornado >= 6.0",
"instrumentation": "opentelemetry-instrumentation-tornado==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-tornado==0.24b0",
},
"urllib3": {
"library": "urllib3 >= 1.0.0, < 2.0.0",
"instrumentation": "opentelemetry-instrumentation-urllib3==0.24.dev0",
"instrumentation": "opentelemetry-instrumentation-urllib3==0.24b0",
},
}
default_instrumentations = [
"opentelemetry-instrumentation-dbapi==0.24.dev0",
"opentelemetry-instrumentation-logging==0.24.dev0",
"opentelemetry-instrumentation-sqlite3==0.24.dev0",
"opentelemetry-instrumentation-urllib==0.24.dev0",
"opentelemetry-instrumentation-wsgi==0.24.dev0",
"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",
]
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.24.dev0"
__version__ = "0.24b0"
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.dev0"
__version__ = "1.5.0"
6 changes: 3 additions & 3 deletions opentelemetry-sdk/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ packages=find_namespace:
zip_safe = False
include_package_data = True
install_requires =
opentelemetry-api == 1.5.0.dev0
opentelemetry-semantic-conventions == 0.24.dev0
opentelemetry-instrumentation == 0.24.dev0
opentelemetry-api == 1.5.0
opentelemetry-semantic-conventions == 0.24b0
opentelemetry-instrumentation == 0.24b0

[options.packages.find]
where = src
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-sdk/src/opentelemetry/sdk/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.dev0"
__version__ = "1.5.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.24.dev0"
__version__ = "0.24b0"
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.dev0"
__version__ = "1.5.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.dev0"
__version__ = "1.5.0"
2 changes: 1 addition & 1 deletion shim/opentelemetry-opentracing-shim/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ install_requires =

[options.extras_require]
test =
opentelemetry-test == 0.24.dev0
opentelemetry-test == 0.24b0
opentracing ~= 2.2.0

[options.packages.find]
Expand Down
Loading

0 comments on commit 3b190f5

Please sign in to comment.