Merge branch 'getsentry:master' into sanic-integrations-fix

.craft.yml

@@ -1,18 +1,12 @@
----
-minVersion: "0.14.0"
-github:
-  owner: getsentry
-  repo: sentry-python
-
+minVersion: 0.23.1
 targets:
   - name: pypi
     includeNames: /^sentry[_\-]sdk.*$/
   - name: github
   - name: gh-pages
   - name: registry
-    type: sdk
-    config:
-      canonical: pypi:sentry-sdk
+    sdks:
+      pypi:sentry-sdk:
   - name: aws-lambda-layer
     includeNames: /^sentry-python-serverless-\d+(\.\d+)*\.zip$/
     layerName: SentryPythonServerlessSDK
@@ -29,11 +23,5 @@ targets:
           - python3.7
           - python3.8
     license: MIT
-
 changelog: CHANGELOG.md
 changelogPolicy: simple
-
-statusProvider:
-  name: github
-artifactProvider:
-  name: github

linter-requirements.txt

@@ -1,4 +1,4 @@
-black==21.5b2
+black==21.6b0
 flake8==3.9.2
 flake8-import-order==0.18.1
 mypy==0.782

sentry_sdk/integrations/aws_lambda.py

@@ -400,13 +400,15 @@ def _get_cloudwatch_logs_url(aws_context, start_time):
         str -- AWS Console URL to logs.
     """
     formatstring = "%Y-%m-%dT%H:%M:%SZ"
+    region = environ.get("AWS_REGION", "")
 
     url = (
-        "https://console.aws.amazon.com/cloudwatch/home?region={region}"
+        "https://console.{domain}/cloudwatch/home?region={region}"
         "#logEventViewer:group={log_group};stream={log_stream}"
         ";start={start_time};end={end_time}"
     ).format(
-        region=environ.get("AWS_REGION"),
+        domain="amazonaws.cn" if region.startswith("cn-") else "aws.amazon.com",
+        region=region,
         log_group=aws_context.log_group_name,
         log_stream=aws_context.log_stream_name,
         start_time=(start_time - timedelta(seconds=1)).strftime(formatstring),

sentry_sdk/worker.py

@@ -66,7 +66,7 @@ def start(self):
                 self._thread = threading.Thread(
                     target=self._target, name="raven-sentry.BackgroundWorker"
                 )
-                self._thread.setDaemon(True)
+                self._thread.daemon = True
                 self._thread.start()
                 self._thread_for_pid = os.getpid()