Skip to content

Commit 830669b

Browse files
stefanosianostefanosiano
authored
Merge branch 'main' into feat/concurrent-profiling-data
2 parents ec8d432 + 2f079a1 commit 830669b

File tree

154 files changed

+3046
-457
lines changed

Some content is hidden

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

154 files changed

+3046
-457
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @adinauer @romtsn
1+
* @adinauer @romtsn @stefanosiano

‎.github/workflows/danger.yml‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
1-
name: "Danger"
1+
name: Danger
2+
23
on:
34
pull_request:
45
types: [opened, synchronize, reopened, edited, ready_for_review]
56

67
jobs:
7-
build:
8-
name: Changelog
9-
runs-on: ubuntu-latest
10-
steps:
11-
- uses: actions/checkout@v2
12-
with:
13-
fetch-depth: 0
14-
- run: npx danger ci
15-
env:
16-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8+
danger:
9+
uses: getsentry/github-workflows/.github/workflows/danger.yml@v2

‎.github/workflows/integration-tests-benchmarks.yml‎

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Integration Tests - Benchmarks"
1+
name: 'Integration Tests - Benchmarks'
22
on:
33
schedule:
44
- cron: '0 0 * * *' # every night at midnight UTC
@@ -8,7 +8,7 @@ on:
88
- '**/sentry-android/**'
99
- '**/sentry-android-core/**'
1010
- '**/sentry-android-ndk/**'
11-
- '**/sentry-android-integration-tests/sentry-uitest-android-benchmark/**'
11+
- '**/sentry-android-integration-tests/**'
1212
- '**/.github/**'
1313

1414
jobs:
@@ -20,11 +20,11 @@ jobs:
2020
- name: Git checkout
2121
uses: actions/checkout@v2
2222

23-
- name: "Set up Java: 11"
23+
- name: 'Set up Java: 11'
2424
uses: actions/setup-java@v2
2525
with:
26-
java-version: "11"
27-
distribution: "adopt"
26+
java-version: '11'
27+
distribution: 'adopt'
2828

2929
# Clean, build and release a test apk
3030
- name: Make assembleBenchmarks
@@ -50,3 +50,35 @@ jobs:
5050
sauce-username: ${{ secrets.SAUCE_USERNAME }}
5151
sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
5252
config-file: .sauce/sentry-uitest-android-benchmark-lite.yml
53+
54+
app-metrics:
55+
runs-on: ubuntu-latest
56+
steps:
57+
- name: Git checkout
58+
uses: actions/checkout@v2
59+
60+
- name: 'Set up Java: 11'
61+
uses: actions/setup-java@v2
62+
with:
63+
java-version: '11'
64+
distribution: 'adopt'
65+
66+
- uses: actions/cache@v3
67+
id: app-plain-cache
68+
with:
69+
path: sentry-android-integration-tests/test-app-plain/build/outputs/apk/release/test-app-plain-release.apk
70+
key: ${{ github.workflow }}-${{ github.job }}-appplain-${{ hashFiles('sentry-android-integration-tests/test-app-plain/**') }}
71+
72+
- name: Build Android app plain
73+
if: steps.app-plain-cache.outputs['cache-hit'] != 'true'
74+
run: ./gradlew :sentry-android-integration-tests:test-app-plain:assembleRelease
75+
76+
- name: Build Android app with Sentry
77+
run: ./gradlew :sentry-android-integration-tests:test-app-sentry:assembleRelease
78+
79+
- name: Collect app metrics
80+
uses: getsentry/action-app-sdk-overhead-metrics@v1
81+
with:
82+
config: sentry-android-integration-tests/metrics-test.yml
83+
sauce-user: ${{ secrets.SAUCE_USERNAME }}
84+
sauce-key: ${{ secrets.SAUCE_ACCESS_KEY }}

‎.sauce/sentry-uitest-android-ui.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,18 @@ espresso:
1414
testApp: ./sentry-android-integration-tests/sentry-uitest-android/build/outputs/apk/androidTest/release/sentry-uitest-android-release-androidTest.apk
1515
suites:
1616

17-
- name: "Android 12 (api 31)"
17+
- name: "Android 12 Ui test (api 31)"
1818
devices:
1919
- id: Samsung_Galaxy_S22_Ultra_5G_real_us # Samsung Galaxy S22 Ultra 5G - api 31 (12)
2020

21+
- name: "Android 11 Ui test (api 30)"
22+
devices:
23+
- id: OnePlus_9_Pro_real_us # OnePlus 9 Pro - api 30 (11)
24+
25+
- name: "Android 10 Ui test (api 29)"
26+
devices:
27+
- id: OnePlus_7_Pro_real # OnePlus 7 Pro - api 29 (10)
28+
2129
# Controls what artifacts to fetch when the suite on Sauce Cloud has finished.
2230
artifacts:
2331
download:

‎CHANGELOG.md‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,35 @@
11
# Changelog
22

3-
## Unreleased
3+
## 6.5.0-beta.1
4+
5+
### Features
6+
7+
- Server-Side Dynamic Sampling Context support ([#2226](https://github.com/getsentry/sentry-java/pull/2226))
8+
9+
## 6.4.2
10+
11+
### Fixes
12+
13+
- Fixed AbstractMethodError when getting Lifecycle ([#2228](https://github.com/getsentry/sentry-java/pull/2228))
14+
- Missing unit fields for Android measurements ([#2204](https://github.com/getsentry/sentry-java/pull/2204))
15+
- Avoid sending empty profiles ([#2232](https://github.com/getsentry/sentry-java/pull/2232))
16+
- Fix file descriptor leak in FileIO instrumentation ([#2248](https://github.com/getsentry/sentry-java/pull/2248))
17+
18+
## 6.4.1
19+
20+
### Fixes
21+
22+
- Fix memory leak caused by throwableToSpan ([#2227](https://github.com/getsentry/sentry-java/pull/2227))
23+
24+
## 6.4.0
425

526
### Fixes
627

728
- make profiling rate defaults to 101 hz ([#2211](https://github.com/getsentry/sentry-java/pull/2211))
829
- SentryOptions.setProfilingTracesIntervalMillis has been deprecated
930
- Added cpu architecture and default environment in profiles envelope ([#2207](https://github.com/getsentry/sentry-java/pull/2207))
1031
- SentryOptions.setProfilingEnabled has been deprecated in favor of setProfilesSampleRate
32+
- Use toString for enum serialization ([#2220](https://github.com/getsentry/sentry-java/pull/2220))
1133

1234
### Features
1335

@@ -16,6 +38,13 @@
1638
- Concurrent profiling 1 - added envelope payload data format ([#2216](https://github.com/getsentry/sentry-java/pull/2216))
1739
- Send source for transactions ([#2180](https://github.com/getsentry/sentry-java/pull/2180))
1840
- Add profilesSampleRate and profileSampler options for Android sdk ([#2184](https://github.com/getsentry/sentry-java/pull/2184))
41+
- Add baggage header to RestTemplate ([#2206](https://github.com/getsentry/sentry-java/pull/2206))
42+
- Bump Native SDK from v0.4.18 to v0.5.0 ([#2199](https://github.com/getsentry/sentry-java/pull/2199))
43+
- [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#050)
44+
- [diff](https://github.com/getsentry/sentry-native/compare/0.4.18...0.5.0)
45+
- Bump Gradle from v7.5.0 to v7.5.1 ([#2212](https://github.com/getsentry/sentry-java/pull/2212))
46+
- [changelog](https://github.com/gradle/gradle/blob/master/CHANGELOG.md#v751)
47+
- [diff](https://github.com/gradle/gradle/compare/v7.5.0...v7.5.1)
1948

2049
## 6.3.1
2150

‎build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ apiValidation {
6060
"sentry-samples-netflix-dgs",
6161
"sentry-uitest-android",
6262
"sentry-uitest-android-benchmark",
63+
"test-app-plain",
64+
"test-app-sentry",
6365
)
6466
)
6567
}

‎dangerfile.js‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ org.gradle.parallel=true
77
android.useAndroidX=true
88

99
# Release information
10-
versionName=6.3.1
10+
versionName=6.5.0-beta.1
1111

1212
# Override the SDK name on native crashes on Android
1313
sentryAndroidSdkName=sentry.native.android

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎sentry-android-core/src/main/java/io/sentry/android/core/ActivityFramesTracker.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.sentry.android.core;
22

3+
import static io.sentry.protocol.MeasurementValue.NONE_UNIT;
4+
35
import android.app.Activity;
46
import android.util.SparseIntArray;
57
import androidx.core.app.FrameMetricsAggregator;
@@ -102,9 +104,9 @@ public synchronized void setMetrics(
102104
return;
103105
}
104106

105-
final MeasurementValue tfValues = new MeasurementValue(totalFrames);
106-
final MeasurementValue sfValues = new MeasurementValue(slowFrames);
107-
final MeasurementValue ffValues = new MeasurementValue(frozenFrames);
107+
final MeasurementValue tfValues = new MeasurementValue(totalFrames, NONE_UNIT);
108+
final MeasurementValue sfValues = new MeasurementValue(slowFrames, NONE_UNIT);
109+
final MeasurementValue ffValues = new MeasurementValue(frozenFrames, NONE_UNIT);
108110
final Map<String, @NotNull MeasurementValue> measurements = new HashMap<>();
109111
measurements.put("frames_total", tfValues);
110112
measurements.put("frames_slow", sfValues);

0 commit comments

Comments
 (0)