Merge branch 'ivana/potel/fix-propagate-scope-false' into ivana/potel/determine-lowest-otel-version

Author: sentrivana

scripts/populate_tox/config.py

@@ -41,6 +41,10 @@
             "py3.8": ["hypothesis"],
         },
     },
+    "cohere": {
+        "package": "cohere",
+        "python": ">=3.9",
+    },
     "django": {
         "package": "django",
         "deps": {

scripts/populate_tox/populate_tox.py

@@ -73,7 +73,6 @@
     "beam",
     "boto3",
     "chalice",
-    "cohere",
     "gcp",
     "httpx",
     "langchain",

scripts/populate_tox/tox.jinja

@@ -73,10 +73,6 @@ envlist =
     # Cloud Resource Context
     {py3.7,py3.12,py3.13}-cloud_resource_context
 
-    # Cohere
-    {py3.9,py3.11,py3.12}-cohere-v5
-    {py3.9,py3.11,py3.12}-cohere-latest
-
     # GCP
     {py3.7}-gcp
 
@@ -225,10 +221,6 @@ deps =
     chalice-v1.16: chalice~=1.16.0
     chalice-latest: chalice
 
-    # Cohere
-    cohere-v5: cohere~=5.3.3
-    cohere-latest: cohere
-
     # HTTPX
     httpx-v0.16: pytest-httpx==0.10.0
     httpx-v0.18: pytest-httpx==0.12.0

sentry_sdk/integrations/__init__.py

@@ -132,6 +132,7 @@ def iter_default_integrations(with_auto_enabling_integrations):
     "chalice": (1, 16, 0),
     "clickhouse_driver": (0, 2, 0),
     "common": (1, 4, 0),  # opentelemetry-sdk
+    "cohere": (5, 4, 0),
     "django": (2, 0),
     "dramatiq": (1, 9),
     "falcon": (3, 0),

tox.ini

@@ -73,10 +73,6 @@ envlist =
     # Cloud Resource Context
     {py3.7,py3.12,py3.13}-cloud_resource_context
 
-    # Cohere
-    {py3.9,py3.11,py3.12}-cohere-v5
-    {py3.9,py3.11,py3.12}-cohere-latest
-
     # GCP
     {py3.7}-gcp
 
@@ -145,6 +141,11 @@ envlist =
 
 
     # ~~~ AI ~~~
+    {py3.9,py3.10,py3.11}-cohere-v5.4.0
+    {py3.9,py3.11,py3.12}-cohere-v5.9.4
+    {py3.9,py3.11,py3.12}-cohere-v5.13.9
+    {py3.9,py3.11,py3.12}-cohere-v5.15.0
+
     {py3.8,py3.10,py3.11}-huggingface_hub-v0.22.2
     {py3.8,py3.10,py3.11}-huggingface_hub-v0.25.2
     {py3.8,py3.12,py3.13}-huggingface_hub-v0.28.1
@@ -375,10 +376,6 @@ deps =
     chalice-v1.16: chalice~=1.16.0
     chalice-latest: chalice
 
-    # Cohere
-    cohere-v5: cohere~=5.3.3
-    cohere-latest: cohere
-
     # HTTPX
     httpx-v0.16: pytest-httpx==0.10.0
     httpx-v0.18: pytest-httpx==0.12.0
@@ -504,6 +501,11 @@ deps =
 
 
     # ~~~ AI ~~~
+    cohere-v5.4.0: cohere==5.4.0
+    cohere-v5.9.4: cohere==5.9.4
+    cohere-v5.13.9: cohere==5.13.9
+    cohere-v5.15.0: cohere==5.15.0
+
     huggingface_hub-v0.22.2: huggingface_hub==0.22.2
     huggingface_hub-v0.25.2: huggingface_hub==0.25.2
     huggingface_hub-v0.28.1: huggingface_hub==0.28.1