Skip to content

Commit a202550

Browse files
lzchenlzchen
authored
Merge branch 'main' into fix/1477
2 parents 3e80a2d + 6189be6 commit a202550

File tree

131 files changed

+383
-326
lines changed

Some content is hidden

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

131 files changed

+383
-326
lines changed

‎.github/workflows/lint_0.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
pull_request:
1111

1212
env:
13-
CORE_REPO_SHA: main
13+
CORE_REPO_SHA: opentelemetrybot/update-version-to-1.32.0.dev-0.53b0.dev
1414
CONTRIB_REPO_SHA: main
1515
PIP_EXISTS_ACTION: w
1616

‎.github/workflows/misc_0.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
pull_request:
1111

1212
env:
13-
CORE_REPO_SHA: main
13+
CORE_REPO_SHA: opentelemetrybot/update-version-to-1.32.0.dev-0.53b0.dev
1414
CONTRIB_REPO_SHA: main
1515
PIP_EXISTS_ACTION: w
1616

‎.github/workflows/test_0.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
pull_request:
1111

1212
env:
13-
CORE_REPO_SHA: main
13+
CORE_REPO_SHA: opentelemetrybot/update-version-to-1.32.0.dev-0.53b0.dev
1414
CONTRIB_REPO_SHA: main
1515
PIP_EXISTS_ACTION: w
1616

‎.github/workflows/test_1.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
pull_request:
1111

1212
env:
13-
CORE_REPO_SHA: main
13+
CORE_REPO_SHA: opentelemetrybot/update-version-to-1.32.0.dev-0.53b0.dev
1414
CONTRIB_REPO_SHA: main
1515
PIP_EXISTS_ACTION: w
1616

‎.github/workflows/test_2.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
pull_request:
1111

1212
env:
13-
CORE_REPO_SHA: main
13+
CORE_REPO_SHA: opentelemetrybot/update-version-to-1.32.0.dev-0.53b0.dev
1414
CONTRIB_REPO_SHA: main
1515
PIP_EXISTS_ACTION: w
1616

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111
1212
## Unreleased
1313

14+
## Version 1.31.0/0.52b0 (2025-03-12)
15+
1416
### Added
1517

1618
- `opentelemetry-instrumentation-openai-v2` Update doc for OpenAI Instrumentation to support OpenAI Compatible Platforms
@@ -42,6 +44,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4244
([#3113](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3113))
4345
- `opentelemetry-instrumentation-redis` Add missing entry in doc string for `def _instrument`
4446
([#3247](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3247))
47+
- `opentelemetry-instrumentation-botocore` sns-extension: Change destination name attribute
48+
to match topic ARN and redact phone number from attributes
49+
([#3249](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3249))
4550
- `opentelemetry-instrumentation-asyncpg` Fix fallback for empty queries.
4651
([#3253](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3253))
4752
- `opentelemetry-instrumentation-threading` Fix broken context typehints

‎_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.52b0.dev"
15+
__version__ = "0.53b0.dev"

‎dev-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pylint==3.0.2
22
httpretty==1.1.4
3-
pyright==v1.1.390
3+
pyright==v1.1.396
44
sphinx==7.1.2
55
sphinx-rtd-theme==2.0.0rc4
66
sphinx-autodoc-typehints==1.25.2

‎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.31.0.dev
19+
version=1.32.0.dev
2020

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

3636
[prerelease]
37-
version=0.52b0.dev
37+
version=0.53b0.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.52b0.dev"
15+
__version__ = "0.53b0.dev"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ classifiers = [
2828
dependencies = [
2929
"opentelemetry-api ~= 1.12",
3030
"opentelemetry-sdk ~= 1.12",
31-
"opentelemetry-semantic-conventions == 0.52b0.dev",
31+
"opentelemetry-semantic-conventions == 0.53b0.dev",
3232
"rich>=10.0.0",
3333
]
3434

‎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.52b0.dev"
15+
__version__ = "0.53b0.dev"

‎instrumentation-genai/opentelemetry-instrumentation-vertexai/src/opentelemetry/instrumentation/vertexai/utils.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ def request_to_events(
240240
id_=f"{function_response.name}_{idx}",
241241
role=content.role,
242242
content=json_format.MessageToDict(
243-
function_response._pb.response # type: ignore[reportUnknownMemberType]
243+
function_response._pb.response
244244
)
245245
if capture_content
246246
else None,
@@ -300,7 +300,7 @@ def _extract_tool_calls(
300300
function=ChoiceToolCall.Function(
301301
name=part.function_call.name,
302302
arguments=json_format.MessageToDict(
303-
part.function_call._pb.args # type: ignore[reportUnknownMemberType]
303+
part.function_call._pb.args
304304
)
305305
if capture_content
306306
else None,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.5",
30-
"opentelemetry-instrumentation == 0.52b0.dev",
30+
"opentelemetry-instrumentation == 0.53b0.dev",
3131
"wrapt >= 1.0.0, < 2.0.0",
3232
]
3333

‎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.52b0.dev"
15+
__version__ = "0.53b0.dev"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.12",
30-
"opentelemetry-instrumentation == 0.52b0.dev",
31-
"opentelemetry-semantic-conventions == 0.52b0.dev",
32-
"opentelemetry-util-http == 0.52b0.dev",
30+
"opentelemetry-instrumentation == 0.53b0.dev",
31+
"opentelemetry-semantic-conventions == 0.53b0.dev",
32+
"opentelemetry-util-http == 0.53b0.dev",
3333
"wrapt >= 1.0.0, < 2.0.0",
3434
]
3535

‎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.52b0.dev"
15+
__version__ = "0.53b0.dev"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.12",
30-
"opentelemetry-instrumentation == 0.52b0.dev",
31-
"opentelemetry-semantic-conventions == 0.52b0.dev",
32-
"opentelemetry-util-http == 0.52b0.dev",
30+
"opentelemetry-instrumentation == 0.53b0.dev",
31+
"opentelemetry-semantic-conventions == 0.53b0.dev",
32+
"opentelemetry-util-http == 0.53b0.dev",
3333
"wrapt >= 1.0.0, < 2.0.0",
3434
]
3535

‎instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/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.52b0.dev"
15+
__version__ = "0.53b0.dev"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.27",
30-
"opentelemetry-instrumentation == 0.52b0.dev",
31-
"opentelemetry-semantic-conventions == 0.52b0.dev",
30+
"opentelemetry-instrumentation == 0.53b0.dev",
31+
"opentelemetry-semantic-conventions == 0.53b0.dev",
3232
]
3333

3434
[project.optional-dependencies]

‎instrumentation/opentelemetry-instrumentation-aiokafka/src/opentelemetry/instrumentation/aiokafka/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.52b0.dev"
15+
__version__ = "0.53b0.dev"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.12",
30-
"opentelemetry-instrumentation == 0.52b0.dev",
31-
"opentelemetry-instrumentation-dbapi == 0.52b0.dev",
30+
"opentelemetry-instrumentation == 0.53b0.dev",
31+
"opentelemetry-instrumentation-dbapi == 0.53b0.dev",
3232
"wrapt >= 1.0.0, < 2.0.0",
3333
]
3434

‎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.52b0.dev"
15+
__version__ = "0.53b0.dev"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ classifiers = [
2828
dependencies = [
2929
"asgiref ~= 3.0",
3030
"opentelemetry-api ~= 1.12",
31-
"opentelemetry-instrumentation == 0.52b0.dev",
32-
"opentelemetry-semantic-conventions == 0.52b0.dev",
33-
"opentelemetry-util-http == 0.52b0.dev",
31+
"opentelemetry-instrumentation == 0.53b0.dev",
32+
"opentelemetry-semantic-conventions == 0.53b0.dev",
33+
"opentelemetry-util-http == 0.53b0.dev",
3434
]
3535

3636
[project.optional-dependencies]

‎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.52b0.dev"
15+
__version__ = "0.53b0.dev"

‎instrumentation/opentelemetry-instrumentation-asyncio/README.rst

+5
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ Run instrumented application
5555
5656
# export OTEL_PYTHON_ASYNCIO_FUTURE_TRACE_ENABLED=true
5757
58+
import asyncio
59+
from opentelemetry.instrumentation.asyncio import AsyncioInstrumentor
60+
61+
AsyncioInstrumentor().instrument()
62+
5863
loop = asyncio.get_event_loop()
5964
6065
future = asyncio.Future()

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.14",
30-
"opentelemetry-instrumentation == 0.52b0.dev",
31-
"opentelemetry-semantic-conventions == 0.52b0.dev",
30+
"opentelemetry-instrumentation == 0.53b0.dev",
31+
"opentelemetry-semantic-conventions == 0.53b0.dev",
3232
"wrapt >= 1.0.0, < 2.0.0",
3333
]
3434

‎instrumentation/opentelemetry-instrumentation-asyncio/src/opentelemetry/instrumentation/asyncio/__init__.py

+7
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ async def main():
4141
4242
# export OTEL_PYTHON_ASYNCIO_FUTURE_TRACE_ENABLED=true
4343
44+
import asyncio
45+
from opentelemetry.instrumentation.asyncio import AsyncioInstrumentor
46+
47+
AsyncioInstrumentor().instrument()
48+
4449
loop = asyncio.get_event_loop()
4550
4651
future = asyncio.Future()
@@ -52,6 +57,8 @@ async def main():
5257
-------------
5358
.. code:: python
5459
60+
# export OTEL_PYTHON_ASYNCIO_TO_THREAD_FUNCTION_NAMES_TO_TRACE=func
61+
5562
import asyncio
5663
from opentelemetry.instrumentation.asyncio import AsyncioInstrumentor
5764

‎instrumentation/opentelemetry-instrumentation-asyncio/src/opentelemetry/instrumentation/asyncio/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.52b0.dev"
15+
__version__ = "0.53b0.dev"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.12",
30-
"opentelemetry-instrumentation == 0.52b0.dev",
31-
"opentelemetry-semantic-conventions == 0.52b0.dev",
30+
"opentelemetry-instrumentation == 0.53b0.dev",
31+
"opentelemetry-semantic-conventions == 0.53b0.dev",
3232
]
3333

3434
[project.optional-dependencies]

‎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.52b0.dev"
15+
__version__ = "0.53b0.dev"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ classifiers = [
2626
"Programming Language :: Python :: 3.13",
2727
]
2828
dependencies = [
29-
"opentelemetry-instrumentation == 0.52b0.dev",
30-
"opentelemetry-semantic-conventions == 0.52b0.dev",
29+
"opentelemetry-instrumentation == 0.53b0.dev",
30+
"opentelemetry-semantic-conventions == 0.53b0.dev",
3131
"opentelemetry-propagator-aws-xray ~= 1.0",
3232
]
3333

‎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.52b0.dev"
15+
__version__ = "0.53b0.dev"

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

+2-2
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.52b0.dev",
30-
"opentelemetry-semantic-conventions == 0.52b0.dev",
29+
"opentelemetry-instrumentation == 0.53b0.dev",
30+
"opentelemetry-semantic-conventions == 0.53b0.dev",
3131
]
3232

3333
[project.optional-dependencies]

‎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.52b0.dev"
15+
__version__ = "0.53b0.dev"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.12",
30-
"opentelemetry-instrumentation == 0.52b0.dev",
31-
"opentelemetry-semantic-conventions == 0.52b0.dev",
30+
"opentelemetry-instrumentation == 0.53b0.dev",
31+
"opentelemetry-semantic-conventions == 0.53b0.dev",
3232
"wrapt >= 1.0.0, < 2.0.0",
3333
]
3434

‎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.52b0.dev"
15+
__version__ = "0.53b0.dev"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"opentelemetry-api ~= 1.30",
30-
"opentelemetry-instrumentation == 0.52b0.dev",
31-
"opentelemetry-semantic-conventions == 0.52b0.dev",
30+
"opentelemetry-instrumentation == 0.53b0.dev",
31+
"opentelemetry-semantic-conventions == 0.53b0.dev",
3232
"opentelemetry-propagator-aws-xray ~= 1.0",
3333
]
3434

0 commit comments

Comments
 (0)