Skip to content

Commit 34c1166

Browse files
committed
Merge branch 'refs/heads/main' into stefanosiano/enh/anr-lazy-load-class
# Conflicts: # CHANGELOG.md
2 parents e843c4b + 725987d commit 34c1166

File tree

21 files changed

+278
-240
lines changed

21 files changed

+278
-240
lines changed

.github/workflows/agp-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494

9595
- name: Upload test results
9696
if: always()
97-
uses: actions/upload-artifact@v4
97+
uses: actions/upload-artifact@v5
9898
with:
9999
name: test-results-AGP${{ matrix.agp }}-Integrations${{ matrix.integrations }}
100100
path: |

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353

5454
- name: Upload test results
5555
if: always()
56-
uses: actions/upload-artifact@v4
56+
uses: actions/upload-artifact@v5
5757
with:
5858
name: test-results-build
5959
path: |

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
3737

3838
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # pin@v2
39+
uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # pin@v2
4040
with:
4141
languages: 'java'
4242

@@ -45,4 +45,4 @@ jobs:
4545
./gradlew buildForCodeQL --no-build-cache
4646
4747
- name: Perform CodeQL Analysis
48-
uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # pin@v2
48+
uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # pin@v2

.github/workflows/integration-tests-ui-critical.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
run: make assembleUiTestCriticalRelease
4545

4646
- name: Upload APK artifact
47-
uses: actions/upload-artifact@v4
47+
uses: actions/upload-artifact@v5
4848
with:
4949
name: ${{env.APK_ARTIFACT_NAME}}
5050
path: "${{env.BASE_PATH}}/${{env.BUILD_PATH}}/${{env.APK_NAME}}"
@@ -110,7 +110,7 @@ jobs:
110110
script: echo "Generated AVD snapshot for caching."
111111

112112
- name: Download APK artifact
113-
uses: actions/download-artifact@v5
113+
uses: actions/download-artifact@v6
114114
with:
115115
name: ${{env.APK_ARTIFACT_NAME}}
116116

@@ -137,7 +137,7 @@ jobs:
137137
138138
- name: Upload Maestro test results
139139
if: failure()
140-
uses: actions/upload-artifact@v4
140+
uses: actions/upload-artifact@v5
141141
with:
142142
name: maestro-logs
143143
path: "${{env.BASE_PATH}}/maestro-logs"

.github/workflows/release-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
run: make publish
3333

3434
- name: Upload artifacts
35-
uses: actions/upload-artifact@v4
35+
uses: actions/upload-artifact@v5
3636
with:
3737
name: ${{ github.sha }}
3838
if-no-files-found: error

.github/workflows/spring-boot-2-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ jobs:
148148
149149
- name: Upload test results
150150
if: always()
151-
uses: actions/upload-artifact@v4
151+
uses: actions/upload-artifact@v5
152152
with:
153153
name: test-results-springboot-2-${{ matrix.springboot-version }}
154154
path: |

.github/workflows/spring-boot-3-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ jobs:
148148
149149
- name: Upload test results
150150
if: always()
151-
uses: actions/upload-artifact@v4
151+
uses: actions/upload-artifact@v5
152152
with:
153153
name: test-results-springboot-3-${{ matrix.springboot-version }}
154154
path: |

.github/workflows/spring-boot-4-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
150150
- name: Upload test results
151151
if: always()
152-
uses: actions/upload-artifact@v4
152+
uses: actions/upload-artifact@v5
153153
with:
154154
name: test-results-springboot-4-${{ matrix.springboot-version }}
155155
path: |

.github/workflows/system-tests-backend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ jobs:
147147
148148
- name: Upload test results
149149
if: always()
150-
uses: actions/upload-artifact@v4
150+
uses: actions/upload-artifact@v5
151151
with:
152152
name: test-results-${{ matrix.sample }}-${{ matrix.agent }}-${{ matrix.agent-auto-init }}-system-test
153153
path: |

CHANGELOG.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,21 @@
22

33
## Unreleased
44

5-
### Miscellaneous
5+
### Fixes
6+
7+
- [ANR] Removed AndroidTransactionProfiler lock ([#4817](https://github.com/getsentry/sentry-java/pull/4817))
8+
9+
### Improvements
610

711
- [ANR] Defer some class availability checks ([#4825](https://github.com/getsentry/sentry-java/pull/4825))
812

9-
## 8.24.0-alpha.2
13+
### Dependencies
14+
15+
- Bump Native SDK from v0.11.2 to v0.11.3 ([#4810](https://github.com/getsentry/sentry-java/pull/4810))
16+
- [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0113)
17+
- [diff](https://github.com/getsentry/sentry-native/compare/0.11.2...0.11.3)
18+
19+
## 8.24.0
1020

1121
### Features
1222

@@ -43,8 +53,11 @@
4353
- Session Replay: Avoid deadlock when pausing replay if no connection ([#4788](https://github.com/getsentry/sentry-java/pull/4788))
4454
- Session Replay: Fix capturing roots with no windows ([#4805](https://github.com/getsentry/sentry-java/pull/4805))
4555
- Session Replay: Fix `java.lang.IllegalArgumentException: width and height must be > 0` ([#4805](https://github.com/getsentry/sentry-java/pull/4805))
56+
- Handle `NoOpScopes` in `Context` when starting a span through OpenTelemetry ([#4823](https://github.com/getsentry/sentry-java/pull/4823))
57+
- This fixes "java.lang.IllegalArgumentException: The DSN is required" when combining WebFlux and OpenTelemetry
4658
- Session Replay: Do not use recycled screenshots for masking ([#4790](https://github.com/getsentry/sentry-java/pull/4790))
4759
- This fixes native crashes seen in `Canvas.<init>`/`ScreenshotRecorder.capture`
60+
- Session Replay: Ensure bitmaps are recycled properly ([#4820](https://github.com/getsentry/sentry-java/pull/4820))
4861

4962
### Miscellaneous
5063

0 commit comments

Comments
 (0)