Skip to content

Commit d5989f5

Browse files
shalevrshalevr
authored
Merge branch 'main' into feature
2 parents fd3b9f9 + afd8428 commit d5989f5

File tree

99 files changed

+277
-275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+277
-275
lines changed

‎.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: 2387b4465d930b020df79692a8097e1d54b66ec1
9+
CORE_REPO_SHA: e9530c5c548d08a6aaa56268d103f9beb00cd002
1010

1111
jobs:
1212
build:

‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10+
## Version 1.18.0/0.39b0 (2023-05-10)
11+
1012
- `opentelemetry-instrumentation-system-metrics` Add `process.` prefix to `runtime.memory`, `runtime.cpu.time`, and `runtime.gc_count`. Change `runtime.memory` from count to UpDownCounter. ([#1735](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1735))
1113
- Add request and response hooks for GRPC instrumentation (client only)
1214
([#1706](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1706))

‎_template/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.39b0.dev"
15+
__version__ = "0.40b0.dev"

‎eachdist.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sortfirst=
1616
ext/*
1717

1818
[stable]
19-
version=1.18.0.dev
19+
version=1.19.0.dev
2020

2121
packages=
2222
opentelemetry-sdk
@@ -34,7 +34,7 @@ packages=
3434
opentelemetry-api
3535

3636
[prerelease]
37-
version=0.39b0.dev
37+
version=0.40b0.dev
3838

3939
packages=
4040
all

‎exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.39b0.dev"
15+
__version__ = "0.40b0.dev"

‎exporter/opentelemetry-exporter-richconsole/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ classifiers = [
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
2929
"opentelemetry-sdk ~= 1.12",
30-
"opentelemetry-semantic-conventions == 0.39b0.dev",
30+
"opentelemetry-semantic-conventions == 0.40b0.dev",
3131
"rich>=10.0.0",
3232
]
3333

‎exporter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.39b0.dev"
15+
__version__ = "0.40b0.dev"

‎instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ instruments = [
3535
]
3636
test = [
3737
"opentelemetry-instrumentation-aio-pika[instruments]",
38-
"opentelemetry-test-utils == 0.39b0.dev",
38+
"opentelemetry-test-utils == 0.40b0.dev",
3939
"pytest",
4040
"wrapt >= 1.0.0, < 2.0.0",
4141
]

‎instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.39b0.dev"
15+
__version__ = "0.40b0.dev"

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.39b0.dev",
30-
"opentelemetry-semantic-conventions == 0.39b0.dev",
31-
"opentelemetry-util-http == 0.39b0.dev",
29+
"opentelemetry-instrumentation == 0.40b0.dev",
30+
"opentelemetry-semantic-conventions == 0.40b0.dev",
31+
"opentelemetry-util-http == 0.40b0.dev",
3232
"wrapt >= 1.0.0, < 2.0.0",
3333
]
3434

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.39b0.dev"
15+
__version__ = "0.40b0.dev"

‎instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.39b0.dev",
30-
"opentelemetry-instrumentation-dbapi == 0.39b0.dev",
29+
"opentelemetry-instrumentation == 0.40b0.dev",
30+
"opentelemetry-instrumentation-dbapi == 0.40b0.dev",
3131
"wrapt >= 1.0.0, < 2.0.0",
3232
]
3333

@@ -37,8 +37,8 @@ instruments = [
3737
]
3838
test = [
3939
"opentelemetry-instrumentation-aiopg[instruments]",
40-
"opentelemetry-semantic-conventions == 0.39b0.dev",
41-
"opentelemetry-test-utils == 0.39b0.dev",
40+
"opentelemetry-semantic-conventions == 0.40b0.dev",
41+
"opentelemetry-test-utils == 0.40b0.dev",
4242
]
4343

4444
[project.entry-points.opentelemetry_instrumentor]

‎instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.39b0.dev"
15+
__version__ = "0.40b0.dev"

‎instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ classifiers = [
2727
dependencies = [
2828
"asgiref ~= 3.0",
2929
"opentelemetry-api ~= 1.12",
30-
"opentelemetry-instrumentation == 0.39b0.dev",
31-
"opentelemetry-semantic-conventions == 0.39b0.dev",
32-
"opentelemetry-util-http == 0.39b0.dev",
30+
"opentelemetry-instrumentation == 0.40b0.dev",
31+
"opentelemetry-semantic-conventions == 0.40b0.dev",
32+
"opentelemetry-util-http == 0.40b0.dev",
3333
]
3434

3535
[project.optional-dependencies]
@@ -38,7 +38,7 @@ instruments = [
3838
]
3939
test = [
4040
"opentelemetry-instrumentation-asgi[instruments]",
41-
"opentelemetry-test-utils == 0.39b0.dev",
41+
"opentelemetry-test-utils == 0.40b0.dev",
4242
]
4343

4444
[project.urls]

‎instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.39b0.dev"
15+
__version__ = "0.40b0.dev"

‎instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.39b0.dev",
30-
"opentelemetry-semantic-conventions == 0.39b0.dev",
29+
"opentelemetry-instrumentation == 0.40b0.dev",
30+
"opentelemetry-semantic-conventions == 0.40b0.dev",
3131
]
3232

3333
[project.optional-dependencies]
@@ -36,7 +36,7 @@ instruments = [
3636
]
3737
test = [
3838
"opentelemetry-instrumentation-asyncpg[instruments]",
39-
"opentelemetry-test-utils == 0.39b0.dev",
39+
"opentelemetry-test-utils == 0.40b0.dev",
4040
]
4141

4242
[project.entry-points.opentelemetry_instrumentor]

‎instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.39b0.dev"
15+
__version__ = "0.40b0.dev"

‎instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ classifiers = [
2222
"Programming Language :: Python :: 3.8",
2323
]
2424
dependencies = [
25-
"opentelemetry-instrumentation == 0.39b0.dev",
25+
"opentelemetry-instrumentation == 0.40b0.dev",
2626
"opentelemetry-propagator-aws-xray == 1.0.1",
27-
"opentelemetry-semantic-conventions == 0.39b0.dev",
27+
"opentelemetry-semantic-conventions == 0.40b0.dev",
2828
]
2929

3030
[project.optional-dependencies]
3131
instruments = []
3232
test = [
33-
"opentelemetry-test-utils == 0.39b0.dev",
33+
"opentelemetry-test-utils == 0.40b0.dev",
3434
]
3535

3636
[project.urls]

‎instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.39b0.dev"
15+
__version__ = "0.40b0.dev"

‎instrumentation/opentelemetry-instrumentation-boto/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.39b0.dev",
30-
"opentelemetry-semantic-conventions == 0.39b0.dev",
29+
"opentelemetry-instrumentation == 0.40b0.dev",
30+
"opentelemetry-semantic-conventions == 0.40b0.dev",
3131
]
3232

3333
[project.optional-dependencies]
@@ -38,7 +38,7 @@ test = [
3838
"opentelemetry-instrumentation-boto[instruments]",
3939
"markupsafe==2.0.1",
4040
"moto~=2.0",
41-
"opentelemetry-test-utils == 0.39b0.dev",
41+
"opentelemetry-test-utils == 0.40b0.dev",
4242
]
4343

4444
[project.entry-points.opentelemetry_instrumentor]

‎instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.39b0.dev"
15+
__version__ = "0.40b0.dev"

‎instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.39b0.dev",
30-
"opentelemetry-semantic-conventions == 0.39b0.dev",
29+
"opentelemetry-instrumentation == 0.40b0.dev",
30+
"opentelemetry-semantic-conventions == 0.40b0.dev",
3131
"wrapt >= 1.0.0, < 2.0.0",
3232
]
3333

@@ -37,7 +37,7 @@ instruments = [
3737
]
3838
test = [
3939
"opentelemetry-instrumentation-boto3sqs[instruments]",
40-
"opentelemetry-test-utils == 0.39b0.dev",
40+
"opentelemetry-test-utils == 0.40b0.dev",
4141
]
4242

4343
[project.entry-points.opentelemetry_instrumentor]

‎instrumentation/opentelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.39b0.dev"
15+
__version__ = "0.40b0.dev"

‎instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.39b0.dev",
30-
"opentelemetry-semantic-conventions == 0.39b0.dev",
29+
"opentelemetry-instrumentation == 0.40b0.dev",
30+
"opentelemetry-semantic-conventions == 0.40b0.dev",
3131
]
3232

3333
[project.optional-dependencies]
@@ -38,7 +38,7 @@ test = [
3838
"opentelemetry-instrumentation-botocore[instruments]",
3939
"markupsafe==2.0.1",
4040
"moto[all] ~= 2.2.6",
41-
"opentelemetry-test-utils == 0.39b0.dev",
41+
"opentelemetry-test-utils == 0.40b0.dev",
4242
]
4343

4444
[project.entry-points.opentelemetry_instrumentor]

‎instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.39b0.dev"
15+
__version__ = "0.40b0.dev"

‎instrumentation/opentelemetry-instrumentation-celery/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.39b0.dev",
30-
"opentelemetry-semantic-conventions == 0.39b0.dev",
29+
"opentelemetry-instrumentation == 0.40b0.dev",
30+
"opentelemetry-semantic-conventions == 0.40b0.dev",
3131
]
3232

3333
[project.optional-dependencies]
@@ -36,7 +36,7 @@ instruments = [
3636
]
3737
test = [
3838
"opentelemetry-instrumentation-celery[instruments]",
39-
"opentelemetry-test-utils == 0.39b0.dev",
39+
"opentelemetry-test-utils == 0.40b0.dev",
4040
"pytest",
4141
]
4242

‎instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.39b0.dev"
15+
__version__ = "0.40b0.dev"

‎instrumentation/opentelemetry-instrumentation-confluent-kafka/src/opentelemetry/instrumentation/confluent_kafka/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.39b0.dev"
15+
__version__ = "0.40b0.dev"

‎instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.39b0.dev",
30-
"opentelemetry-semantic-conventions == 0.39b0.dev",
29+
"opentelemetry-instrumentation == 0.40b0.dev",
30+
"opentelemetry-semantic-conventions == 0.40b0.dev",
3131
"wrapt >= 1.0.0, < 2.0.0",
3232
]
3333

3434
[project.optional-dependencies]
3535
instruments = []
3636
test = [
37-
"opentelemetry-test-utils == 0.39b0.dev",
37+
"opentelemetry-test-utils == 0.40b0.dev",
3838
]
3939

4040
[project.urls]

‎instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.39b0.dev"
15+
__version__ = "0.40b0.dev"
1616

1717
_instruments = tuple()

‎instrumentation/opentelemetry-instrumentation-django/pyproject.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,22 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.39b0.dev",
30-
"opentelemetry-instrumentation-wsgi == 0.39b0.dev",
31-
"opentelemetry-semantic-conventions == 0.39b0.dev",
32-
"opentelemetry-util-http == 0.39b0.dev",
29+
"opentelemetry-instrumentation == 0.40b0.dev",
30+
"opentelemetry-instrumentation-wsgi == 0.40b0.dev",
31+
"opentelemetry-semantic-conventions == 0.40b0.dev",
32+
"opentelemetry-util-http == 0.40b0.dev",
3333
]
3434

3535
[project.optional-dependencies]
3636
asgi = [
37-
"opentelemetry-instrumentation-asgi == 0.39b0.dev",
37+
"opentelemetry-instrumentation-asgi == 0.40b0.dev",
3838
]
3939
instruments = [
4040
"django >= 1.10",
4141
]
4242
test = [
4343
"opentelemetry-instrumentation-django[instruments]",
44-
"opentelemetry-test-utils == 0.39b0.dev",
44+
"opentelemetry-test-utils == 0.40b0.dev",
4545
]
4646

4747
[project.entry-points.opentelemetry_instrumentor]

‎instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.39b0.dev"
15+
__version__ = "0.40b0.dev"

‎instrumentation/opentelemetry-instrumentation-elasticsearch/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
]
2727
dependencies = [
2828
"opentelemetry-api ~= 1.12",
29-
"opentelemetry-instrumentation == 0.39b0.dev",
30-
"opentelemetry-semantic-conventions == 0.39b0.dev",
29+
"opentelemetry-instrumentation == 0.40b0.dev",
30+
"opentelemetry-semantic-conventions == 0.40b0.dev",
3131
"wrapt >= 1.0.0, < 2.0.0",
3232
]
3333

@@ -38,7 +38,7 @@ instruments = [
3838
test = [
3939
"opentelemetry-instrumentation-elasticsearch[instruments]",
4040
"elasticsearch-dsl >= 2.0",
41-
"opentelemetry-test-utils == 0.39b0.dev",
41+
"opentelemetry-test-utils == 0.40b0.dev",
4242
]
4343

4444
[project.entry-points.opentelemetry_instrumentor]

0 commit comments

Comments
 (0)