Skip to content

POTEL 24 - Fixes after merge and some more PR comments have been addressed #3515

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

Merged
merged 4 commits into from
Jun 25, 2024
Merged

POTEL 24 - Fixes after merge and some more PR comments have been addressed #3515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ad8685
improve changelog
adinauer Jun 25, 2024
2ab67ff
bump otel versions
adinauer Jun 25, 2024
9ce1e9c
merge fix; pr comments
adinauer Jun 25, 2024
3623d9a
Merge branch '8.x.x' into feat/potel-24-merge-fix-pr-comments
adinauer Jun 25, 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
2 changes: 0 additions & 2 deletions ...tion/src/main/java/io/sentry/opentelemetry/SentryAutoConfigurationCustomizerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
}
}

ContextStorage.addWrapper((storage) -> new SentryContextStorage(storage));

autoConfiguration
.addTracerProviderCustomizer(this::configureSdkTracerProvider)
.addPropertiesSupplier(this::getDefaultProperties);
Expand Down
3 changes: 0 additions & 3 deletions sentry/api/sentry.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,6 @@ public abstract interface class io/sentry/ISpan {
public abstract fun getContexts ()Lio/sentry/protocol/Contexts;
public abstract fun getData (Ljava/lang/String;)Ljava/lang/Object;
public abstract fun getDescription ()Ljava/lang/String;
public abstract fun getEventId ()Lio/sentry/protocol/SentryId;
public abstract fun getFinishDate ()Lio/sentry/SentryDate;
public abstract fun getLocalMetricsAggregator ()Lio/sentry/metrics/LocalMetricsAggregator;
public abstract fun getOperation ()Ljava/lang/String;
Expand Down Expand Up @@ -1551,7 +1550,6 @@ public final class io/sentry/NoOpSpan : io/sentry/ISpan {
public fun getContexts ()Lio/sentry/protocol/Contexts;
public fun getData (Ljava/lang/String;)Ljava/lang/Object;
public fun getDescription ()Ljava/lang/String;
public fun getEventId ()Lio/sentry/protocol/SentryId;
public fun getFinishDate ()Lio/sentry/SentryDate;
public static fun getInstance ()Lio/sentry/NoOpSpan;
public fun getLocalMetricsAggregator ()Lio/sentry/metrics/LocalMetricsAggregator;
Expand Down Expand Up @@ -3112,7 +3110,6 @@ public final class io/sentry/Span : io/sentry/ISpan {
public fun getData ()Ljava/util/Map;
public fun getData (Ljava/lang/String;)Ljava/lang/Object;
public fun getDescription ()Ljava/lang/String;
public fun getEventId ()Lio/sentry/protocol/SentryId;
public fun getFinishDate ()Lio/sentry/SentryDate;
public fun getLocalMetricsAggregator ()Lio/sentry/metrics/LocalMetricsAggregator;
public fun getMeasurements ()Ljava/util/Map;
Expand Down
3 changes: 0 additions & 3 deletions sentry/src/main/java/io/sentry/ISpan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,6 @@ ISpan startChild(
@Nullable
TracesSamplingDecision getSamplingDecision();

// @NotNull
// SentryId getEventId();

@ApiStatus.Internal
@NotNull
ISentryLifecycleToken makeCurrent();
Expand Down
4 changes: 4 additions & 0 deletions sentry/src/main/java/io/sentry/Sentry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,14 @@ private static synchronized void init(

options.getLogger().log(SentryLevel.INFO, "GlobalHubMode: '%s'", String.valueOf(globalHubMode));
Sentry.globalHubMode = globalHubMode;
globalScope.replaceOptions(options);

final IScopes scopes = getCurrentScopes();
final IScope rootScope = new Scope(options);
final IScope rootIsolationScope = new Scope(options);
rootScopes = new Scopes(rootScope, rootIsolationScope, globalScope, "Sentry.init");

getScopesStorage().set(rootScopes);

scopes.close(true);
globalScope.bindClient(new SentryClient(rootScopes.getOptions()));
Expand Down
5 changes: 0 additions & 5 deletions sentry/src/main/java/io/sentry/Span.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,11 +306,6 @@ public boolean isFinished() {
return context.getSamplingDecision();
}

// @Override
// public @NotNull SentryId getEventId() {
// return new SentryId(UUID.nameUUIDFromBytes(getSpanId().toString().getBytes()));
// }

@Override
public void setThrowable(final @Nullable Throwable throwable) {
this.throwable = throwable;
Expand Down