Merge branch 'main' into botocore-region-attribute

Author: SrdjanLL

RELEASING.md

@@ -9,7 +9,8 @@
       (otherwise the workflow will pick up the version from `main` and just remove the `.dev` suffix).
   * Review the two pull requests that it creates.
     (one is targeted to the release branch and one is targeted to `main`).
-    * The builds will fail for both the `main` and release pr because of validation rules. Follow the [release workflow](https://github.com/open-telemetry/opentelemetry-python/blob/main/RELEASING.md) for the core repo up until this same point. Change the SHAs of each PR to point at each other to get the `main` and release builds to pass.
+    * The builds will fail for the release PR because of validation rules. Follow the [release workflow](https://github.com/open-telemetry/opentelemetry-python/blob/main/RELEASING.md) for the core repo up until this same point.
+    * Close and reopen the PR so that the workflow will take into account the label automation we have in place
   * Merge the release PR.
   * Merge the PR to main (this can be done separately from [making the release](#making-the-release))
 

tests/opentelemetry-docker-tests/tests/check_availability.py

@@ -42,8 +42,8 @@
 MSSQL_PORT = int(os.getenv("MSSQL_PORT", "1433"))
 MSSQL_USER = os.getenv("MSSQL_USER", "sa")
 MSSQL_PASSWORD = os.getenv("MSSQL_PASSWORD", "yourStrong(!)Password")
-RETRY_COUNT = 8
-RETRY_INTERVAL = 5  # Seconds
+RETRY_COUNT = 5
+RETRY_INITIAL_INTERVAL = 2  # Seconds
 
 logger = logging.getLogger(__name__)
 
@@ -56,14 +56,16 @@ def wrapper():
                 func()
                 return
             except Exception as ex:  # pylint: disable=broad-except
+                # Exponential backoff
+                backoff_interval = RETRY_INITIAL_INTERVAL * (2**i)
                 logger.error(
                     "waiting for %s, retry %d/%d [%s]",
                     func.__name__,
                     i + 1,
                     RETRY_COUNT,
                     ex,
                 )
-            time.sleep(RETRY_INTERVAL)
+            time.sleep(backoff_interval)
         raise Exception(f"waiting for {func.__name__} failed")
 
     return wrapper