Skip to content

Commit

Permalink
renamed
Browse files Browse the repository at this point in the history
  • Loading branch information
bitsandfoxes committed Feb 6, 2025
1 parent a4b2d66 commit 946cdeb
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public void setTrace(@Nullable SpanContext spanContext, @NotNull IScope scope) {
}

try {
options.getExecutorService().submit(() -> nativeScope.setTraceId(spanContext.getTraceId().toString(), spanContext.getSpanId().toString()));
options.getExecutorService().submit(() -> nativeScope.setTrace(spanContext.getTraceId().toString(), spanContext.getSpanId().toString()));
} catch (Throwable e) {
options.getLogger().log(SentryLevel.ERROR, e, "Scope sync setTraceId failed.");
}
Expand Down
4 changes: 2 additions & 2 deletions sentry/src/main/java/io/sentry/HubAdapter.java
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,9 @@ public void reportFullyDisplayed() {
}

@Override
public void continueTrace(
public void setTrace(
final @NotNull String traceId, final @NotNull String spanId) {
Sentry.continueTrace(traceId, spanId);
Sentry.setTrace(traceId, spanId);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions sentry/src/main/java/io/sentry/HubScopesWrapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -317,9 +317,9 @@ public void reportFullyDisplayed() {
}

@Override
public void continueTrace(
public void setTrace(
@NotNull String traceId, @NotNull String spanId) {
scopes.continueTrace(traceId, spanId);
scopes.setTrace(traceId, spanId);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions sentry/src/main/java/io/sentry/IScopes.java
Original file line number Diff line number Diff line change
Expand Up @@ -658,12 +658,12 @@ TransactionContext continueTrace(
final @Nullable String sentryTrace, final @Nullable List<String> baggageHeaders);

/**
* Continue a trace based on the trace ID and span ID provided
* Set a trace. This is primarily used by other SDKs in a Hybrid SDK context
*
* @param traceId the trace ID
* @param spanId the span ID this is continuing the trace from
*/
void continueTrace(final @NotNull String traceId, final @NotNull String spanId);
void setTrace(final @NotNull String traceId, final @NotNull String spanId);

/**
* Returns the "sentry-trace" header that allows tracing across services. Can also be used in
Expand Down
2 changes: 1 addition & 1 deletion sentry/src/main/java/io/sentry/NoOpHub.java
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ public void reportFullyDisplayed() {}
}

@Override
public void continueTrace(
public void setTrace(
final @NotNull String traceID, final @NotNull String spanId) {}

@Override
Expand Down
2 changes: 1 addition & 1 deletion sentry/src/main/java/io/sentry/NoOpScopes.java
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ public void reportFullyDisplayed() {}
}

@Override
public void continueTrace(
public void setTrace(
final @NotNull String traceId, final @NotNull String spanId) { }

@Override
Expand Down
2 changes: 1 addition & 1 deletion sentry/src/main/java/io/sentry/Scopes.java
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@ public void setActiveSpan(final @Nullable ISpan span) {
}

@Override
public void continueTrace(
public void setTrace(
final @NotNull String traceId, final @NotNull String spanID) {
@NotNull
PropagationContext propagationContext = PropagationContext.fromId(traceId, spanID);
Expand Down
4 changes: 2 additions & 2 deletions sentry/src/main/java/io/sentry/ScopesAdapter.java
Original file line number Diff line number Diff line change
Expand Up @@ -322,9 +322,9 @@ public void reportFullyDisplayed() {
}

@Override
public void continueTrace(
public void setTrace(
final @NotNull String traceId, final @NotNull String spanId) {
Sentry.continueTrace(traceId, spanId);
Sentry.setTrace(traceId, spanId);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions sentry/src/main/java/io/sentry/Sentry.java
Original file line number Diff line number Diff line change
Expand Up @@ -1154,9 +1154,9 @@ public interface OptionsConfiguration<T extends SentryOptions> {
* @param spanId the span ID
*/
// return TransactionContext (if performance enabled) or null (if performance disabled)
public static void continueTrace(
public static void setTrace(
final @NotNull String traceId, final @NotNull String spanId) {
getCurrentScopes().continueTrace(traceId, spanId);
getCurrentScopes().setTrace(traceId, spanId);
}

/**
Expand Down

0 comments on commit 946cdeb

Please sign in to comment.