Skip to content

Commit a5bc035

Browse files
authored
Merge branch 'main' into rken-asgi-header-decoding
2 parents 61dd28c + 6f1a17d commit a5bc035

File tree

211 files changed

+550
-454
lines changed

Some content is hidden

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

211 files changed

+550
-454
lines changed

.github/component_owners.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,13 @@ components:
4545

4646
instrumentation/opentelemetry-instrumentation-urllib:
4747
- shalevr
48-
- ocelotl
4948

5049
instrumentation/opentelemetry-instrumentation-urllib3:
5150
- shalevr
52-
- ocelotl
5351

5452
instrumentation/opentelemetry-instrumentation-sqlalchemy:
5553
- shalevr
5654

57-
instrumentation/opentelemetry-instrumentation-flask:
58-
- ocelotl
59-
60-
instrumentation/opentelemetry-instrumentation-jinja2:
61-
- ocelotl
62-
63-
instrumentation/opentelemetry-instrumentation-logging:
64-
- ocelotl
65-
66-
instrumentation/opentelemetry-instrumentation-requests:
67-
- ocelotl
68-
6955
instrumentation/opentelemetry-instrumentation-cassandra:
7056
- mattcontinisio
7157

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10+
## Version 1.27.0/0.48b0 ()
11+
1012
### Added
1113

1214
- `opentelemetry-instrumentation-kafka-python` Instrument temporary fork, kafka-python-ng
1315
inside kafka-python's instrumentation
1416
([#2537](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2537))
17+
- `opentelemetry-instrumentation-asgi`, `opentelemetry-instrumentation-fastapi` Add ability to disable internal HTTP send and receive spans
18+
([#2802](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2802))
1519

1620
### Breaking changes
1721

@@ -44,6 +48,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4448
([#2563](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2563))
4549
- `opentelemetry-instrumentation` fix `http.host` new http semantic convention mapping to depend on `kind` of span
4650
([#2814](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2814))
51+
- `opentelemetry-instrumentation` Fix the description of `http.server.duration` and `http.server.request.duration`
52+
([#2753](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2753))
53+
- `opentelemetry-instrumentation-grpc` Fix grpc supported version
54+
([#2845](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2845))
4755

4856
## Version 1.26.0/0.47b0 (2024-07-23)
4957

CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ Below is a checklist of things to be mindful of when implementing a new instrume
275275
- Isolate sync and async test
276276
- For synchronous tests, the typical test case class is inherited from `opentelemetry.test.test_base.TestBase`. However, if you want to write asynchronous tests, the test case class should inherit also from `IsolatedAsyncioTestCase`. Adding asynchronous tests to a common test class can lead to tests passing without actually running, which can be misleading.
277277
- ex. <https://github.com/open-telemetry/opentelemetry-python-contrib/blob/60fb936b7e5371b3e5587074906c49fb873cbd76/instrumentation/opentelemetry-instrumentation-grpc/tests/test_aio_server_interceptor.py#L84>
278+
- All instrumentations have the same version. If you are going to develop a new instrumentation it would probably have `X.Y.dev` version and depends on `opentelemetry-instrumentation` and `opentelemetry-semantic-conventions` for the same version. That means that if you want to install your instrumentation you need to install its dependencies from this repo and the core repo also from git.
278279

279280
## Expectations from contributors
280281

_template/version.py

Lines changed: 1 addition & 1 deletion
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.48b0.dev"
15+
__version__ = "0.49b0.dev"

eachdist.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sortfirst=
1616
ext/*
1717

1818
[stable]
19-
version=1.27.0.dev
19+
version=1.28.0.dev
2020

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

3636
[prerelease]
37-
version=0.48b0.dev
37+
version=0.49b0.dev
3838

3939
packages=
4040
all

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

Lines changed: 1 addition & 1 deletion
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.48b0.dev"
15+
__version__ = "0.49b0.dev"

exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
certifi==2024.7.4
33
charset-normalizer==3.3.2
44
# We can drop this after bumping baseline to pypy-39

exporter/opentelemetry-exporter-richconsole/pyproject.toml

Lines changed: 1 addition & 1 deletion
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.48b0.dev",
30+
"opentelemetry-semantic-conventions == 0.49b0.dev",
3131
"rich>=10.0.0",
3232
]
3333

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

Lines changed: 1 addition & 1 deletion
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.48b0.dev"
15+
__version__ = "0.49b0.dev"

exporter/opentelemetry-exporter-richconsole/test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
asgiref==3.7.2
1+
asgiref==3.8.1
22
Deprecated==1.2.14
33
flaky==3.7.0
44
importlib-metadata==6.11.0

0 commit comments

Comments
 (0)