Skip to content

Move Spring 7 and Spring Boot 4 packages #4615

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.

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

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.sentry.samples.spring.jakarta;
package io.sentry.samples.spring7;

import io.sentry.IScopes;
import io.sentry.spring.jakarta.SentryUserFilter;
import io.sentry.spring.jakarta.SentryUserProvider;
import io.sentry.spring7.SentryUserFilter;
import io.sentry.spring7.SentryUserProvider;
import java.util.List;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.sentry.samples.spring.jakarta;
package io.sentry.samples.spring7;

import io.sentry.spring.jakarta.tracing.SentryTracingFilter;
import io.sentry.spring7.tracing.SentryTracingFilter;
import jakarta.servlet.Filter;
import org.springframework.web.filter.DelegatingFilterProxy;
import org.springframework.web.filter.RequestContextFilter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.jakarta;
package io.sentry.samples.spring7;

import org.jetbrains.annotations.NotNull;
import org.springframework.context.annotation.Bean;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.sentry.samples.spring.jakarta;
package io.sentry.samples.spring7;

import io.sentry.SentryOptions;
import io.sentry.SentryOptions.TracesSamplerCallback;
import io.sentry.spring.jakarta.EnableSentry;
import io.sentry.spring.jakarta.tracing.SentryTracingConfiguration;
import io.sentry.spring7.EnableSentry;
import io.sentry.spring7.tracing.SentryTracingConfiguration;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.sentry.samples.spring.jakarta;
package io.sentry.samples.spring7;

import io.sentry.IScopes;
import io.sentry.spring.jakarta.tracing.SentrySpanClientHttpRequestInterceptor;
import io.sentry.spring7.tracing.SentrySpanClientHttpRequestInterceptor;
import java.util.Collections;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
Expand All @@ -12,7 +12,7 @@

@Configuration
@EnableAspectJAutoProxy(proxyTargetClass = true)
@ComponentScan("io.sentry.samples.spring.jakarta")
@ComponentScan("io.sentry.samples.spring7")
@EnableWebMvc
public class WebConfig {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.jakarta.web;
package io.sentry.samples.spring7.web;

public class Person {
private final String firstName;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.jakarta.web;
package io.sentry.samples.spring7.web;

import io.sentry.Sentry;
import org.slf4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.sentry.samples.spring.jakarta.web;
package io.sentry.samples.spring7.web;

import io.sentry.spring.jakarta.tracing.SentrySpan;
import io.sentry.spring7.tracing.SentrySpan;
import java.util.Map;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import io.sentry.EventProcessor;
import io.sentry.Hint;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import io.sentry.spring.jakarta.checkin.SentryCheckIn;
import io.sentry.spring.jakarta.tracing.SentryTransaction;
import io.sentry.spring7.checkin.SentryCheckIn;
import io.sentry.spring7.tracing.SentryTransaction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.Scheduled;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import io.opentelemetry.instrumentation.annotations.WithSpan;
import java.nio.charset.Charset;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

public class Person {
private final String firstName;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.Tracer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import io.sentry.ISpan;
import io.sentry.Sentry;
import io.sentry.spring.jakarta.tracing.SentrySpan;
import io.sentry.spring7.tracing.SentrySpan;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.jdbc.core.JdbcTemplate;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import org.jetbrains.annotations.NotNull;
import org.springframework.context.annotation.Bean;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import static io.sentry.quartz.SentryJobListener.SENTRY_SLUG_KEY;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.trace.Tracer;
import io.sentry.samples.spring.boot.jakarta.quartz.SampleJob;
import io.sentry.samples.spring.boot4.quartz.SampleJob;
import java.util.Collections;
import org.quartz.JobDetail;
import org.quartz.SimpleTrigger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

public class Todo {
private final Long id;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.Tracer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta.graphql;
package io.sentry.samples.spring.boot4.graphql;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta.graphql;
package io.sentry.samples.spring.boot4.graphql;

import org.springframework.graphql.data.method.annotation.Argument;
import org.springframework.graphql.data.method.annotation.QueryMapping;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta.graphql;
package io.sentry.samples.spring.boot4.graphql;

import java.nio.file.NoSuchFileException;
import java.time.Duration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta.graphql;
package io.sentry.samples.spring.boot4.graphql;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta.quartz;
package io.sentry.samples.spring.boot4.quartz;

import org.quartz.Job;
import org.quartz.JobExecutionContext;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import io.sentry.EventProcessor;
import io.sentry.Hint;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import io.sentry.spring.jakarta.checkin.SentryCheckIn;
import io.sentry.spring.jakarta.tracing.SentryTransaction;
import io.sentry.spring7.checkin.SentryCheckIn;
import io.sentry.spring7.tracing.SentryTransaction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import java.nio.charset.Charset;
import org.slf4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

public class Person {
private final String firstName;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.Tracer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import io.sentry.ISpan;
import io.sentry.Sentry;
import io.sentry.spring.jakarta.tracing.SentrySpan;
import io.sentry.spring7.tracing.SentrySpan;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.jdbc.core.JdbcTemplate;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import org.jetbrains.annotations.NotNull;
import org.springframework.context.annotation.Bean;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import static io.sentry.quartz.SentryJobListener.SENTRY_SLUG_KEY;

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.trace.Tracer;
import io.sentry.samples.spring.boot.jakarta.quartz.SampleJob;
import io.sentry.samples.spring.boot4.quartz.SampleJob;
import java.util.Collections;
import org.quartz.JobDetail;
import org.quartz.SimpleTrigger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

public class Todo {
private final Long id;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.Tracer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta.graphql;
package io.sentry.samples.spring.boot4.graphql;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta.graphql;
package io.sentry.samples.spring.boot4.graphql;

import org.springframework.graphql.data.method.annotation.Argument;
import org.springframework.graphql.data.method.annotation.QueryMapping;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta.graphql;
package io.sentry.samples.spring.boot4.graphql;

import java.nio.file.NoSuchFileException;
import java.time.Duration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta.graphql;
package io.sentry.samples.spring.boot4.graphql;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta.quartz;
package io.sentry.samples.spring.boot4.quartz;

import org.quartz.Job;
import org.quartz.JobExecutionContext;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import java.nio.charset.Charset;
import org.slf4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

public class Person {
private final String firstName;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import io.sentry.Sentry;
import org.slf4j.Logger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import io.sentry.Sentry;
import java.time.Duration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

public class Todo {
private final Long id;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta.graphql;
package io.sentry.samples.spring.boot4.graphql;

import org.springframework.graphql.data.method.annotation.Argument;
import org.springframework.graphql.data.method.annotation.QueryMapping;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ dependencies {
implementation(libs.springboot4.starter.webflux)
implementation(libs.springboot4.starter.websocket)
implementation(libs.springboot4.starter.restclient)
implementation(libs.springboot4.starter.webclient)
implementation(Config.Libs.aspectj)
implementation(Config.Libs.kotlinReflect)
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import io.sentry.EventProcessor;
import io.sentry.Hint;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import io.sentry.spring.jakarta.checkin.SentryCheckIn;
import io.sentry.spring.jakarta.tracing.SentryTransaction;
import io.sentry.spring7.checkin.SentryCheckIn;
import io.sentry.spring7.tracing.SentryTransaction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.sentry.samples.spring.boot.jakarta;
package io.sentry.samples.spring.boot4;

import java.nio.charset.Charset;
import org.slf4j.Logger;
Expand Down
Loading
Loading