fix: Datadog Base PIP Package added.

edx · Aug 12, 2024 · f330aca · f330aca
1 parent 006012d
commit f330aca
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 14 deletions.
diff --git a/commerce_coordinator/apps/commercetools/views.py b/commerce_coordinator/apps/commercetools/views.py
@@ -3,6 +3,7 @@
 """
 import logging
 
+from datadog_checks.base import AgentCheck
 from rest_framework import status
 from rest_framework.authentication import SessionAuthentication
 from rest_framework.permissions import IsAdminUser
@@ -21,7 +22,6 @@
     fulfill_order_sanctioned_message_signal
 )
 from commerce_coordinator.apps.core.views import SingleInvocationAPIView
-from datadog_checks import AgentCheck
 
 logger = logging.getLogger(__name__)
 

diff --git a/requirements/base.in b/requirements/base.in
@@ -10,6 +10,7 @@ celery
 celery[redis]
 currencies           # Currency Formatting
 python-dateutil
+datadog-checks-base
 Django>=2.2          # Web application framework
 django-cors-headers
 django-extensions

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -62,6 +62,8 @@ cryptography==42.0.8
     #   social-auth-core
 currencies==2020.12.12
     # via -r requirements/base.in
+datadog-checks-base==36.13.0
+    # via -r requirements/base.in
 defusedxml==0.8.0rc2
     # via
     #   python3-openid

diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -18,16 +18,15 @@ Django<5.0
 
 # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
 # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
+# See https://github.com/openedx/edx-platform/issues/35126 for more info
 elasticsearch<7.14.0
 
 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
 django-simple-history==3.0.0
 
-# opentelemetry requires version 6.x at the moment:
-# https://github.com/open-telemetry/opentelemetry-python/issues/3570
-# Normally this could be added as a constraint in edx-django-utils, where we're
-# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
-# that uses version 7.x, and then there's no undoing that when compiling base.txt.
-# So we need to pin it globally, for now.
-# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
-importlib-metadata<7
+# Cause: https://github.com/openedx/event-tracking/pull/290
+# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform.
+# We will pin event-tracking to do not break existing installations
+# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586
+# has been resolved and edx-platform is running with pymongo>=4.4.0
+event-tracking<2.4.1
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -130,6 +130,8 @@ cryptography==42.0.8
     #   social-auth-core
 currencies==2020.12.12
     # via -r requirements/validation.txt
+datadog-checks-base==36.13.0
+    # via -r requirements/validation.txt
 ddt==1.7.2
     # via -r requirements/validation.txt
 defusedxml==0.8.0rc2

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -127,6 +127,8 @@ cryptography==42.0.8
     #   social-auth-core
 currencies==2020.12.12
     # via -r requirements/test.txt
+datadog-checks-base==36.13.0
+    # via -r requirements/test.txt
 ddt==1.7.2
     # via -r requirements/test.txt
 defusedxml==0.8.0rc2
@@ -238,7 +240,6 @@ imagesize==1.4.1
     # via sphinx
 importlib-metadata==6.11.0
     # via
-    #   -c requirements/common_constraints.txt
     #   build
     #   keyring
     #   sphinx

diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -9,9 +9,7 @@ build==1.2.1
 click==8.1.7
     # via pip-tools
 importlib-metadata==6.11.0
-    # via
-    #   -c requirements/common_constraints.txt
-    #   build
+    # via build
 packaging==24.1
     # via build
 pip-tools==7.4.1

diff --git a/requirements/production.txt b/requirements/production.txt
@@ -87,6 +87,8 @@ cryptography==42.0.8
     #   social-auth-core
 currencies==2020.12.12
     # via -r requirements/base.txt
+datadog-checks-base==36.13.0
+    # via -r requirements/base.txt
 defusedxml==0.8.0rc2
     # via
     #   -r requirements/base.txt

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -121,6 +121,8 @@ cryptography==42.0.8
     #   social-auth-core
 currencies==2020.12.12
     # via -r requirements/test.txt
+datadog-checks-base==36.13.0
+    # via -r requirements/test.txt
 ddt==1.7.2
     # via -r requirements/test.txt
 defusedxml==0.8.0rc2
@@ -227,7 +229,6 @@ idna==3.7
     #   requests
 importlib-metadata==6.11.0
     # via
-    #   -c requirements/common_constraints.txt
     #   keyring
     #   twine
 importlib-resources==6.4.0

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -110,6 +110,8 @@ cryptography==42.0.8
     #   social-auth-core
 currencies==2020.12.12
     # via -r requirements/base.txt
+datadog-checks-base==36.13.0
+    # via -r requirements/base.txt
 ddt==1.7.2
     # via -r requirements/test.in
 defusedxml==0.8.0rc2

diff --git a/requirements/validation.txt b/requirements/validation.txt
@@ -154,6 +154,10 @@ currencies==2020.12.12
     # via
     #   -r requirements/quality.txt
     #   -r requirements/test.txt
+datadog-checks-base==36.13.0
+    # via
+    #   -r requirements/quality.txt
+    #   -r requirements/test.txt
 ddt==1.7.2
     # via
     #   -r requirements/quality.txt