Merge branch 'main' into feat/aiobotocore-instrumentation

Author: xrmx

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/lint.yml.j2

@@ -5,9 +5,8 @@ name: Lint {{ file_number }}
 
 on:
   push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
+    branches:
+    - 'main'
   pull_request:
 
 permissions:

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2

@@ -5,9 +5,8 @@ name: Misc {{ file_number }}
 
 on:
   push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
+    branches:
+    - 'main'
   pull_request:
 
 permissions:

.github/workflows/generate_workflows_lib/src/generate_workflows_lib/test.yml.j2

@@ -5,9 +5,8 @@ name: Test {{ file_number }}
 
 on:
   push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
+    branches:
+    - 'main'
   pull_request:
 
 permissions:

.github/workflows/lint_0.yml

@@ -5,9 +5,8 @@ name: Lint 0
 
 on:
   push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
+    branches:
+    - 'main'
   pull_request:
 
 permissions:

.github/workflows/misc_0.yml

@@ -5,9 +5,8 @@ name: Misc 0
 
 on:
   push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
+    branches:
+    - 'main'
   pull_request:
 
 permissions:

.github/workflows/test_0.yml

@@ -5,9 +5,8 @@ name: Test 0
 
 on:
   push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
+    branches:
+    - 'main'
   pull_request:
 
 permissions:

.github/workflows/test_1.yml

@@ -5,9 +5,8 @@ name: Test 1
 
 on:
   push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
+    branches:
+    - 'main'
   pull_request:
 
 permissions:

.github/workflows/test_2.yml

@@ -5,9 +5,8 @@ name: Test 2
 
 on:
   push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
+    branches:
+    - 'main'
   pull_request:
 
 permissions:

.github/workflows/test_3.yml

@@ -5,9 +5,8 @@ name: Test 3
 
 on:
   push:
-    branches-ignore:
-    - 'release/*'
-    - 'otelbot/*'
+    branches:
+    - 'main'
   pull_request:
 
 permissions:

CHANGELOG.md

@@ -28,6 +28,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4305](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4305))
 - Don't import module in unwrap if not already imported
   ([#4321](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4321))
+- `opentelemetry-instrumentation-logging`: Add recursion guard in LoggingHandler.emit to prevent deadlock
+  ([#4302](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4302))
+- `opentelemetry-instrumentation-grpc`: Fix bidirectional streaming RPCs raising `AttributeError: 'generator' object has no attribute 'add_done_callback'`
+  ([#4259](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4259))
 
 ### Breaking changes