Skip to content

Commit d0f9805

Browse files
committed
rename. recheck
1 parent c233756 commit d0f9805

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,12 @@ private void stopPreviousTransactions() {
159159
private void startTracing(final @NotNull Activity activity) {
160160
WeakReference<Activity> weakActivity = new WeakReference<>(activity);
161161
if (scopes != null && !isRunningTransactionOrTrace(activity)) {
162-
if (performanceEnabled) {
162+
if (!performanceEnabled) {
163+
activitiesWithOngoingTransactions.put(activity, NoOpTransaction.getInstance());
164+
if (options.isEnableAutoTraceIdGeneration()) {
165+
TracingUtils.startNewTrace(scopes);
166+
}
167+
} else {
163168
// as we allow a single transaction running on the bound Scope, we finish the previous ones
164169
stopPreviousTransactions();
165170

@@ -298,9 +303,6 @@ private void startTracing(final @NotNull Activity activity) {
298303
});
299304

300305
activitiesWithOngoingTransactions.put(activity, transaction);
301-
} else if (options.isEnableAutoTraceIdGeneration()) {
302-
activitiesWithOngoingTransactions.put(activity, NoOpTransaction.getInstance());
303-
TracingUtils.startNewTrace(scopes);
304306
}
305307
}
306308
}

sentry-android-core/src/main/java/io/sentry/android/core/ManifestMetadataReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ final class ManifestMetadataReader {
107107

108108
static final String IGNORED_ERRORS = "io.sentry.ignored-errors";
109109

110-
static final String ENABLE_AUTO_TRACE_ID_GENERATION = "io.sentry.enable-trace-update";
110+
static final String ENABLE_AUTO_TRACE_ID_GENERATION = "io.sentry.enable-auto-trace-id-generation";
111111

112112
/** ManifestMetadataReader ctor */
113113
private ManifestMetadataReader() {}

sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroidOptions.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,6 @@ public void setFrameMetricsCollector(
600600
this.frameMetricsCollector = frameMetricsCollector;
601601
}
602602

603-
604603
public boolean isEnableAutoTraceIdGeneration() {
605604
return enableAutoTraceIdGeneration;
606605
}

sentry-android-core/src/main/java/io/sentry/android/core/internal/gestures/SentryGestureListener.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,10 @@ private void startTracing(final @NotNull UiElement target, final @NotNull Gestur
201201
final boolean isNewInteraction = isClickGesture || !isNewGestureSameAsActive;
202202

203203
if (!(options.isTracingEnabled() && options.isEnableUserInteractionTracing())) {
204-
if (options.isEnableAutoTraceIdGeneration() && isNewInteraction) {
205-
TracingUtils.startNewTrace(scopes);
204+
if (isNewInteraction) {
205+
if (options.isEnableAutoTraceIdGeneration()) {
206+
TracingUtils.startNewTrace(scopes);
207+
}
206208
activeUiElement = target;
207209
activeEventType = eventType;
208210
}

0 commit comments

Comments
 (0)