Merge branch 'master' into ivana/set-global-attrs-on-global-scope

Author: sentrivana

tests/test_logs.py

@@ -342,16 +342,16 @@ def test_logs_tied_to_spans(sentry_init, capture_envelopes):
     assert logs[0]["span_id"] == span.span_id
 
 
+@minimum_python_37
 def test_auto_flush_logs_after_100(sentry_init, capture_envelopes):
     """
     If you log >100 logs, it should automatically trigger a flush.
     """
     sentry_init(enable_logs=True)
     envelopes = capture_envelopes()
 
-    python_logger = logging.Logger("test-logger")
     for i in range(200):
-        python_logger.warning("log #%d", i)
+        sentry_sdk.logger.warning("log")
 
     for _ in range(500):
         time.sleep(1.0 / 100.0)
@@ -361,15 +361,15 @@ def test_auto_flush_logs_after_100(sentry_init, capture_envelopes):
     raise AssertionError("200 logs were never flushed after five seconds")
 
 
+@minimum_python_37
 def test_log_user_attributes(sentry_init, capture_envelopes):
     """User attributes are sent if enable_logs is True and send_default_pii is True."""
     sentry_init(enable_logs=True, send_default_pii=True)
 
     sentry_sdk.set_user({"id": "1", "email": "test@example.com", "username": "test"})
     envelopes = capture_envelopes()
 
-    python_logger = logging.Logger("test-logger")
-    python_logger.warning("Hello, world!")
+    sentry_sdk.logger.warning("Hello, world!")
 
     get_client().flush()
 
@@ -384,15 +384,15 @@ def test_log_user_attributes(sentry_init, capture_envelopes):
     }
 
 
+@minimum_python_37
 def test_log_no_user_attributes_if_no_pii(sentry_init, capture_envelopes):
     """User attributes are not if PII sending is off."""
     sentry_init(enable_logs=True, send_default_pii=False)
 
     sentry_sdk.set_user({"id": "1", "email": "test@example.com", "username": "test"})
     envelopes = capture_envelopes()
 
-    python_logger = logging.Logger("test-logger")
-    python_logger.warning("Hello, world!")
+    sentry_sdk.logger.warning("Hello, world!")
 
     get_client().flush()
 
@@ -412,8 +412,7 @@ def test_auto_flush_logs_after_5s(sentry_init, capture_envelopes):
     sentry_init(enable_logs=True)
     envelopes = capture_envelopes()
 
-    python_logger = logging.Logger("test-logger")
-    python_logger.warning("log #%d", 1)
+    sentry_sdk.logger.warning("log")
 
     for _ in range(100):
         time.sleep(1.0 / 10.0)