…'s timeout which is bad, but the behavior before made even less sense..

…essor in the shared_internal directory.

…ry-python into refactor_final2

…58b0 (#524)

This PR updates the upstream OpenTelemetry Python dependency to its
September 2025 release; Upgrading from version 1.33.1/0.54b1 to
1.37.0/0.58b0.

It also resolves several conflicts between the following OTel PRs and
existing ADOT patches:

starlette: Remove maximum version constraint  

open-telemetry/opentelemetry-python-contrib#3456

Make a BatchProcessor class which both BatchSpanRecordProcessor and
BatchLogRecordProcessor can use
open-telemetry/opentelemetry-python#4562

Make exporter timeout encompass retries/backoffs, add jitter to
backoffs, cleanup code a bit
open-telemetry/opentelemetry-python#4564

Update BatchSpanProcessor to use new BatchProcessor class 
open-telemetry/opentelemetry-python#4580

Fix issue where deadlock can occur over logging._lock 
open-telemetry/opentelemetry-python#4636

Tests Performed

tox -e lint
tox -e spellcheck
tox -e 3.9-test-aws-opentelemetry-distro
tox -e 3.10-test-aws-opentelemetry-distro
tox -e 3.11-test-aws-opentelemetry-distro
tox -e 3.12-test-aws-opentelemetry-distro
tox -e 3.13-test-aws-opentelemetry-distro

Smoke/contract tests: ./gradlew
appsignals-tests:contract-tests:contractTests

By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice.

Automated update of OpenTelemetry dependencies.

**Build Status:** ❌
[failure](https://github.com/aws-observability/aws-otel-python-instrumentation/actions/runs/21465140126)

**Updated versions:**
- [OpenTelemetry
Python](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.39.1):
1.39.1
- [OpenTelemetry
Contrib](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.60b1):
0.60b1
-
[opentelemetry-sdk-extension-aws](https://pypi.org/project/opentelemetry-sdk-extension-aws/2.1.0/):
2.1.0
-
[opentelemetry-propagator-aws-xray](https://pypi.org/project/opentelemetry-propagator-aws-xray/1.0.2/):
1.0.2

**Upstream releases with breaking changes:**
Note: the mechanism to detect upstream breaking changes is not perfect.
Be sure to check all new releases and understand if any additional
changes need to be addressed.

**opentelemetry-python:**
- [Version
1.35.0/0.56b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.35.0)

**opentelemetry-python-contrib:**
- [Version
1.34.0/0.55b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.55b0)

*Description of changes:*

- Un-reverts changes done in this PR:
#531

- Removed patches for Bedrock following the changes applied in these
PRs:
open-telemetry/opentelemetry-python-contrib#3544,
open-telemetry/opentelemetry-python-contrib#3548,
open-telemetry/opentelemetry-python-contrib#3875,
open-telemetry/opentelemetry-python-contrib#3990

- Removes patches for Secrets Manager, SNS, and Step Functions following
the changes applied in these PRs:
open-telemetry/opentelemetry-python-contrib#3734,
open-telemetry/opentelemetry-python-contrib#3737,
open-telemetry/opentelemetry-python-contrib#3765,

- Removes patches for Starlette following the changes applied in this
PR:
open-telemetry/opentelemetry-python-contrib#3456

- Changes imports and implementation of `OTLPAwsLogExporter`,
`AwsCloudWatchOtlpBatchLogRecordProcessor`, and
`CompactConsoleLogExporter` following these PRs:
open-telemetry/opentelemetry-python#4580,
open-telemetry/opentelemetry-python#4535,
open-telemetry/opentelemetry-python#4562,
open-telemetry/opentelemetry-python#4647,
open-telemetry/opentelemetry-python#4676

- Removes a few AWS semantic conventions from `_aws_attribute_keys ` and
replaces them with equivalent ones from upstream following the changes
in this PR:
open-telemetry/opentelemetry-python#4791

- Fix Lambda instrumentation test to set `AWS_LAMBDA_FUNCTION_NAME` env
var following changes in:
open-telemetry/opentelemetry-python-contrib#3183

- Adds a few more contract tests to verify upstream's botocore
instrumentation library


By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice.

---------

Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Thomas Pierce <thp@amazon.com>
Co-authored-by: Steve Liu <liustve@amazon.com>

…elemetry#4580)

* Update `BatchSpanProcessor` to use new `BatchProcessor` class

* Update changelog

* fork does not exist on windows.

* Update force_flush to return a bool. Currently force_flush ignores it's timeout which is bad, but the behavior before made even less sense..

* Fix changelog

* Add backtic's around BatchProcessor

* Require export get called by position only

* Add comment that there are additional tests for the BatchSpan/LogProcessor in the shared_internal directory.

* Empty commit to bump

* Fix broken test

---------

Co-authored-by: Leighton Chen <lechen@microsoft.com>
Co-authored-by: Emídio Neto <9735060+emdneto@users.noreply.github.com>
Co-authored-by: Aaron Abbott <aaronabbott@google.com>

…elemetry#4580)

* Update `BatchSpanProcessor` to use new `BatchProcessor` class

* Update changelog

* fork does not exist on windows.

* Update force_flush to return a bool. Currently force_flush ignores it's timeout which is bad, but the behavior before made even less sense..

* Fix changelog

* Add backtic's around BatchProcessor

* Require export get called by position only

* Add comment that there are additional tests for the BatchSpan/LogProcessor in the shared_internal directory.

* Empty commit to bump

* Fix broken test

---------

Co-authored-by: Leighton Chen <lechen@microsoft.com>
Co-authored-by: Emídio Neto <9735060+emdneto@users.noreply.github.com>
Co-authored-by: Aaron Abbott <aaronabbott@google.com>