Merge remote-tracking branch 'origin' into fix_deadlock_attempt2

Author: DylanRussell

CHANGELOG.md

@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Overwrite logging.config.fileConfig and logging.config.dictConfig to ensure
 the OTLP `LogHandler` remains attached to the root logger. Fix a bug that
 can cause a deadlock to occur over `logging._lock` in some cases ([#4636](https://github.com/open-telemetry/opentelemetry-python/pull/4636)).
+
+## Version 1.35.0/0.56b0 (2025-07-11)
+
 - Update OTLP proto to v1.7 [#4645](https://github.com/open-telemetry/opentelemetry-python/pull/4645).
 - Add `event_name` as a top level field in the `LogRecord`. Events are now simply logs with the
 `event_name` field set, the logs SDK should be used to emit events ([#4652](https://github.com/open-telemetry/opentelemetry-python/pull/4652)).
@@ -28,7 +31,8 @@ can cause a deadlock to occur over `logging._lock` in some cases ([#4636](https:
 - Update logger level to NOTSET in logs example
   ([#4637](https://github.com/open-telemetry/opentelemetry-python/pull/4637))
 - Logging API accepts optional `context`; deprecates `trace_id`, `span_id`, `trace_flags`.
-  ([#4597](https://github.com/open-telemetry/opentelemetry-python/pull/4597))
+  ([#4597](https://github.com/open-telemetry/opentelemetry-python/pull/4597)) and 
+  ([#4668](https://github.com/open-telemetry/opentelemetry-python/pull/4668))
 - sdk: use context instead of trace_id,span_id for initializing LogRecord
   ([#4653](https://github.com/open-telemetry/opentelemetry-python/pull/4653))
 - Rename LogRecordProcessor.emit to on_emit
@@ -37,6 +41,10 @@ can cause a deadlock to occur over `logging._lock` in some cases ([#4636](https:
   ([#4649](https://github.com/open-telemetry/opentelemetry-python/pull/4649))
 - proto: relax protobuf version requirement to support v6
   ([#4620](https://github.com/open-telemetry/opentelemetry-python/pull/4620))
+- Bump semantic-conventions to 1.36.0
+  ([#4669](https://github.com/open-telemetry/opentelemetry-python/pull/4669))
+- Set expected User-Agent in HTTP headers for grpc OTLP exporter
+  ([#4658](https://github.com/open-telemetry/opentelemetry-python/pull/4658))
 
 ## Version 1.34.0/0.55b0 (2025-06-04)
 

README.md

@@ -95,7 +95,16 @@ We meet weekly on Thursdays at 9AM PST. The meeting is subject to change dependi
 
 Meeting notes are available as a public [Google doc](https://docs.google.com/document/d/1CIMGoIOZ-c3-igzbd6_Pnxx1SjAkjwqoYSUWxPY8XIs/edit).
 
-Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telemetry/teams/python-approvers)):
+### Maintainers
+
+- [Aaron Abbott](https://github.com/aabmass), Google
+- [Diego Hurtado](https://github.com/ocelotl), Lightstep
+- [Leighton Chen](https://github.com/lzchen), Microsoft
+- [Riccardo Magliocchetti](https://github.com/xrmx), Elastic
+
+For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).
+
+### Approvers
 
 - [Emídio Neto](https://github.com/emdneto), PicPay
 - [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
@@ -105,40 +114,35 @@ Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telem
 - [Srikanth Chekuri](https://github.com/srikanthccv), signoz.io
 - [Tammy Baylis](https://github.com/tammy-baylis-swi), SolarWinds
 
-Emeritus Approvers
+For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver).
 
-- [Ashutosh Goel](https://github.com/ashu658), Cisco
-- [Carlos Alberto Cortez](https://github.com/carlosalberto), Lightstep
-- [Christian Neumüller](https://github.com/Oberon00), Dynatrace
-- [Héctor Hernández](https://github.com/hectorhdzg), Microsoft
-- [Mauricio Vásquez](https://github.com/mauriciovasquezbernal), Kinvolk
-- [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
-- [Nikolay Sokolik](https://github.com/oxeye-nikolay), Oxeye
-- [Sanket Mehta](https://github.com/sanketmehta28), Cisco
-- [Tahir H. Butt](https://github.com/majorgreys), DataDog
+### Emeritus Maintainers
 
-*For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
+- [Alex Boten](https://github.com/codeboten)
+- [Chris Kleinknecht](https://github.com/c24t)
+- [Owais Lone](https://github.com/owais)
+- [Reiley Yang](https://github.com/reyang)
+- [Srikanth Chekuri](https://github.com/srikanthccv)
+- [Yusuke Tsutsumi](https://github.com/toumorokoshi)
 
-Maintainers ([@open-telemetry/python-maintainers](https://github.com/orgs/open-telemetry/teams/python-maintainers)):
+For more information about the emeritus role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).
 
-- [Aaron Abbott](https://github.com/aabmass), Google
-- [Diego Hurtado](https://github.com/ocelotl), Lightstep
-- [Leighton Chen](https://github.com/lzchen), Microsoft
-- [Riccardo Magliocchetti](https://github.com/xrmx), Elastic
+### Emeritus Approvers
 
-Emeritus Maintainers:
-
-- [Alex Boten](https://github.com/codeboten), Lightstep
-- [Chris Kleinknecht](https://github.com/c24t), Google
-- [Owais Lone](https://github.com/owais), Splunk
-- [Reiley Yang](https://github.com/reyang), Microsoft
-- [Srikanth Chekuri](https://github.com/srikanthccv), signoz.io
-- [Yusuke Tsutsumi](https://github.com/toumorokoshi), Google
+- [Ashutosh Goel](https://github.com/ashu658)
+- [Carlos Alberto Cortez](https://github.com/carlosalberto)
+- [Christian Neumüller](https://github.com/Oberon00)
+- [Héctor Hernández](https://github.com/hectorhdzg)
+- [Mauricio Vásquez](https://github.com/mauriciovasquezbernal)
+- [Nathaniel Ruiz Nowell](https://github.com/NathanielRN)
+- [Nikolay Sokolik](https://github.com/oxeye-nikolay)
+- [Sanket Mehta](https://github.com/sanketmehta28)
+- [Tahir H. Butt](https://github.com/majorgreys)
 
-*For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).*
+For more information about the emeritus role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).
 
-### Thanks to all the people who already contributed!
+### Thanks to all of our contributors!
 
 <a href="https://github.com/open-telemetry/opentelemetry-python/graphs/contributors">
-  <img src="https://contributors-img.web.app/image?repo=open-telemetry/opentelemetry-python" />
+  <img alt="Repo contributors" src="https://contrib.rocks/image?repo=open-telemetry/opentelemetry-python" />
 </a>

eachdist.ini

@@ -11,7 +11,7 @@ sortfirst=
     exporter/*
 
 [stable]
-version=1.35.0.dev
+version=1.36.0.dev
 
 packages=
     opentelemetry-sdk
@@ -27,7 +27,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.56b0.dev
+version=0.57b0.dev
 
 packages=
     opentelemetry-opentracing-shim

exporter/opentelemetry-exporter-opencensus/pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
   "grpcio >= 1.63.2, < 2.0.0; python_version < '3.13'",
   "grpcio >= 1.66.2, < 2.0.0; python_version >= '3.13'",
   "opencensus-proto >= 0.1.0, < 1.0.0",
-  "opentelemetry-api >= 1.35.0.dev",
+  "opentelemetry-api >= 1.36.0.dev",
   "opentelemetry-sdk >= 1.15",
   "protobuf ~= 3.13",
   "setuptools >= 16.0",

exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version/__init__.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.56b0.dev"
+__version__ = "0.57b0.dev"

exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
   "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-  "opentelemetry-proto == 1.35.0.dev",
+  "opentelemetry-proto == 1.36.0.dev",
 ]
 
 [project.urls]

exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version/__init__.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.35.0.dev"
+__version__ = "1.36.0.dev"

exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml

@@ -30,9 +30,9 @@ dependencies = [
   "grpcio >= 1.63.2, < 2.0.0; python_version < '3.13'",
   "grpcio >= 1.66.2, < 2.0.0; python_version >= '3.13'",
   "opentelemetry-api ~= 1.15",
-  "opentelemetry-proto == 1.35.0.dev",
-  "opentelemetry-sdk ~= 1.35.0.dev",
-  "opentelemetry-exporter-otlp-proto-common == 1.35.0.dev",
+  "opentelemetry-proto == 1.36.0.dev",
+  "opentelemetry-sdk ~= 1.36.0.dev",
+  "opentelemetry-exporter-otlp-proto-common == 1.36.0.dev",
   "typing-extensions >= 4.6.0",
 ]
 

exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/__init__.py

@@ -73,4 +73,7 @@
 from .version import __version__
 
 _USER_AGENT_HEADER_VALUE = "OTel-OTLP-Exporter-Python/" + __version__
-_OTLP_GRPC_HEADERS = [("user-agent", _USER_AGENT_HEADER_VALUE)]
+_OTLP_GRPC_CHANNEL_OPTIONS = [
+    # this will appear in the http User-Agent header
+    ("grpc.primary_user_agent", _USER_AGENT_HEADER_VALUE)
+]

exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/_log_exporter/__init__.py

@@ -60,6 +60,7 @@ def __init__(
         ] = None,
         timeout: Optional[float] = None,
         compression: Optional[Compression] = None,
+        channel_options: Optional[TypingSequence[Tuple[str, str]]] = None,
     ):
         if insecure is None:
             insecure = environ.get(OTEL_EXPORTER_OTLP_LOGS_INSECURE)
@@ -99,6 +100,7 @@ def __init__(
                 "headers": headers,
                 "timeout": timeout or environ_timeout,
                 "compression": compression,
+                "channel_options": channel_options,
             }
         )