Fix python 2 type validation

newrelic · Mar 29, 2023 · 283de53 · 283de53
1 parent 45f6896
commit 283de53
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/newrelic/api/time_trace.py b/newrelic/api/time_trace.py
@@ -435,8 +435,8 @@ def notice_error(self, error=None, attributes=None, expected=None, ignore=None,
                         })
                         if error_group_name_raw:
                             _, error_group_name = process_user_attribute("error.group.name", error_group_name_raw)
-                            if error_group_name is None or not isinstance(error_group_name, six.text_type):
-                                raise ValueError("Invalid attribute value for error.group.name. Expected string, got: %s" % str(error_group_name_raw))
+                            if error_group_name is None or not isinstance(error_group_name, six.string_types):
+                                raise ValueError("Invalid attribute value for error.group.name. Expected string, got: %s" % repr(error_group_name_raw))
                     except Exception:
                         _logger.error("Encountered error when calling error group callback:\n%s", "".join(traceback.format_exception(*sys.exc_info())))
                         error_group_name = None

diff --git a/newrelic/core/stats_engine.py b/newrelic/core/stats_engine.py
@@ -742,8 +742,8 @@ def notice_error(self, error=None, attributes=None, expected=None, ignore=None,
                     })
                     if error_group_name_raw:
                         _, error_group_name = process_user_attribute("error.group.name", error_group_name_raw)
-                        if error_group_name is None or not isinstance(error_group_name, six.text_type):
-                            raise ValueError("Invalid attribute value for error.group.name. Expected string, got: %s" % str(error_group_name_raw))
+                        if error_group_name is None or not isinstance(error_group_name, six.string_types):
+                            raise ValueError("Invalid attribute value for error.group.name. Expected string, got: %s" % repr(error_group_name_raw))
                         else:
                             agent_attributes["error.group.name"] = error_group_name