Merge branch 'master' into andrii/implement-cronjob-to-fetch-orgs-projects

Author: Andrii Soldatenko

.github/CODEOWNERS

@@ -41,6 +41,7 @@
 /src/sentry/scripts/quotas/                              @getsentry/owners-ingest
 /src/sentry/scripts/tsdb/                                @getsentry/owners-ingest
 /src/sentry/tasks/store.py                               @getsentry/owners-ingest
+/src/sentry/tasks/relay.py                               @getsentry/owners-ingest
 /src/sentry/tasks/unmerge.py                             @getsentry/owners-ingest
 /tests/sentry/event_manager/                             @getsentry/owners-ingest
 /tests/sentry/ingest/                                    @getsentry/owners-ingest

.github/codeql/codeql-config.yml

@@ -1,4 +1,4 @@
-name: "Sentry CodeQL Config"
+name: 'Sentry CodeQL Config'
 
 paths-ignore:
   - '**/tests/**'

.github/dependabot.yml

@@ -60,3 +60,12 @@ updates:
       - dependency-name: 'reflux'
       - dependency-name: 'sprintf-js'
       - dependency-name: 'u2f-api'
+  - package-ecosystem: 'docker'
+    directory: 'docker/'
+    schedule:
+      interval: 'daily'
+    reviewers:
+      - '@getsentry/open-source'
+      - '@getsentry/security'
+    # security only updates
+    open-pull-requests-limit: 0

.github/labels.yml

@@ -266,9 +266,6 @@
 - name: 'Team: Telemetry Experience'
   color: '8D5494'
   description: telemetry-experience
-- name: 'Team: Visibility'
-  color: '8D5494'
-  description: ''
 - name: 'Team: Web SDKs - Backend'
   color: '8D5494'
   description: team-web-sdk-backend

.github/workflows/codeql.yml

@@ -9,14 +9,21 @@
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
 #
-name: "CodeQL"
+name: 'CodeQL'
 
 on:
   push:
-    branches: [ "master" ]
+    branches: ['master']
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master" ]
+    branches: ['master']
+    paths:
+      - '**.js'
+      - '**.ejs'
+      - '**.tsx'
+      - '**.ts'
+      - '**.py'
+      - '!tests/**'
   schedule:
     - cron: '44 12 * * 1'
 
@@ -32,42 +39,42 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'javascript', 'python' ]
+        language: ['javascript', 'python']
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8  # v3.1.0
+      - name: Checkout repository
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@3e7e3b32d0fb8283594bb0a76cc60a00918b0969  # v2
-      with:
-        config-file: ./.github/codeql/codeql-config.yml
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: security-extended
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@3e7e3b32d0fb8283594bb0a76cc60a00918b0969 # v2
+        with:
+          config-file: ./.github/codeql/codeql-config.yml
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: security-extended
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@3e7e3b32d0fb8283594bb0a76cc60a00918b0969  # v2
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@3e7e3b32d0fb8283594bb0a76cc60a00918b0969 # v2
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+      #- run: |
+      #   make bootstrap
+      #   make release
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@3e7e3b32d0fb8283594bb0a76cc60a00918b0969  # v2
-      with:
-        category: "/language:${{matrix.language}}"
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@3e7e3b32d0fb8283594bb0a76cc60a00918b0969 # v2
+        with:
+          category: '/language:${{matrix.language}}'

bin/load-mocks

@@ -1141,6 +1141,7 @@ def create_mock_transactions(
                     "parent_span_id": parent_span_id,
                     "span_id": uuid4().hex[:16],
                     "hash": "858fea692d4d93e8",
+                    "data": {"Encoded Body Size": 1000001},
                 }
             ]
 

requirements-base.txt

@@ -54,7 +54,7 @@ requests>=2.25.1
 rfc3339-validator>=0.1.2
 rfc3986-validator>=0.1.1
 # [end] jsonschema format validators
-sentry-arroyo>=2.5.3
+sentry-arroyo>=2.6.0
 sentry-relay>=0.8.18
 sentry-sdk>=1.15.0
 snuba-sdk>=1.0.3

requirements-dev-frozen.txt

@@ -154,7 +154,7 @@ rfc3986-validator==0.1.1
 rsa==4.8
 s3transfer==0.5.2
 selenium==4.3.0
-sentry-arroyo==2.5.3
+sentry-arroyo==2.6.0
 sentry-relay==0.8.18
 sentry-sdk==1.15.0
 simplejson==3.17.6

requirements-frozen.txt

@@ -107,7 +107,7 @@ rfc3986-validator==0.1.1
 rsa==4.8
 s3transfer==0.5.2
 selenium==4.3.0
-sentry-arroyo==2.5.3
+sentry-arroyo==2.6.0
 sentry-relay==0.8.18
 sentry-sdk==1.15.0
 simplejson==3.17.6

src/sentry/api/endpoints/group_integrations.py

@@ -15,7 +15,7 @@
 from sentry.models.grouplink import GroupLink
 from sentry.models.integrations.external_issue import ExternalIssue
 from sentry.models.user import User
-from sentry.services.hybrid_cloud import ApiPaginationArgs
+from sentry.services.hybrid_cloud import RpcPaginationArgs
 from sentry.services.hybrid_cloud.integration import RpcIntegration, integration_service
 from sentry.utils.json import JSONData
 
@@ -93,7 +93,7 @@ def get(self, request: Request, group) -> Response:
         result = integration_service.page_integration_ids(
             organization_id=group.organization.id,
             provider_keys=providers,
-            args=ApiPaginationArgs.from_endpoint_request(self, request),
+            args=RpcPaginationArgs.from_endpoint_request(self, request),
         )
 
         response = Response(