Merge branch 'main' into feat/span-first

Author: buenaflor

.craft.yml

@@ -19,6 +19,7 @@ targets:
       packages/isar:
       packages/link:
       packages/firebase_remote_config:
+      packages/supabase:
   - name: github
   - name: registry
     sdks:
@@ -33,3 +34,5 @@ targets:
       pub:sentry_isar:
       pub:sentry_link:
       pub:sentry_firebase_remote_config:
+      # TODO: after we published supabase we need to add it to the registry repo and then uncomment here
+      # pub:sentry_supabase:

.github/workflows/diagrams.yml

@@ -59,6 +59,10 @@ jobs:
         working-directory: ./packages/firebase_remote_config
         run: lakos . -i "{test/**,example/**}" | dot -Tsvg -o class-diagram.svg
 
+      - name: supabase
+        working-directory: ./packages/supabase
+        run: lakos . -i "{test/**,example/**}" | dot -Tsvg -o class-diagram.svg
+
         # Source: https://stackoverflow.com/a/58035262
       - name: Extract branch name
         shell: bash

.github/workflows/min_version_test.yml

@@ -51,7 +51,7 @@ jobs:
         with:
           flutter-version: '3.24.0'
 
-      - uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # pin@v1.267.0
+      - uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # pin@v1.268.0
         with:
           ruby-version: '3.1.2' # https://github.com/flutter/flutter/issues/109385#issuecomment-1212614125
 

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

.github/workflows/supabase.yml

@@ -0,0 +1,56 @@
+name: sentry-supabase
+on:
+  push:
+    branches:
+      - main
+      - release/**
+  pull_request:
+    paths:
+      - '!**/*.md'
+      - '!**/class-diagram.svg'
+      - '.github/workflows/supabase.yml'
+      - '.github/workflows/analyze.yml'
+      - '.github/actions/dart-test/**'
+      - '.github/actions/coverage/**'
+      - 'packages/dart/**'
+      - 'packages/flutter/**'
+      - 'packages/supabase/**'
+
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: '${{ matrix.os }} | ${{ matrix.sdk }}'
+    runs-on: ${{ matrix.os }}-latest
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos, ubuntu, windows]
+        sdk: [stable, beta]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: ./.github/actions/flutter-test
+        with:
+          directory: packages/supabase
+          web: false
+
+#       TODO: don't set coverage for now to finish publishing it
+#      - uses: ./.github/actions/coverage
+#        if: runner.os == 'Linux' && matrix.sdk == 'stable'
+#        with:
+#          token: ${{ secrets.CODECOV_TOKEN }}
+#          directory: packages/supabase
+#          coverage: sentry_supabase
+#          min-coverage: 55
+
+  analyze:
+    uses: ./.github/workflows/analyze.yml
+    with:
+      package: packages/supabase
+      sdk: flutter

.github/workflows/testflight.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # pin@v2.21.0
       - run: xcodes select 16.3
-      - uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # pin@v1.267.0
+      - uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # pin@v1.268.0
         with:
           ruby-version: '2.7.5'
           bundler-cache: true

CHANGELOG.md

@@ -1,12 +1,14 @@
 # Changelog
 
-## Unreleased
+## 9.9.0-beta.3
 
 ### Features
 
 - Add `Sentry.setAttributes` and `Sentry.removeAttribute` ([#3352](https://github.com/getsentry/sentry-dart/pull/3352))
   - These attributes are set at the scope level and apply to all logs (and later to metrics and spans).
   - When a scope attribute conflicts with a log-level attribute, the log-level attribute always takes precedence.
+- Sentry Supabase Integration ([#2913](https://github.com/getsentry/sentry-dart/pull/2913))
+  - Adds the `sentry_supabase` package to instrument supabase with Sentry breadcrumbs, traces and errors.
 
 ### Fixes
 

docs/sdk-versions.md

@@ -6,6 +6,7 @@ This document shows which version of the various Sentry SDKs are used in which S
 
 | Sentry Flutter SDK | Sentry Android SDK | Sentry Cocoa SDK | Sentry JavaScript SDK | Sentry Native SDK |
 | ------------------ | ------------------ | ---------------- | --------------------- | ----------------- |
+| 9.9.0-beta.3 | 8.21.1 | 8.56.2 | 10.6.0 | 0.10.0 |
 | 9.8.0-beta.1 | 8.21.1 | 8.56.2 | 10.6.0 | 0.10.0 |
 | 9.8.0 | 8.21.1 | 8.56.2 | 10.6.0 | 0.10.0 |
 | 9.7.0 | 8.21.1 | 8.56.2 | 10.6.0 | 0.10.0 |

packages/dart/lib/src/constants.dart

@@ -16,8 +16,19 @@ class SentrySpanOperations {
 class SentrySpanData {
   static const String dbSystemKey = 'db.system';
   static const String dbNameKey = 'db.name';
+  static const String dbSchemaKey = 'db.schema';
+  static const String dbTableKey = 'db.table';
+  static const String dbUrlKey = 'db.url';
+  static const String dbSdkKey = 'db.sdk';
+  static const String dbQueryKey = 'db.query';
+  static const String dbBodyKey = 'db.body';
+  static const String dbOperationKey = 'db.operation';
+  static const String httpResponseStatusCodeKey = 'http.response.status_code';
+  static const String httpResponseContentLengthKey =
+      'http.response_content_length';
 
   static const String dbSystemSqlite = 'db.sqlite';
+  static const String dbSystemPostgresql = 'postgresql';
 }
 
 @internal

packages/dart/lib/src/sentry_trace_origins.dart

@@ -27,4 +27,5 @@ class SentryTraceOrigins {
   static const autoDbDriftQueryInterceptor = 'auto.db.drift.query.interceptor';
   static const autoUiTimeToDisplay = 'auto.ui.time_to_display';
   static const manualUiTimeToDisplay = 'manual.ui.time_to_display';
+  static const autoDbSupabase = 'auto.db.supabase';
 }