edx-ace 1.8.0__tar.gz → 1.9.1__tar.gz

{edx-ace-1.8.0/edx_ace.egg-info → edx-ace-1.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edx-ace
-Version: 1.8.0
+Version: 1.9.1
 Summary: Framework for Messaging
 Home-page: https://github.com/openedx/edx-ace
 Author: edX

{edx-ace-1.8.0 → edx-ace-1.9.1}/edx_ace/__init__.py

@@ -13,7 +13,7 @@ from .policy import Policy, PolicyResult
 from .recipient import Recipient
 from .recipient_resolver import RecipientResolver
 
-__version__ = '1.8.0'
+__version__ = '1.9.1'
 
 
 __all__ = [

{edx-ace-1.8.0 → edx-ace-1.9.1}/edx_ace/channel/django_email.py

@@ -62,6 +62,7 @@ class DjangoEmailChannel(EmailChannelMixin, Channel):
                 from_email=from_address,
                 to=[message.recipient.email_address],
                 reply_to=reply_to,
+                headers=message.headers,
             )
 
             mail.attach_alternative(rendered_template, 'text/html')

{edx-ace-1.8.0 → edx-ace-1.9.1}/edx_ace/message.py

@@ -73,6 +73,9 @@ class Message(MessageAttributeSerializationMixin, metaclass=ABCMeta):
         default=None
     )
     options = attr.ib()
+
+    # headers are only supported for DjangoEmailChannel
+    headers = attr.ib()
     language = attr.ib(default=None)
     log_level = attr.ib(default=None)
 
@@ -84,6 +87,10 @@ class Message(MessageAttributeSerializationMixin, metaclass=ABCMeta):
     def default_options_value(self):
         return {}
 
+    @headers.default
+    def default_headers_value(self):
+        return {}
+
     @uuid.default
     def generate_uuid(self):
         return uuid4()

edx-ace-1.9.1/edx_ace/monitoring.py

@@ -0,0 +1,9 @@
+"""
+:mod:`edx_ace.monitoring` exposes functions that are useful for reporting ACE
+message delivery stats to monitoring services.
+"""
+from edx_django_utils.monitoring import set_custom_attribute
+
+
+def report(key, value):
+    set_custom_attribute(key, value)

{edx-ace-1.8.0 → edx-ace-1.9.1/edx_ace.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edx-ace
-Version: 1.8.0
+Version: 1.9.1
 Summary: Framework for Messaging
 Home-page: https://github.com/openedx/edx-ace
 Author: edX

{edx-ace-1.8.0 → edx-ace-1.9.1}/edx_ace.egg-info/requires.txt

@@ -1,5 +1,6 @@
 Django>=2.2
 attrs>=17.2.0
+edx-django-utils>=5.14.2
 python-dateutil
 sailthru-client==2.2.3
 six

{edx-ace-1.8.0 → edx-ace-1.9.1}/requirements/base.in

@@ -7,3 +7,4 @@ attrs>=17.2.0                     # Attributes without boilerplate
 sailthru-client==2.2.3
 six
 stevedore>=1.10.0
+edx-django-utils>=5.14.2

edx-ace-1.8.0/edx_ace/monitoring.py

@@ -1,17 +0,0 @@
-"""
-:mod:`edx_ace.monitoring` exposes functions that are useful for reporting ACE
-message delivery stats to monitoring services.
-"""
-try:
-    import newrelic.agent
-except ImportError:
-    newrelic = None  # pylint: disable=invalid-name
-
-
-def report(key, value):
-    report_to_newrelic(key, value)
-
-
-def report_to_newrelic(key, value):
-    if newrelic:
-        newrelic.agent.add_custom_parameter(key, value)