Skip to content

Commit 7c51a68

Browse files
authored
Merge branch 'main' into feat/request-for-otel
2 parents d3cab7c + e2e1435 commit 7c51a68

File tree

6 files changed

+19
-8
lines changed

6 files changed

+19
-8
lines changed

.github/CODEOWNERS

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

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: make preMerge
3636

3737
- name: Upload coverage to Codecov
38-
uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # pin@v4
38+
uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # pin@v4
3939
with:
4040
name: sentry-java
4141
fail_ci_if_error: false

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- name: Get auth token
2121
id: token
22-
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
22+
uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
2323
with:
2424
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2525
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

CHANGELOG.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
### Fixes
6+
7+
- Avoid logging an error when a float is passed in the manifest ([#4031](https://github.com/getsentry/sentry-java/pull/4031))
8+
39
## 8.0.0
410

511
### Summary
@@ -15,6 +21,8 @@ Version 8 of the Sentry Android/Java SDK brings a variety of features and fixes.
1521
- We now support GraphQL v22 (`sentry-graphql-22`)
1622
- Metrics have been removed
1723

24+
Please take a look at [our migration guide in docs](https://docs.sentry.io/platforms/java/migration/7.x-to-8.0).
25+
1826
### Sentry Self-hosted Compatibility
1927

2028
This SDK version is compatible with a self-hosted version of Sentry `22.12.0` or higher. If you are using an older version of [self-hosted Sentry](https://develop.sentry.dev/self-hosted/) (aka onpremise), you will need to [upgrade](https://develop.sentry.dev/self-hosted/releases/). If you're using `sentry.io` no action is required.
@@ -62,12 +70,12 @@ This SDK version is compatible with a self-hosted version of Sentry `22.12.0` or
6270
- Global scope is attached to all events created by the SDK. It can also be modified before `Sentry.init` has been called. It can be manipulated using `Sentry.configureScope(ScopeType.GLOBAL, (scope) -> { ... })`.
6371
- Isolation scope can be used e.g. to attach data to all events that come up while handling an incoming request. It can also be used for other isolation purposes. It can be manipulated using `Sentry.configureScope(ScopeType.ISOLATION, (scope) -> { ... })`. The SDK automatically forks isolation scope in certain cases like incoming requests, CRON jobs, Spring `@Async` and more.
6472
- Current scope is forked often and data added to it is only added to events that are created while this scope is active. Data is also passed on to newly forked child scopes but not to parents. It can be manipulated using `Sentry.configureScope(ScopeType.CURRENT, (scope) -> { ... })`.
65-
- `Sentry.popScope` has been deprecated, please call `.close()` on the token returned by `Sentry.pushScope` instead or use it in a way described in more detail in "Migration Guide".
73+
- `Sentry.popScope` has been deprecated, please call `.close()` on the token returned by `Sentry.pushScope` instead or use it in a way described in more detail in [our migration guide](https://docs.sentry.io/platforms/java/migration/7.x-to-8.0).
6674
- We have chosen a default scope that is used for `Sentry.configureScope()` as well as API like `Sentry.setTag()`
6775
- For Android the type defaults to `CURRENT` scope
6876
- For Backend and other JVM applicatons it defaults to `ISOLATION` scope
6977
- Event processors on `Scope` can now be ordered by overriding the `getOrder` method on implementations of `EventProcessor`. NOTE: This order only applies to event processors on `Scope` but not `SentryOptions` at the moment. Feel free to request this if you need it.
70-
- `Hub` is deprecated in favor of `Scopes`, alongside some `Hub` relevant APIs. More details can be found in the "Migration Guide" section.
78+
- `Hub` is deprecated in favor of `Scopes`, alongside some `Hub` relevant APIs. More details can be found in [our migration guide](https://docs.sentry.io/platforms/java/migration/7.x-to-8.0).
7179
- Send file name and path only if `isSendDefaultPii` is `true` ([#3919](https://github.com/getsentry/sentry-java/pull/3919))
7280
- (Android) Enable Performance V2 by default ([#3824](https://github.com/getsentry/sentry-java/pull/3824))
7381
- With this change cold app start spans will include spans for ContentProviders, Application and Activity load.
@@ -148,7 +156,7 @@ This SDK version is compatible with a self-hosted version of Sentry `22.12.0` or
148156
- Previously request body was only attached for `application/json` requests
149157
- Set breadcrumb level based on http status ([#3771](https://github.com/getsentry/sentry-java/pull/3771))
150158
- Emit transaction.data inside contexts.trace.data ([#3735](https://github.com/getsentry/sentry-java/pull/3735))
151-
- Also does not emit `transaction.data` in `exras` anymore
159+
- Also does not emit `transaction.data` in `extras` anymore
152160
- Add a sample for showcasing Sentry with OpenTelemetry for Spring Boot 3 with our Java agent (`sentry-samples-spring-boot-jakarta-opentelemetry`) ([#3856](https://github.com/getsentry/sentry-java/pull/3828))
153161
- Add a sample for showcasing Sentry with OpenTelemetry for Spring Boot 3 without our Java agent (`sentry-samples-spring-boot-jakarta-opentelemetry-noagent`) ([#3856](https://github.com/getsentry/sentry-java/pull/3856))
154162
- Add a sample for showcasing Sentry with OpenTelemetry (`sentry-samples-console-opentelemetry-noagent`) ([#3856](https://github.com/getsentry/sentry-java/pull/3862))

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2019-2024 Sentry
3+
Copyright (c) 2019-2025 Sentry
44
Copyright (c) 2015 Salomon BRYS for Android ANRWatchDog
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy

sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,10 @@ private static boolean readBool(
475475
private static @NotNull Double readDouble(
476476
final @NotNull Bundle metadata, final @NotNull ILogger logger, final @NotNull String key) {
477477
// manifest meta-data only reads float
478-
final Double value = ((Number) metadata.getFloat(key, metadata.getInt(key, -1))).doubleValue();
478+
double value = ((Float) metadata.getFloat(key, -1)).doubleValue();
479+
if (value == -1) {
480+
value = ((Integer) metadata.getInt(key, -1)).doubleValue();
481+
}
479482
logger.log(SentryLevel.DEBUG, key + " read: " + value);
480483
return value;
481484
}

0 commit comments

Comments
 (0)