Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] Update main after 1.1.0 release #463

Merged
merged 2 commits into from
Apr 21, 2021
Merged

[chore] Update main after 1.1.0 release #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc80076
version
lzchen Apr 20, 2021
793ddb4
version
lzchen Apr 20, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'release/*'
pull_request:
env:
CORE_REPO_SHA: 3af190ca973ccef33d8e0816f79ae47b52824a98
CORE_REPO_SHA: 3e628b56f154d651816ba806b49940c6cc9a3556

jobs:
build:
Expand Down
12 changes: 3 additions & 9 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ 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-contrib/compare/v0.19b0...HEAD)
## [Unreleased](https://github.com/open-telemetry/opentelemetry-python-contrib/compare/v0.200...HEAD)

## [0.20b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.20b0) - 2021-04-20

### Changed
- Restrict DataDog exporter's `ddtrace` dependency to known working versions.
Expand Down Expand Up @@ -49,14 +51,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Remove `http.status_text` from span attributes
([#406](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/406))

### Removed
- Remove `http.status_text` from span attributes
([#406](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/406))

### Removed
- Remove `http.status_text` from span attributes
([#406](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/406))


## [0.19b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.19b0) - 2021-03-26

Expand Down
2 changes: 1 addition & 1 deletion _template/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ package_dir=
packages=find_namespace:

install_requires =
opentelemetry-api == 1.0.1.dev0
opentelemetry-api == 1.2.0.dev0

[options.extras_require]
test =
Expand Down
2 changes: 1 addition & 1 deletion _template/version.py
View file
Open in desktop
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.20.dev0"
__version__ = "0.21.dev0"
1 change: 1 addition & 0 deletions docs-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ sphinx-autodoc-typehints
# Need to install the api/sdk in the venv for autodoc. Modifying sys.path
# doesn't work for pkg_resources.
-e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-api&subdirectory=opentelemetry-api"
-e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions"
-e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk"
-e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation"

Expand Down
6 changes: 3 additions & 3 deletions exporter/opentelemetry-exporter-datadog/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ package_dir=
packages=find_namespace:
install_requires =
ddtrace>=0.34.0,<0.47.0
opentelemetry-api == 1.0.1.dev0
opentelemetry-sdk == 1.0.1.dev0
opentelemetry-semantic-conventions == 0.20.dev0
opentelemetry-api == 1.2.0.dev0
opentelemetry-sdk == 1.2.0.dev0
opentelemetry-semantic-conventions == 0.21.dev0

[options.packages.find]
where = src
Expand Down
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/version.py
View file
Open in desktop
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.20.dev0"
__version__ = "0.21.dev0"
6 changes: 3 additions & 3 deletions instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.0.1.dev0
opentelemetry-semantic-conventions == 0.20.dev0
opentelemetry-instrumentation == 0.20.dev0
opentelemetry-api == 1.2.0.dev0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
aiohttp ~= 3.0
wrapt >= 1.0.0, < 2.0.0

Expand Down
2 changes: 1 addition & 1 deletion ...nstrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py
View file
Open in desktop
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.20.dev0"
__version__ = "0.21.dev0"
10 changes: 5 additions & 5 deletions instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.0.1.dev0
opentelemetry-semantic-conventions == 0.20.dev0
opentelemetry-instrumentation-dbapi == 0.20.dev0
opentelemetry-instrumentation == 0.20.dev0
opentelemetry-api == 1.2.0.dev0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation-dbapi == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
aiopg >= 0.13.0
wrapt >= 1.0.0, < 2.0.0

[options.extras_require]
test =
opentelemetry-test == 0.20.dev0
opentelemetry-test == 0.21.dev0

[options.packages.find]
where = src
Expand Down
2 changes: 1 addition & 1 deletion ...on/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py
View file
Open in desktop
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.20.dev0"
__version__ = "0.21.dev0"
8 changes: 4 additions & 4 deletions instrumentation/opentelemetry-instrumentation-asgi/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.0.1.dev0
opentelemetry-semantic-conventions == 0.20.dev0
opentelemetry-instrumentation == 0.20.dev0
opentelemetry-api == 1.2.0.dev0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
asgiref ~= 3.0

[options.extras_require]
test =
opentelemetry-test
opentelemetry-test == 0.21.dev0

[options.packages.find]
where = src
2 changes: 1 addition & 1 deletion ...tion/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py
View file
Open in desktop
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.20.dev0"
__version__ = "0.21.dev0"
8 changes: 4 additions & 4 deletions instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.0.1.dev0
opentelemetry-semantic-conventions == 0.20.dev0
opentelemetry-instrumentation == 0.20.dev0
opentelemetry-api == 1.2.0.dev0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
asyncpg >= 0.12.0

[options.extras_require]
test =
opentelemetry-test == 0.20.dev0
opentelemetry-test == 0.21.dev0

[options.packages.find]
where = src
Expand Down
2 changes: 1 addition & 1 deletion ...pentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py
View file
Open in desktop
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.20.dev0"
__version__ = "0.21.dev0"
10 changes: 5 additions & 5 deletions instrumentation/opentelemetry-instrumentation-boto/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ package_dir=
packages=find_namespace:
install_requires =
boto ~= 2.0
opentelemetry-api == 1.0.1.dev0
opentelemetry-semantic-conventions == 0.20.dev0
opentelemetry-instrumentation == 0.20.dev0
opentelemetry-instrumentation-botocore == 0.20.dev0
opentelemetry-api == 1.2.0.dev0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation-botocore == 0.21.dev0

[options.extras_require]
test =
boto~=2.0
moto~=1.0
opentelemetry-test == 0.20.dev0
opentelemetry-test == 0.21.dev0

[options.packages.find]
where = src
Expand Down
2 changes: 1 addition & 1 deletion ...tion/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py
View file
Open in desktop
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.20.dev0"
__version__ = "0.21.dev0"
8 changes: 4 additions & 4 deletions instrumentation/opentelemetry-instrumentation-botocore/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ package_dir=
packages=find_namespace:
install_requires =
botocore ~= 1.0
opentelemetry-api == 1.0.1.dev0
opentelemetry-semantic-conventions == 0.20.dev0
opentelemetry-instrumentation == 0.20.dev0
opentelemetry-api == 1.2.0.dev0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0

[options.extras_require]
test =
moto ~= 1.0
opentelemetry-test == 0.20.dev0
opentelemetry-test == 0.21.dev0

[options.packages.find]
where = src
Expand Down
2 changes: 1 addition & 1 deletion ...ntelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py
View file
Open in desktop
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.20.dev0"
__version__ = "0.21.dev0"
8 changes: 4 additions & 4 deletions instrumentation/opentelemetry-instrumentation-celery/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ package_dir=
packages=find_namespace:
install_requires =
celery >= 4.0, < 6.0
opentelemetry-api == 1.0.1.dev0
opentelemetry-semantic-conventions == 0.20.dev0
opentelemetry-instrumentation == 0.20.dev0
opentelemetry-api == 1.2.0.dev0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0

[options.extras_require]
test =
pytest
celery >= 4.0, < 6.0
opentelemetry-test == 0.20.dev0
opentelemetry-test == 0.21.dev0

[options.packages.find]
where = src
Expand Down
2 changes: 1 addition & 1 deletion .../opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py
View file
Open in desktop
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.20.dev0"
__version__ = "0.21.dev0"
8 changes: 4 additions & 4 deletions instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.0.1.dev0
opentelemetry-semantic-conventions == 0.20.dev0
opentelemetry-instrumentation == 0.20.dev0
opentelemetry-api == 1.2.0.dev0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
wrapt >= 1.0.0, < 2.0.0

[options.extras_require]
test =
opentelemetry-test == 0.20.dev0
opentelemetry-test == 0.21.dev0

[options.packages.find]
where = src
2 changes: 1 addition & 1 deletion ...on/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py
View file
Open in desktop
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.20.dev0"
__version__ = "0.21.dev0"
12 changes: 6 additions & 6 deletions instrumentation/opentelemetry-instrumentation-django/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ package_dir=
packages=find_namespace:
install_requires =
django >= 1.10
opentelemetry-util-http == 0.20.dev0
opentelemetry-instrumentation-wsgi == 0.20.dev0
opentelemetry-instrumentation == 0.20.dev0
opentelemetry-api == 1.0.1.dev0
opentelemetry-semantic-conventions == 0.20.dev0
opentelemetry-util-http == 0.21.dev0
opentelemetry-instrumentation-wsgi == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-api == 1.2.0.dev0
opentelemetry-semantic-conventions == 0.21.dev0

[options.extras_require]
test =
opentelemetry-test == 0.20.dev0
opentelemetry-test == 0.21.dev0

[options.packages.find]
where = src
Expand Down
2 changes: 1 addition & 1 deletion .../opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/version.py
View file
Open in desktop
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.20.dev0"
__version__ = "0.21.dev0"
8 changes: 4 additions & 4 deletions instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.0.1.dev0
opentelemetry-semantic-conventions == 0.20.dev0
opentelemetry-instrumentation == 0.20.dev0
opentelemetry-api == 1.2.0.dev0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
wrapt >= 1.0.0, < 2.0.0
elasticsearch >= 2.0

[options.extras_require]
test =
opentelemetry-test == 0.20.dev0
opentelemetry-test == 0.21.dev0
elasticsearch-dsl >= 2.0

[options.packages.find]
Expand Down
2 changes: 1 addition & 1 deletion ...-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/version.py
View file
Open in desktop
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.20.dev0"
__version__ = "0.21.dev0"
12 changes: 6 additions & 6 deletions instrumentation/opentelemetry-instrumentation-falcon/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@ package_dir=
packages=find_namespace:
install_requires =
falcon ~= 2.0
opentelemetry-instrumentation-wsgi == 0.20.dev0
opentelemetry-util-http == 0.20.dev0
opentelemetry-instrumentation == 0.20.dev0
opentelemetry-api == 1.0.1.dev0
opentelemetry-semantic-conventions == 0.20.dev0
opentelemetry-instrumentation-wsgi == 0.21.dev0
opentelemetry-util-http == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-api == 1.2.0.dev0
opentelemetry-semantic-conventions == 0.21.dev0

[options.extras_require]
test =
falcon ~= 2.0
opentelemetry-test == 0.20.dev0
opentelemetry-test == 0.21.dev0
parameterized == 0.7.4

[options.packages.find]
Expand Down
2 changes: 1 addition & 1 deletion .../opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/version.py
View file
Open in desktop
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.20.dev0"
__version__ = "0.21.dev0"
12 changes: 6 additions & 6 deletions instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.0.1.dev0
opentelemetry-semantic-conventions == 0.20.dev0
opentelemetry-instrumentation == 0.20.dev0
opentelemetry-instrumentation-asgi == 0.20.dev0
opentelemetry-util-http == 0.20.dev0
opentelemetry-api == 1.2.0.dev0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation-asgi == 0.21.dev0
opentelemetry-util-http == 0.21.dev0

[options.entry_points]
opentelemetry_instrumentor =
fastapi = opentelemetry.instrumentation.fastapi:FastAPIInstrumentor

[options.extras_require]
test =
opentelemetry-test == 0.20.dev0
opentelemetry-test == 0.21.dev0
fastapi ~= 0.58.1
requests ~= 2.23.0 # needed for testclient

Expand Down
2 changes: 1 addition & 1 deletion ...pentelemetry-instrumentation-fastapi/src/opentelemetry/instrumentation/fastapi/version.py
View file
Open in desktop
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.20.dev0"
__version__ = "0.21.dev0"
Loading