Skip to content

Commit b37524d

Browse files
adinaueradinauer
authored
Merge ac5c1e1 into 32f4b13 
2 parents 32f4b13 + ac5c1e1 commit b37524d

File tree

8 files changed

+52
-43
lines changed

8 files changed

+52
-43
lines changed

‎sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.jakewharton.nopen.annotation.Open;
77
import io.sentry.Breadcrumb;
88
import io.sentry.Hint;
9+
import io.sentry.InitPriority;
910
import io.sentry.ScopesAdapter;
1011
import io.sentry.Sentry;
1112
import io.sentry.SentryEvent;
@@ -69,11 +70,10 @@ public SentryHandler(final @NotNull SentryOptions options) {
6970
if (configureFromLogManager) {
7071
retrieveProperties();
7172
}
72-
if (!Sentry.isEnabled()) {
73-
options.setEnableExternalConfiguration(true);
74-
options.setSdkVersion(createSdkVersion(options));
75-
Sentry.init(options);
76-
}
73+
options.setEnableExternalConfiguration(true);
74+
options.setInitPriority(InitPriority.LOWEST);
75+
options.setSdkVersion(createSdkVersion(options));
76+
Sentry.init(options);
7777
addPackageAndIntegrationInfo();
7878
}
7979

‎sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import io.sentry.Hint;
1010
import io.sentry.IScopes;
1111
import io.sentry.ITransportFactory;
12+
import io.sentry.InitPriority;
1213
import io.sentry.ScopesAdapter;
1314
import io.sentry.Sentry;
1415
import io.sentry.SentryEvent;
@@ -116,28 +117,27 @@ public SentryAppender(
116117

117118
@Override
118119
public void start() {
119-
if (!Sentry.isEnabled()) {
120-
try {
121-
Sentry.init(
122-
options -> {
123-
options.setEnableExternalConfiguration(true);
124-
options.setDsn(dsn);
125-
if (debug != null) {
126-
options.setDebug(debug);
120+
try {
121+
Sentry.init(
122+
options -> {
123+
options.setEnableExternalConfiguration(true);
124+
options.setInitPriority(InitPriority.LOWEST);
125+
options.setDsn(dsn);
126+
if (debug != null) {
127+
options.setDebug(debug);
128+
}
129+
options.setSentryClientName(
130+
BuildConfig.SENTRY_LOG4J2_SDK_NAME + "/" + BuildConfig.VERSION_NAME);
131+
options.setSdkVersion(createSdkVersion(options));
132+
if (contextTags != null) {
133+
for (final String contextTag : contextTags) {
134+
options.addContextTag(contextTag);
127135
}
128-
options.setSentryClientName(
129-
BuildConfig.SENTRY_LOG4J2_SDK_NAME + "/" + BuildConfig.VERSION_NAME);
130-
options.setSdkVersion(createSdkVersion(options));
131-
if (contextTags != null) {
132-
for (final String contextTag : contextTags) {
133-
options.addContextTag(contextTag);
134-
}
135-
}
136-
Optional.ofNullable(transportFactory).ifPresent(options::setTransportFactory);
137-
});
138-
} catch (IllegalArgumentException e) {
139-
LOGGER.warn("Failed to init Sentry during appender initialization: " + e.getMessage());
140-
}
136+
}
137+
Optional.ofNullable(transportFactory).ifPresent(options::setTransportFactory);
138+
});
139+
} catch (IllegalArgumentException e) {
140+
LOGGER.warn("Failed to init Sentry during appender initialization: " + e.getMessage());
141141
}
142142
addPackageAndIntegrationInfo();
143143
super.start();

‎sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import io.sentry.DateUtils;
1414
import io.sentry.Hint;
1515
import io.sentry.ITransportFactory;
16+
import io.sentry.InitPriority;
1617
import io.sentry.ScopesAdapter;
1718
import io.sentry.Sentry;
1819
import io.sentry.SentryEvent;
@@ -49,24 +50,22 @@ public class SentryAppender extends UnsynchronizedAppenderBase<ILoggingEvent> {
4950

5051
@Override
5152
public void start() {
52-
// NOTE: logback.xml properties will only be applied if the SDK has not yet been initialized
53-
if (!Sentry.isEnabled()) {
54-
if (options.getDsn() == null || !options.getDsn().endsWith("_IS_UNDEFINED")) {
55-
options.setEnableExternalConfiguration(true);
56-
options.setSentryClientName(
57-
BuildConfig.SENTRY_LOGBACK_SDK_NAME + "/" + BuildConfig.VERSION_NAME);
58-
options.setSdkVersion(createSdkVersion(options));
59-
Optional.ofNullable(transportFactory).ifPresent(options::setTransportFactory);
60-
try {
61-
Sentry.init(options);
62-
} catch (IllegalArgumentException e) {
63-
addWarn("Failed to init Sentry during appender initialization: " + e.getMessage());
64-
}
65-
} else {
66-
options
67-
.getLogger()
68-
.log(SentryLevel.WARNING, "DSN is null. SentryAppender is not being initialized");
53+
if (options.getDsn() == null || !options.getDsn().endsWith("_IS_UNDEFINED")) {
54+
options.setEnableExternalConfiguration(true);
55+
options.setInitPriority(InitPriority.LOWEST);
56+
options.setSentryClientName(
57+
BuildConfig.SENTRY_LOGBACK_SDK_NAME + "/" + BuildConfig.VERSION_NAME);
58+
options.setSdkVersion(createSdkVersion(options));
59+
Optional.ofNullable(transportFactory).ifPresent(options::setTransportFactory);
60+
try {
61+
Sentry.init(options);
62+
} catch (IllegalArgumentException e) {
63+
addWarn("Failed to init Sentry during appender initialization: " + e.getMessage());
6964
}
65+
} else if (!Sentry.isEnabled()) {
66+
options
67+
.getLogger()
68+
.log(SentryLevel.WARNING, "DSN is null. SentryAppender is not being initialized");
7069
}
7170
addPackageAndIntegrationInfo();
7271
super.start();

‎sentry-opentelemetry/sentry-opentelemetry-agentcustomization/src/main/java/io/sentry/opentelemetry/SentryAutoConfigurationCustomizerProvider.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
77
import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
88
import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
9+
import io.sentry.InitPriority;
910
import io.sentry.Sentry;
1011
import io.sentry.SentryIntegrationPackageStorage;
1112
import io.sentry.SentryOptions;
@@ -50,6 +51,7 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
5051
Sentry.init(
5152
options -> {
5253
options.setEnableExternalConfiguration(true);
54+
options.setInitPriority(InitPriority.HIGH);
5355
options.setIgnoredSpanOrigins(SpanUtils.ignoredSpanOriginsForOpenTelemetry());
5456
options.setSpanFactory(spanFactory);
5557
final @Nullable SdkVersion sdkVersion = createSdkVersion(options, versionInfoHolder);

‎sentry-spring-boot-jakarta/src/main/java/io/sentry/spring/boot/jakarta/SentryAutoConfiguration.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import io.sentry.EventProcessor;
66
import io.sentry.IScopes;
77
import io.sentry.ITransportFactory;
8+
import io.sentry.InitPriority;
89
import io.sentry.Integration;
910
import io.sentry.ScopesAdapter;
1011
import io.sentry.Sentry;
@@ -133,6 +134,7 @@ static class HubConfiguration {
133134
options.setSentryClientName(
134135
BuildConfig.SENTRY_SPRING_BOOT_JAKARTA_SDK_NAME + "/" + BuildConfig.VERSION_NAME);
135136
options.setSdkVersion(createSdkVersion(options));
137+
options.setInitPriority(InitPriority.LOW);
136138
addPackageAndIntegrationInfo();
137139
// Spring Boot sets ignored exceptions in runtime using reflection - where the generic
138140
// information is lost

‎sentry-spring-boot/src/main/java/io/sentry/spring/boot/SentryAutoConfiguration.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import io.sentry.EventProcessor;
66
import io.sentry.IScopes;
77
import io.sentry.ITransportFactory;
8+
import io.sentry.InitPriority;
89
import io.sentry.Integration;
910
import io.sentry.ScopesAdapter;
1011
import io.sentry.Sentry;
@@ -131,6 +132,7 @@ static class HubConfiguration {
131132
options.setSentryClientName(
132133
BuildConfig.SENTRY_SPRING_BOOT_SDK_NAME + "/" + BuildConfig.VERSION_NAME);
133134
options.setSdkVersion(createSdkVersion(options));
135+
options.setInitPriority(InitPriority.LOW);
134136
addPackageAndIntegrationInfo();
135137
// Spring Boot sets ignored exceptions in runtime using reflection - where the generic
136138
// information is lost

‎sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/SentryHubRegistrar.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.sentry.spring.jakarta;
22

33
import com.jakewharton.nopen.annotation.Open;
4+
import io.sentry.InitPriority;
45
import io.sentry.ScopesAdapter;
56
import io.sentry.SentryIntegrationPackageStorage;
67
import io.sentry.SentryOptions;
@@ -46,6 +47,7 @@ private void registerSentryOptions(
4647
builder.addPropertyValue("enableExternalConfiguration", true);
4748
builder.addPropertyValue("sentryClientName", BuildConfig.SENTRY_SPRING_JAKARTA_SDK_NAME);
4849
builder.addPropertyValue("sdkVersion", createSdkVersion());
50+
builder.addPropertyValue("initPriority", InitPriority.LOW);
4951
addPackageAndIntegrationInfo();
5052
if (annotationAttributes.containsKey("sendDefaultPii")) {
5153
builder.addPropertyValue("sendDefaultPii", annotationAttributes.getBoolean("sendDefaultPii"));

‎sentry-spring/src/main/java/io/sentry/spring/SentryHubRegistrar.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.sentry.spring;
22

33
import com.jakewharton.nopen.annotation.Open;
4+
import io.sentry.InitPriority;
45
import io.sentry.ScopesAdapter;
56
import io.sentry.SentryIntegrationPackageStorage;
67
import io.sentry.SentryOptions;
@@ -46,6 +47,7 @@ private void registerSentryOptions(
4647
builder.addPropertyValue("enableExternalConfiguration", true);
4748
builder.addPropertyValue("sentryClientName", BuildConfig.SENTRY_SPRING_SDK_NAME);
4849
builder.addPropertyValue("sdkVersion", createSdkVersion());
50+
builder.addPropertyValue("initPriority", InitPriority.LOW);
4951
addPackageAndIntegrationInfo();
5052
if (annotationAttributes.containsKey("sendDefaultPii")) {
5153
builder.addPropertyValue("sendDefaultPii", annotationAttributes.getBoolean("sendDefaultPii"));

0 commit comments

Comments
 (0)