Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
bd0c3b4
Check for mixed SDK versions
adinauer Mar 18, 2025
f50173b
Format code
getsentry-bot Mar 20, 2025
a8875cf
format + api
adinauer Mar 20, 2025
c0eea6a
Init noops if mixed versions detected
adinauer Mar 20, 2025
5c09766
Add BuildConfig
adinauer Mar 20, 2025
735ff28
config entries for agentless module sdk names
adinauer Mar 20, 2025
fe20321
Add MANIFEST.MF for JARs
adinauer Mar 20, 2025
901830d
Throw on startup; use manifests for backend; reuse code for otel
adinauer Mar 21, 2025
65a7a6f
Format code
getsentry-bot Mar 21, 2025
62cb98f
Merge branch 'main' into feat/crash-on-startup-with-mixed-versions
adinauer Mar 24, 2025
954610d
Format code
getsentry-bot Mar 24, 2025
8144647
changelog
adinauer Mar 24, 2025
7d1942e
api
adinauer Mar 24, 2025
f062c3e
Merge branch 'main' into feat/manifest-for-jars
adinauer Mar 24, 2025
e72dff6
changelog
adinauer Mar 24, 2025
72c554b
Merge branch 'main' into feat/detect-mixed-sdk-versions
adinauer Mar 24, 2025
60e4cd3
Merge branch 'feat/detect-mixed-sdk-versions' into feat/noop-on-mixed…
adinauer Mar 24, 2025
b1ae3b4
Merge branch 'feat/noop-on-mixed-versions-android' into feat/manifest…
adinauer Mar 24, 2025
e13f518
Merge branch 'feat/manifest-for-jars' into feat/crash-on-startup-with…
adinauer Mar 24, 2025
c3d50ab
Remove duplicate addPackage calls
adinauer Mar 25, 2025
8185388
remove test assertion for package
adinauer Mar 25, 2025
f8ba72d
Introduce fatal SDK logger
adinauer Mar 26, 2025
e4d522f
Use Implementation-Version as raw version
adinauer Mar 27, 2025
bf2f42a
Merge branch 'main' into feat/manifest-version-attributes
adinauer Mar 27, 2025
3d694eb
Format code
getsentry-bot Mar 27, 2025
fcb0a09
changelog
adinauer Mar 27, 2025
11cb785
remove duplicate attr def
adinauer Mar 27, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@

- Do not override user-defined `SentryOptions` ([#4262](https://github.com/getsentry/sentry-java/pull/4262))
- Session Replay: Change bitmap config to `ARGB_8888` for screenshots ([#4282](https://github.com/getsentry/sentry-java/pull/4282))
- The `MANIFEST.MF` of `sentry-opentelemetry-agent` now has `Implementation-Version` set to the raw version ([#4291](https://github.com/getsentry/sentry-java/pull/4291))
- An example value would be `8.6.0`
- The value of the `Sentry-Version-Name` attribute looks like `sentry-8.5.0-otel-2.10.0`

### Internal

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ tasks {
attributes.put("Can-Retransform-Classes", "true")
attributes.put("Implementation-Vendor", "Sentry")
attributes.put("Implementation-Title", project.name)
attributes.put("Implementation-Version", "sentry-${project.version}-otel-${Config.Libs.OpenTelemetry.otelInstrumentationVersion}")
attributes.put("Sentry-Version-Name", project.version)
attributes.put("Implementation-Version", project.version)
attributes.put("Sentry-Version-Name", "sentry-${project.version}-otel-${Config.Libs.OpenTelemetry.otelInstrumentationVersion}")
attributes.put("Sentry-SDK-Name", Config.Sentry.SENTRY_OPENTELEMETRY_AGENT_SDK_NAME)
attributes.put("Sentry-SDK-Package-Name", "maven:io.sentry:sentry-opentelemetry-agent")
attributes.put("Sentry-Opentelemetry-SDK-Name", Config.Sentry.SENTRY_OPENTELEMETRY_AGENT_SDK_NAME)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void readManifestFiles() {
final @Nullable Attributes mainAttributes = manifest.getMainAttributes();
if (mainAttributes != null) {
final @Nullable String name = mainAttributes.getValue("Sentry-Opentelemetry-SDK-Name");
final @Nullable String version = mainAttributes.getValue("Sentry-Version-Name");
final @Nullable String version = mainAttributes.getValue("Implementation-Version");
final @Nullable String sdkName = mainAttributes.getValue("Sentry-SDK-Name");
final @Nullable String packageName = mainAttributes.getValue("Sentry-SDK-Package-Name");

Expand Down
Loading