Skip to content

Commit 10dfe0c

Browse files
Add MANIFEST.MF to Sentry JARs (#4272)
* Check for mixed SDK versions * Format code * format + api * Init noops if mixed versions detected * Add BuildConfig * config entries for agentless module sdk names * Add MANIFEST.MF for JARs * changelog --------- Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io>
1 parent 0a04d7f commit 10dfe0c

File tree

29 files changed

+350
-0
lines changed

29 files changed

+350
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
### Features
66

77
- Increase http timeouts from 5s to 30s to have a better chance of events being delivered without retry ([#4276](https://github.com/getsentry/sentry-java/pull/4276))
8+
- Add `MANIFEST.MF` to Sentry JARs ([#4272](https://github.com/getsentry/sentry-java/pull/4272))
89
- Retain baggage sample rate/rand values as doubles ([#4279](https://github.com/getsentry/sentry-java/pull/4279))
910

1011
### Fixes

buildSrc/src/main/java/Config.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,14 +251,21 @@ object Config {
251251
val SENTRY_SPRING_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.spring"
252252
val SENTRY_SPRING_JAKARTA_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.spring.jakarta"
253253
val SENTRY_SPRING_BOOT_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.spring-boot"
254+
val SENTRY_SPRING_BOOT_STARTER_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.spring-boot-starter"
254255
val SENTRY_SPRING_BOOT_JAKARTA_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.spring-boot.jakarta"
256+
val SENTRY_SPRING_BOOT_STARTER_JAKARTA_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.spring-boot-starter.jakarta"
257+
val SENTRY_OPENTELEMETRY_BOOTSTRAP_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.opentelemetry.bootstrap"
258+
val SENTRY_OPENTELEMETRY_CORE_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.opentelemetry.core"
255259
val SENTRY_OPENTELEMETRY_AGENT_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.opentelemetry.agent"
256260
val SENTRY_OPENTELEMETRY_AGENTLESS_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.opentelemetry.agentless"
257261
val SENTRY_OPENTELEMETRY_AGENTLESS_SPRING_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.opentelemetry.agentless-spring"
262+
val SENTRY_OPENTELEMETRY_AGENTCUSTOMIZATION_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.opentelemetry.agentcustomization"
263+
val SENTRY_OPENFEIGN_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.openfeign"
258264
val SENTRY_APOLLO3_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.apollo3"
259265
val SENTRY_APOLLO4_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.apollo4"
260266
val SENTRY_APOLLO_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.apollo"
261267
val SENTRY_GRAPHQL_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.graphql"
268+
val SENTRY_GRAPHQL_CORE_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.graphql-core"
262269
val SENTRY_GRAPHQL22_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.graphql22"
263270
val SENTRY_QUARTZ_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.quartz"
264271
val SENTRY_JDBC_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.jdbc"
@@ -267,6 +274,7 @@ object Config {
267274
val SENTRY_COMPOSE_HELPER_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.compose.helper"
268275
val SENTRY_OKHTTP_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.okhttp"
269276
val SENTRY_REACTOR_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.reactor"
277+
val SENTRY_KOTLIN_EXTENSIONS_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.kotlin-extensions"
270278
val group = "io.sentry"
271279
val description = "SDK for sentry.io"
272280
val versionNameProp = "versionName"

sentry-graphql-22/build.gradle.kts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,16 @@ buildConfig {
8282
buildConfigField("String", "SENTRY_GRAPHQL22_SDK_NAME", "\"${Config.Sentry.SENTRY_GRAPHQL22_SDK_NAME}\"")
8383
buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
8484
}
85+
86+
tasks.jar {
87+
manifest {
88+
attributes(
89+
"Sentry-Version-Name" to project.version,
90+
"Sentry-SDK-Name" to Config.Sentry.SENTRY_GRAPHQL22_SDK_NAME,
91+
"Sentry-SDK-Package-Name" to "maven:io.sentry:sentry-graphql-22",
92+
"Implementation-Vendor" to "Sentry",
93+
"Implementation-Title" to project.name,
94+
"Implementation-Version" to project.version
95+
)
96+
}
97+
}

sentry-graphql-core/build.gradle.kts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,16 @@ buildConfig {
8181
buildConfigField("String", "SENTRY_GRAPHQL_SDK_NAME", "\"${Config.Sentry.SENTRY_GRAPHQL_SDK_NAME}\"")
8282
buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
8383
}
84+
85+
tasks.jar {
86+
manifest {
87+
attributes(
88+
"Sentry-Version-Name" to project.version,
89+
"Sentry-SDK-Name" to Config.Sentry.SENTRY_GRAPHQL_CORE_SDK_NAME,
90+
"Sentry-SDK-Package-Name" to "maven:io.sentry:sentry-graphql-core",
91+
"Implementation-Vendor" to "Sentry",
92+
"Implementation-Title" to project.name,
93+
"Implementation-Version" to project.version
94+
)
95+
}
96+
}

sentry-graphql/build.gradle.kts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,16 @@ buildConfig {
8282
buildConfigField("String", "SENTRY_GRAPHQL_SDK_NAME", "\"${Config.Sentry.SENTRY_GRAPHQL_SDK_NAME}\"")
8383
buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
8484
}
85+
86+
tasks.jar {
87+
manifest {
88+
attributes(
89+
"Sentry-Version-Name" to project.version,
90+
"Sentry-SDK-Name" to Config.Sentry.SENTRY_GRAPHQL_SDK_NAME,
91+
"Sentry-SDK-Package-Name" to "maven:io.sentry:sentry-graphql",
92+
"Implementation-Vendor" to "Sentry",
93+
"Implementation-Title" to project.name,
94+
"Implementation-Version" to project.version
95+
)
96+
}
97+
}

sentry-jdbc/build.gradle.kts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,16 @@ buildConfig {
7676
buildConfigField("String", "SENTRY_JDBC_SDK_NAME", "\"${Config.Sentry.SENTRY_JDBC_SDK_NAME}\"")
7777
buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
7878
}
79+
80+
tasks.jar {
81+
manifest {
82+
attributes(
83+
"Sentry-Version-Name" to project.version,
84+
"Sentry-SDK-Name" to Config.Sentry.SENTRY_JDBC_SDK_NAME,
85+
"Sentry-SDK-Package-Name" to "maven:io.sentry:sentry-jdbc",
86+
"Implementation-Vendor" to "Sentry",
87+
"Implementation-Title" to project.name,
88+
"Implementation-Version" to project.version
89+
)
90+
}
91+
}

sentry-jul/build.gradle.kts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,16 @@ tasks.withType<JavaCompile>().configureEach {
8181
option("NullAway:AnnotatedPackages", "io.sentry")
8282
}
8383
}
84+
85+
tasks.jar {
86+
manifest {
87+
attributes(
88+
"Sentry-Version-Name" to project.version,
89+
"Sentry-SDK-Name" to Config.Sentry.SENTRY_JUL_SDK_NAME,
90+
"Sentry-SDK-Package-Name" to "maven:io.sentry:sentry-jul",
91+
"Implementation-Vendor" to "Sentry",
92+
"Implementation-Title" to project.name,
93+
"Implementation-Version" to project.version
94+
)
95+
}
96+
}

sentry-kotlin-extensions/build.gradle.kts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,16 @@ tasks.withType<Detekt> {
6969
kotlin {
7070
explicitApi()
7171
}
72+
73+
tasks.jar {
74+
manifest {
75+
attributes(
76+
"Sentry-Version-Name" to project.version,
77+
"Sentry-SDK-Name" to Config.Sentry.SENTRY_KOTLIN_EXTENSIONS_SDK_NAME,
78+
"Sentry-SDK-Package-Name" to "maven:io.sentry:sentry-kotlin-extensions",
79+
"Implementation-Vendor" to "Sentry",
80+
"Implementation-Title" to project.name,
81+
"Implementation-Version" to project.version
82+
)
83+
}
84+
}

sentry-log4j2/build.gradle.kts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,16 @@ tasks.withType<JavaCompile>().configureEach {
7979
option("NullAway:AnnotatedPackages", "io.sentry")
8080
}
8181
}
82+
83+
tasks.jar {
84+
manifest {
85+
attributes(
86+
"Sentry-Version-Name" to project.version,
87+
"Sentry-SDK-Name" to Config.Sentry.SENTRY_LOG4J2_SDK_NAME,
88+
"Sentry-SDK-Package-Name" to "maven:io.sentry:sentry-log4j2",
89+
"Implementation-Vendor" to "Sentry",
90+
"Implementation-Title" to project.name,
91+
"Implementation-Version" to project.version
92+
)
93+
}
94+
}

sentry-logback/build.gradle.kts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,16 @@ tasks.withType<JavaCompile>().configureEach {
7676
option("NullAway:AnnotatedPackages", "io.sentry")
7777
}
7878
}
79+
80+
tasks.jar {
81+
manifest {
82+
attributes(
83+
"Sentry-Version-Name" to project.version,
84+
"Sentry-SDK-Name" to Config.Sentry.SENTRY_LOGBACK_SDK_NAME,
85+
"Sentry-SDK-Package-Name" to "maven:io.sentry:sentry-logback",
86+
"Implementation-Vendor" to "Sentry",
87+
"Implementation-Title" to project.name,
88+
"Implementation-Version" to project.version
89+
)
90+
}
91+
}

0 commit comments

Comments
 (0)