Skip to content
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Features

- Move SentryLogs out of experimental ([#4710](https://github.com/getsentry/sentry-java/pull/4710))
- Add support for w3c traceparent header ([#4671](https://github.com/getsentry/sentry-java/pull/4671))
- This feature is disabled by default. If enabled, outgoing requests will include the w3c `traceparent` header.
- See https://develop.sentry.dev/sdk/telemetry/traces/distributed-tracing/#w3c-trace-context-header for more details.
Expand Down
2 changes: 0 additions & 2 deletions sentry/src/main/java/io/sentry/ExternalOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -522,12 +522,10 @@ public void setCaptureOpenTelemetryEvents(final @Nullable Boolean captureOpenTel
return captureOpenTelemetryEvents;
}

@ApiStatus.Experimental
public void setEnableLogs(final @Nullable Boolean enableLogs) {
this.enableLogs = enableLogs;
}

@ApiStatus.Experimental
public @Nullable Boolean isEnableLogs() {
return enableLogs;
}
Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/HubAdapter.java
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,6 @@ public void reportFullyDisplayed() {
return Sentry.getCurrentScopes().getRateLimiter();
}

@ApiStatus.Experimental
@Override
public @NotNull ILoggerApi logger() {
return Sentry.getCurrentScopes().logger();
Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/HubScopesWrapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,6 @@ public void reportFullyDisplayed() {
return scopes.captureReplay(replay, hint);
}

@ApiStatus.Experimental
@Override
public @NotNull ILoggerApi logger() {
return scopes.logger();
Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/IScopes.java
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,6 @@ default boolean isNoOp() {
@NotNull
SentryId captureReplay(@NotNull SentryReplayEvent replay, @Nullable Hint hint);

@ApiStatus.Experimental
@NotNull
ILoggerApi logger();
}
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/ISentryClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@ SentryId captureProfileChunk(
@ApiStatus.Experimental
SentryId captureCheckIn(@NotNull CheckIn checkIn, @Nullable IScope scope, @Nullable Hint hint);

@ApiStatus.Experimental
void captureLog(@NotNull SentryLogEvent logEvent, @Nullable IScope scope);

@ApiStatus.Internal
Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/NoOpHub.java
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,6 @@ public boolean isNoOp() {
return true;
}

@ApiStatus.Experimental
@Override
public @NotNull ILoggerApi logger() {
return NoOpLoggerApi.getInstance();
Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/NoOpScopes.java
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,6 @@ public boolean isNoOp() {
return SentryId.EMPTY_ID;
}

@ApiStatus.Experimental
@Override
public @NotNull ILoggerApi logger() {
return NoOpLoggerApi.getInstance();
Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/NoOpSentryClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ public SentryId captureEnvelope(@NotNull SentryEnvelope envelope, @Nullable Hint
return SentryId.EMPTY_ID;
}

@ApiStatus.Experimental
@Override
public void captureLog(@NotNull SentryLogEvent logEvent, @Nullable IScope scope) {
// do nothing
Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/ScopesAdapter.java
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,6 @@ public void reportFullyDisplayed() {
return Sentry.getCurrentScopes().captureReplay(replay, hint);
}

@ApiStatus.Experimental
@Override
public @NotNull ILoggerApi logger() {
return Sentry.getCurrentScopes().logger();
Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/Sentry.java
Original file line number Diff line number Diff line change
Expand Up @@ -1291,7 +1291,6 @@ public interface OptionsConfiguration<T extends SentryOptions> {
return getCurrentScopes().captureCheckIn(checkIn);
}

@ApiStatus.Experimental
@NotNull
public static ILoggerApi logger() {
return getCurrentScopes().logger();
Expand Down
8 changes: 2 additions & 6 deletions sentry/src/main/java/io/sentry/SentryOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -3474,20 +3474,19 @@ public void setDefaultRecoveryThreshold(@Nullable Long defaultRecoveryThreshold)
public static final class Logs {

/** Whether Sentry Logs feature is enabled and Sentry.logger() usages are sent to Sentry. */
@ApiStatus.Experimental private boolean enable = false;
private boolean enable = false;

/**
* This function is called with an SDK specific log event object and can return a modified event
* object or nothing to skip reporting the log item
*/
@ApiStatus.Experimental private @Nullable BeforeSendLogCallback beforeSend;
private @Nullable BeforeSendLogCallback beforeSend;

/**
* Whether Sentry Logs feature is enabled and Sentry.logger() usages are sent to Sentry.
*
* @return true if Sentry Logs should be enabled
*/
@ApiStatus.Experimental
public boolean isEnabled() {
return enable;
}
Expand All @@ -3497,7 +3496,6 @@ public boolean isEnabled() {
*
* @param enableLogs true if Sentry Logs should be enabled
*/
@ApiStatus.Experimental
public void setEnabled(boolean enableLogs) {
this.enable = enableLogs;
}
Expand All @@ -3507,7 +3505,6 @@ public void setEnabled(boolean enableLogs) {
*
* @return the beforeSendLog callback or null if not set
*/
@ApiStatus.Experimental
public @Nullable BeforeSendLogCallback getBeforeSend() {
return beforeSend;
}
Expand All @@ -3517,7 +3514,6 @@ public void setEnabled(boolean enableLogs) {
*
* @param beforeSendLog the beforeSendLog callback
*/
@ApiStatus.Experimental
public void setBeforeSend(@Nullable BeforeSendLogCallback beforeSendLog) {
this.beforeSend = beforeSendLog;
}
Expand Down
2 changes: 0 additions & 2 deletions sentry/src/main/java/io/sentry/logger/ILoggerApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@

import io.sentry.SentryDate;
import io.sentry.SentryLogLevel;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

@ApiStatus.Experimental
public interface ILoggerApi {

void trace(final @Nullable String message, @Nullable Object... args);
Expand Down
2 changes: 0 additions & 2 deletions sentry/src/main/java/io/sentry/logger/LoggerApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@
import io.sentry.util.Platform;
import io.sentry.util.TracingUtils;
import java.util.HashMap;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

@ApiStatus.Experimental
public final class LoggerApi implements ILoggerApi {

private final @NotNull Scopes scopes;
Expand Down
2 changes: 0 additions & 2 deletions sentry/src/main/java/io/sentry/logger/NoOpLoggerApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@

import io.sentry.SentryDate;
import io.sentry.SentryLogLevel;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

@ApiStatus.Experimental
public final class NoOpLoggerApi implements ILoggerApi {

private static final NoOpLoggerApi instance = new NoOpLoggerApi();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package io.sentry.logger;

import io.sentry.SentryLogEvent;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;

@ApiStatus.Experimental
public final class NoOpLoggerBatchProcessor implements ILoggerBatchProcessor {

private static final NoOpLoggerBatchProcessor instance = new NoOpLoggerBatchProcessor();
Expand Down
Loading