Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

poc add otel bom to sentry bom #3976

Draft
wants to merge 2 commits into
base: 8.x.x
Choose a base branch
from
Draft

poc add otel bom to sentry bom #3976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fae85e1
update readmes for noagent samples, add otel properties to applicatio…
lbloder Dec 10, 2024
b1391be
poc to add otel bom to sentry bom and testing by adding a dep without…
lbloder Dec 10, 2024
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
1 change: 1 addition & 0 deletions buildSrc/src/main/java/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ object Config {
val springBoot3StarterJdbc = "org.springframework.boot:spring-boot-starter-jdbc:$springBoot3Version"
val springBoot3StarterActuator = "org.springframework.boot:spring-boot-starter-actuator:$springBoot3Version"
val springBoot3StarterOpenTelemetry = "io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter:${OpenTelemetry.otelInstrumentationVersion}"
val springBoot3StarterOpenTelemetryNoversion = "io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter"

val springWeb = "org.springframework:spring-webmvc"
val springWebflux = "org.springframework:spring-webflux"
Expand Down
3 changes: 3 additions & 0 deletions sentry-bom/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ plugins {
`maven-publish`
}

javaPlatform.allowDependencies()

dependencies {
constraints {
project.rootProject.subprojects
Expand All @@ -26,6 +28,7 @@ dependencies {
}
}
}
api(platform(Config.Libs.OpenTelemetry.otelInstrumentationBom))
}

publishing {
Expand Down
2 changes: 1 addition & 1 deletion sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Sentry Sample Spring Boot 3.0+

Sample application showing how to use Sentry with [Spring boot](http://spring.io/projects/spring-boot) from version `3.0` onwards.
Sample application showing how to use Sentry with [Spring boot](http://spring.io/projects/spring-boot) from version `3.0` onwards integrated with the [OpenTelemetry Spring Boot Starter](https://opentelemetry.io/docs/zero-code/java/spring-boot-starter/).

## How to run?

Expand Down
9 changes: 2 additions & 7 deletions sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,10 @@ dependencies {
implementation(projects.sentryLogback)
implementation(projects.sentryGraphql22)
implementation(projects.sentryQuartz)
implementation(Config.Libs.springBoot3StarterOpenTelemetry)
implementation(Config.Libs.springBoot3StarterOpenTelemetryNoversion)
implementation(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap)
implementation(projects.sentryOpentelemetry.sentryOpentelemetryAgentcustomization)
implementation(platform(projects.sentryBom))

// database query tracing
implementation(projects.sentryJdbc)
Expand All @@ -69,12 +70,6 @@ dependencies {
testImplementation(Config.Libs.apolloKotlin)
}

dependencyManagement {
imports {
mavenBom(Config.Libs.OpenTelemetry.otelInstrumentationBom)
}
}

configure<SourceSetContainer> {
test {
java.srcDir("src/test/java")
Expand Down
4 changes: 4 additions & 0 deletions ...mples-spring-boot-jakarta-opentelemetry-noagent/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,8 @@ spring.graphql.graphiql.enabled=true
spring.graphql.websocket.path=/graphql
spring.quartz.job-store-type=memory

# OTEL configuration
otel.propagators=tracecontext,baggage,sentry
otel.logs.exporter=none
otel.metrics.exporter=none
otel.traces.exporter=none
2 changes: 1 addition & 1 deletion sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Sentry Sample Spring Boot

Sample application showing how to use Sentry with [Spring boot](http://spring.io/projects/spring-boot).
Sample application showing how to use Sentry with [Spring boot](http://spring.io/projects/spring-boot) integrated with the [OpenTelemetry Spring Boot Starter](https://opentelemetry.io/docs/zero-code/java/spring-boot-starter/).

## How to run?

Expand Down
9 changes: 2 additions & 7 deletions sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,10 @@ dependencies {
implementation(projects.sentryLogback)
implementation(projects.sentryGraphql)
implementation(projects.sentryQuartz)
implementation(Config.Libs.springBoot3StarterOpenTelemetry)
implementation(Config.Libs.springBoot3StarterOpenTelemetryNoversion)
implementation(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap)
implementation(projects.sentryOpentelemetry.sentryOpentelemetryAgentcustomization)
implementation(platform(projects.sentryBom))

// database query tracing
implementation(projects.sentryJdbc)
Expand All @@ -70,12 +71,6 @@ dependencies {
testImplementation("org.apache.httpcomponents:httpclient")
}

dependencyManagement {
imports {
mavenBom(Config.Libs.OpenTelemetry.otelInstrumentationBom)
}
}

configure<SourceSetContainer> {
test {
java.srcDir("src/test/java")
Expand Down
6 changes: 6 additions & 0 deletions ...entry-samples-spring-boot-opentelemetry-noagent/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,9 @@ spring.datasource.username=sa
spring.datasource.password=
spring.graphql.graphiql.enabled=true
spring.graphql.websocket.path=/graphql

# OTEL configuration
otel.propagators=tracecontext,baggage,sentry
otel.logs.exporter=none
otel.metrics.exporter=none
otel.traces.exporter=none
Loading