Skip to content

Commit 7eaafa4

Browse files
marandanetomarandaneto
committed
fix conflict
2 parents 25283d8 + 0db91cc commit 7eaafa4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+439
-505
lines changed

‎.github/workflows/analyze.yml

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
on:
2+
workflow_call:
3+
inputs:
4+
package:
5+
required: true
6+
type: string
7+
sdk:
8+
required: false
9+
type: string
10+
default: dart
11+
panaThreshold:
12+
description: Minumum percentage of Dart Package Analyzer score that must be achieved.
13+
required: false
14+
type: number
15+
default: 100
16+
17+
jobs:
18+
analyze:
19+
runs-on: ubuntu-latest
20+
timeout-minutes: 20
21+
defaults:
22+
run:
23+
working-directory: ${{ inputs.package }}
24+
steps:
25+
- uses: actions/checkout@v3
26+
- uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d # pin@v1
27+
if: ${{ inputs.sdk == 'dart' }}
28+
- uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d # pin@v2
29+
if: ${{ inputs.sdk == 'flutter' }}
30+
- run: ${{ inputs.sdk }} pub get
31+
- run: ${{ inputs.sdk }} format --set-exit-if-changed ./
32+
33+
- name: dart analyze
34+
uses: invertase/github-action-dart-analyzer@cdd8652b05bf7ed08ffce30f425436780f869f13 # pin@v1
35+
with:
36+
annotate: true
37+
fatal-infos: true
38+
fatal-warnings: true
39+
annotate-only: false
40+
working-directory: ${{ inputs.package }}
41+
42+
package-analysis:
43+
# `axel-op/dart-package-analyzer` is using `flutter pub upgrade` instead of `get`,
44+
# which ignores pubspec.yaml `dependency_overrides`. Because of that, all `release/*` branches are failing,
45+
# because the package cannot find the "about to be released" version of our sentry-dart package that it depends on.
46+
if: ${{ !startsWith(github.ref, 'refs/heads/release/') && inputs.panaThreshold > 0 }}
47+
runs-on: ubuntu-latest
48+
timeout-minutes: 20
49+
steps:
50+
- uses: actions/checkout@v3
51+
- uses: axel-op/dart-package-analyzer@7a6c3c66bce78d82b729a1ffef2d9458fde6c8d2 # pin@v3
52+
id: analysis
53+
with:
54+
githubToken: ${{ secrets.GITHUB_TOKEN }}
55+
relativePath: ${{ inputs.package }}
56+
- name: Check scores
57+
env:
58+
TOTAL: ${{ steps.analysis.outputs.total }}
59+
TOTAL_MAX: ${{ steps.analysis.outputs.total_max }}
60+
run: |
61+
PERCENTAGE=$(( $TOTAL * 100 / $TOTAL_MAX ))
62+
if (( $PERCENTAGE < ${{ inputs.panaThreshold }} ))
63+
then
64+
echo Score too low!
65+
exit 1
66+
fi

‎.github/workflows/dart.yml

+3-36
Original file line numberDiff line numberDiff line change
@@ -70,39 +70,6 @@ jobs:
7070
min_coverage: 85
7171

7272
analyze:
73-
runs-on: ubuntu-latest
74-
timeout-minutes: 20
75-
defaults:
76-
run:
77-
working-directory: ./dart
78-
steps:
79-
- uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d # pin@v1
80-
with:
81-
sdk: stable
82-
- uses: actions/checkout@v3
83-
- run: |
84-
dart pub get
85-
dart analyze --fatal-infos
86-
dart format --set-exit-if-changed ./
87-
88-
package-analysis:
89-
runs-on: ubuntu-latest
90-
timeout-minutes: 20
91-
steps:
92-
- uses: actions/checkout@v3
93-
- uses: axel-op/dart-package-analyzer@7a6c3c66bce78d82b729a1ffef2d9458fde6c8d2 # pin@v3
94-
id: analysis
95-
with:
96-
githubToken: ${{ secrets.GITHUB_TOKEN }}
97-
relativePath: dart/
98-
- name: Check scores
99-
env:
100-
TOTAL: ${{ steps.analysis.outputs.total }}
101-
TOTAL_MAX: ${{ steps.analysis.outputs.total_max }}
102-
run: |
103-
PERCENTAGE=$(( $TOTAL * 100 / $TOTAL_MAX ))
104-
if (( $PERCENTAGE < 90 ))
105-
then
106-
echo Score too low!
107-
exit 1
108-
fi
73+
uses: ./.github/workflows/analyze.yml
74+
with:
75+
package: dart

‎.github/workflows/dio.yml

+3-40
Original file line numberDiff line numberDiff line change
@@ -52,43 +52,6 @@ jobs:
5252
min_coverage: 81
5353

5454
analyze:
55-
runs-on: ubuntu-latest
56-
timeout-minutes: 20
57-
defaults:
58-
run:
59-
working-directory: ./dio
60-
steps:
61-
- uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d # pin@v1
62-
with:
63-
sdk: stable
64-
- uses: actions/checkout@v3
65-
- run: |
66-
dart pub get
67-
dart analyze --fatal-infos
68-
dart format --set-exit-if-changed ./
69-
70-
package-analysis:
71-
# `axel-op/dart-package-analyzer` is using `flutter pub upgrade` instead of `get`,
72-
# which ignores pubspec.yaml `dependency_overrides`. Because of that, all `release/*` branches are failing,
73-
# because the package cannot find the "about to be released" version of our sentry-dart package that it depends on.
74-
if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
75-
runs-on: ubuntu-latest
76-
timeout-minutes: 20
77-
steps:
78-
- uses: actions/checkout@v3
79-
- uses: axel-op/dart-package-analyzer@7a6c3c66bce78d82b729a1ffef2d9458fde6c8d2 # pin@v3
80-
id: analysis
81-
with:
82-
githubToken: ${{ secrets.GITHUB_TOKEN }}
83-
relativePath: dio/
84-
- name: Check scores
85-
env:
86-
TOTAL: ${{ steps.analysis.outputs.total }}
87-
TOTAL_MAX: ${{ steps.analysis.outputs.total_max }}
88-
run: |
89-
PERCENTAGE=$(( $TOTAL * 100 / $TOTAL_MAX ))
90-
if (( $PERCENTAGE < 75 ))
91-
then
92-
echo Score too low!
93-
exit 1
94-
fi
55+
uses: ./.github/workflows/analyze.yml
56+
with:
57+
package: dio

‎.github/workflows/e2e_dart.yml

+4-14
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,7 @@ jobs:
3737
dart run --define=SENTRY_ENVIRONMENT=e2e
3838
3939
analyze:
40-
runs-on: ubuntu-latest
41-
timeout-minutes: 20
42-
defaults:
43-
run:
44-
working-directory: ./e2e_test
45-
steps:
46-
- uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d # pin@v1
47-
with:
48-
sdk: stable
49-
- uses: actions/checkout@v3
50-
- run: |
51-
dart pub get
52-
dart analyze --fatal-infos
53-
dart format --set-exit-if-changed ./
40+
uses: ./.github/workflows/analyze.yml
41+
with:
42+
package: e2e_test
43+
panaThreshold: 0

‎.github/workflows/flutter.yml

+5-37
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
sudo apt install -y network-manager upower
6767
if: matrix.os == 'ubuntu-latest'
6868

69-
- uses: subosito/flutter-action@1e6ee87cb840500837bcd50a667fb28815d8e310 # pin@v2
69+
- uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d # pin@v2
7070
with:
7171
channel: ${{ matrix.sdk }}
7272

@@ -132,42 +132,10 @@ jobs:
132132
esac
133133
134134
analyze:
135-
runs-on: ubuntu-latest
136-
timeout-minutes: 20
137-
steps:
138-
- uses: actions/checkout@v3
139-
- uses: subosito/flutter-action@1e6ee87cb840500837bcd50a667fb28815d8e310 # pin@v2
140-
- run: |
141-
cd flutter
142-
flutter pub get
143-
flutter format -n --set-exit-if-changed ./
144-
flutter analyze
145-
146-
package-analysis:
147-
# `axel-op/dart-package-analyzer` is using `flutter pub upgrade` instead of `get`,
148-
# which ignores pubspec.yaml `dependency_overrides`. Because of that, all `release/*` branches are failing,
149-
# because the package cannot find the "about to be released" version of our sentry-dart package that it depends on.
150-
if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
151-
runs-on: ubuntu-latest
152-
timeout-minutes: 20
153-
steps:
154-
- uses: actions/checkout@v3
155-
- uses: axel-op/dart-package-analyzer@7a6c3c66bce78d82b729a1ffef2d9458fde6c8d2 # pin@v3
156-
id: analysis
157-
with:
158-
githubToken: ${{ secrets.GITHUB_TOKEN }}
159-
relativePath: flutter/
160-
- name: Check scores
161-
env:
162-
TOTAL: ${{ steps.analysis.outputs.total }}
163-
TOTAL_MAX: ${{ steps.analysis.outputs.total_max }}
164-
run: |
165-
PERCENTAGE=$(( $TOTAL * 100 / $TOTAL_MAX ))
166-
if (( $PERCENTAGE < 90 ))
167-
then
168-
echo Score too low!
169-
exit 1
170-
fi
135+
uses: ./.github/workflows/analyze.yml
136+
with:
137+
package: flutter
138+
sdk: flutter
171139

172140
pod-lint:
173141
runs-on: macos-latest

‎.github/workflows/logging.yml

+3-40
Original file line numberDiff line numberDiff line change
@@ -51,43 +51,6 @@ jobs:
5151
min_coverage: 90
5252

5353
analyze:
54-
runs-on: ubuntu-latest
55-
timeout-minutes: 20
56-
defaults:
57-
run:
58-
working-directory: ./logging
59-
steps:
60-
- uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d # pin@v1
61-
with:
62-
sdk: stable
63-
- uses: actions/checkout@v3
64-
- run: |
65-
dart pub get
66-
dart analyze --fatal-infos
67-
dart format --set-exit-if-changed ./
68-
69-
package-analysis:
70-
# `axel-op/dart-package-analyzer` is using `flutter pub upgrade` instead of `get`,
71-
# which ignores pubspec.yaml `dependency_overrides`. Because of that, all `release/*` branches are failing,
72-
# because the package cannot find the "about to be released" version of our sentry-dart package that it depends on.
73-
if: ${{ !startsWith(github.ref, 'refs/heads/release/') }}
74-
runs-on: ubuntu-latest
75-
timeout-minutes: 20
76-
steps:
77-
- uses: actions/checkout@v3
78-
- uses: axel-op/dart-package-analyzer@7a6c3c66bce78d82b729a1ffef2d9458fde6c8d2 # pin@v3
79-
id: analysis
80-
with:
81-
githubToken: ${{ secrets.GITHUB_TOKEN }}
82-
relativePath: logging/
83-
- name: Check scores
84-
env:
85-
TOTAL: ${{ steps.analysis.outputs.total }}
86-
TOTAL_MAX: ${{ steps.analysis.outputs.total_max }}
87-
run: |
88-
PERCENTAGE=$(( $TOTAL * 100 / $TOTAL_MAX ))
89-
if (( $PERCENTAGE < 100 ))
90-
then
91-
echo Score too low!
92-
exit 1
93-
fi
54+
uses: ./.github/workflows/analyze.yml
55+
with:
56+
package: logging

‎.github/workflows/metrics.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
branches-ignore:
1111
- deps/**
1212
- dependabot/**
13-
tags-ignore: [ '**' ]
13+
tags-ignore: ['**']
1414

1515
jobs:
1616
metrics:
@@ -43,7 +43,7 @@ jobs:
4343
echo "flutter=$version" >> "$GITHUB_OUTPUT"
4444
4545
- name: Install Flutter v${{ steps.conf.outputs.flutter }}
46-
uses: subosito/flutter-action@1e6ee87cb840500837bcd50a667fb28815d8e310 # pin@v2
46+
uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d # pin@v2
4747
with:
4848
flutter-version: ${{ steps.conf.outputs.flutter }}
4949

‎.github/workflows/min_version_test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
distribution: 'adopt'
2121
java-version: '11'
2222

23-
- uses: subosito/flutter-action@1e6ee87cb840500837bcd50a667fb28815d8e310 # pin@v2
23+
- uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d # pin@v2
2424
with:
2525
flutter-version: '2.0.0'
2626

‎.github/workflows/web-example-ghpages.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v3
16-
- uses: subosito/flutter-action@1e6ee87cb840500837bcd50a667fb28815d8e310 # pin@v2
16+
- uses: subosito/flutter-action@dbf1fa04f4d2e52c33185153d06cdb5443aa189d # pin@v2
1717
- uses: bluefireteam/flutter-gh-pages@57815b17b371455ec1a98f075b71b4c6ba0a938c # pin@v8
1818
with:
1919
workingDir: flutter/example

‎.pubignore

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.vscode
2+
tool
3+
analysis_options.yaml
4+
pubspec_overrides.yaml

‎CHANGELOG.md

+29-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,40 @@
22

33
## Unreleased
44

5+
### Fixes
6+
7+
- Merging of integrations and packages ([#1111](https://github.com/getsentry/sentry-dart/pull/1111))
8+
- Add missing `fragment` for HTTP Client Errors ([#1102](https://github.com/getsentry/sentry-dart/pull/1102))
9+
- Sync user name and geo for Android ([#1102](https://github.com/getsentry/sentry-dart/pull/1102))
10+
11+
### Dependencies
12+
13+
- Bump Android SDK from v6.6.0 to v6.7.0 ([#1105](https://github.com/getsentry/sentry-dart/pull/1105))
14+
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#670)
15+
- [diff](https://github.com/getsentry/sentry-java/compare/6.6.0...6.7.0)
16+
- Bump Cocoa SDK from v7.30.0 to v7.31.0 ([#1104](https://github.com/getsentry/sentry-dart/pull/1113))
17+
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7310)
18+
- [diff](https://github.com/getsentry/sentry-cocoa/compare/7.30.0...7.31.0)
19+
20+
## 6.14.0
21+
22+
### Features
23+
24+
- Capture response information in `SentryHttpClient` ([#1095](https://github.com/getsentry/sentry-dart/pull/1095))
25+
26+
### Changes
27+
28+
- Remove experimental `SentryResponse` fields: `url`, `body`, `redirected`, `status` ([#1095](https://github.com/getsentry/sentry-dart/pull/1095))
29+
- `SentryHttpClient` request body capture checks default PII capture setting, same as the DIO integration ([#1095](https://github.com/getsentry/sentry-dart/pull/1095))
30+
531
### Dependencies
632

733
- Bump Android SDK from v6.5.0 to v6.6.0 ([#1090](https://github.com/getsentry/sentry-dart/pull/1090))
834
- [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#660)
935
- [diff](https://github.com/getsentry/sentry-java/compare/6.5.0...6.6.0)
10-
- Bump Cocoa SDK from v7.28.0 to v7.29.0 ([#1089](https://github.com/getsentry/sentry-dart/pull/1089))
11-
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7290)
12-
- [diff](https://github.com/getsentry/sentry-cocoa/compare/7.28.0...7.29.0)
36+
- Bump Cocoa SDK from v7.28.0 to v7.30.0 ([#1089](https://github.com/getsentry/sentry-dart/pull/1089), [#1101](https://github.com/getsentry/sentry-dart/pull/1101))
37+
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7300)
38+
- [diff](https://github.com/getsentry/sentry-cocoa/compare/7.28.0...7.30.0)
1339

1440
## 6.13.1
1541

‎dart/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Sentry SDK for Dart
1010

1111
| package | build | pub | likes | popularity | pub points |
1212
| ------- | ------- | ------- | ------- | ------- | ------- |
13-
| sentry | [![build](https://github.com/getsentry/sentry-dart/workflows/sentry-dart/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions?query=workflow%3Asentry-dart) | [![pub package](https://img.shields.io/pub/v/sentry.svg)](https://pub.dev/packages/sentry) | [![likes](https://badges.bar/sentry/likes)](https://pub.dev/packages/sentry/score) | [![popularity](https://badges.bar/sentry/popularity)](https://pub.dev/packages/sentry/score) | [![pub points](https://badges.bar/sentry/pub%20points)](https://pub.dev/packages/sentry/score)
13+
| sentry | [![build](https://github.com/getsentry/sentry-dart/workflows/sentry-dart/badge.svg?branch=main)](https://github.com/getsentry/sentry-dart/actions?query=workflow%3Asentry-dart) | [![pub package](https://img.shields.io/pub/v/sentry.svg)](https://pub.dev/packages/sentry) | [![likes](https://img.shields.io/pub/likes/sentry)](https://pub.dev/packages/sentry/score) | [![popularity](https://img.shields.io/pub/popularity/sentry)](https://img.shields.io/pub/sentry) | [![pub points](https://img.shields.io/pub/points/sentry)](https://pub.dev/packages/sentry/score)
1414

1515
Pure Dart SDK used by any Dart application like AngularDart, CLI and Server.
1616

0 commit comments

Comments
 (0)