Skip to content

Commit 8d690e6

Browse files
adinaueradinauer
authored
Merge pull request #6252 from getsentry/ref/remove-instrumenter-v9
ref(core): [Tracing API Cleanup 1] Remove deprecated Instrumenter option
2 parents ae62fcf + f9174c9 commit 8d690e6

27 files changed

Lines changed: 41 additions & 371 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
- Disable tracing for HTTP `OPTIONS` requests by default. Set `traceOptionsRequests` to `true` to
4646
preserve the previous behavior ([#6254](https://github.com/getsentry/sentry-java/pull/6254))
4747
- Remove the Apache HttpClient transport and stop publishing `sentry-apache-http-client-5` ([#6214](https://github.com/getsentry/sentry-java/pull/6214))
48+
- Remove the deprecated `Instrumenter` enum, option, span context property, and `startChild` overloads ([#6252](https://github.com/getsentry/sentry-java/pull/6252))
4849
- Remove deprecated OpenTelemetry integration classes and the legacy `SentrySpanStorage` ([#6243](https://github.com/getsentry/sentry-java/pull/6243))
4950
- Decide whether foregrounding the app starts a new session on a monotonic clock instead of the wall clock, so that a device time change no longer starts a session that should have been resumed, or resumes one that should have ended. This affects session counts ([#6096](https://github.com/getsentry/sentry-java/pull/6096))
5051

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

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import io.sentry.ISentryLifecycleToken;
1818
import io.sentry.ISpan;
1919
import io.sentry.ITransaction;
20-
import io.sentry.Instrumenter;
2120
import io.sentry.Integration;
2221
import io.sentry.NoOpTransaction;
2322
import io.sentry.PropagationContext;
@@ -366,29 +365,19 @@ private void startTracing(final @NotNull Activity activity) {
366365
getAppStartOp(coldStart),
367366
getAppStartDesc(coldStart),
368367
appStartTime,
369-
Instrumenter.SENTRY,
370368
spanOptions);
371369

372370
finishAppStartSpan();
373371
}
374372
}
375373
final @NotNull ISpan ttidSpan =
376-
transaction.startChild(
377-
TTID_OP,
378-
getTtidDesc(activityName),
379-
ttidStartTime,
380-
Instrumenter.SENTRY,
381-
spanOptions);
374+
transaction.startChild(TTID_OP, getTtidDesc(activityName), ttidStartTime, spanOptions);
382375
ttidSpanMap.put(activity, ttidSpan);
383376

384377
if (timeToFullDisplaySpanEnabled && fullyDisplayedReporter != null && options != null) {
385378
final @NotNull ISpan ttfdSpan =
386379
transaction.startChild(
387-
TTFD_OP,
388-
getTtfdDesc(activityName),
389-
ttidStartTime,
390-
Instrumenter.SENTRY,
391-
spanOptions);
380+
TTFD_OP, getTtfdDesc(activityName), ttidStartTime, spanOptions);
392381
try {
393382
ttfdSpanMap.put(activity, ttfdSpan);
394383
ttfdAutoCloseFuture =
@@ -1130,7 +1119,6 @@ private void onHeadlessAppStart() {
11301119
APP_START_EXTENDED_OP,
11311120
APP_START_EXTENDED_DESC,
11321121
AndroidDateUtils.getCurrentSentryDateTime(),
1133-
Instrumenter.SENTRY,
11341122
spanOptions);
11351123

11361124
return new AppStartExtension.ExtendedAppStart(transaction, extendedSpan);

‎sentry-android-core/src/main/java/io/sentry/android/core/performance/ActivityLifecycleSpanHelper.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import android.os.Looper;
44
import android.os.SystemClock;
55
import io.sentry.ISpan;
6-
import io.sentry.Instrumenter;
76
import io.sentry.SentryDate;
87
import io.sentry.SpanDataConvention;
98
import io.sentry.SpanStatus;
@@ -111,8 +110,7 @@ public void saveSpanToAppStartMetrics() {
111110
final @NotNull String description,
112111
final @NotNull SentryDate startTimestamp) {
113112
final @NotNull ISpan span =
114-
parentSpan.startChild(
115-
APP_METRICS_ACTIVITIES_OP, description, startTimestamp, Instrumenter.SENTRY);
113+
parentSpan.startChild(APP_METRICS_ACTIVITIES_OP, description, startTimestamp);
116114
setDefaultStartSpanData(span);
117115
return span;
118116
}

‎sentry-android-sqlite/src/main/java/io/sentry/android/sqlite/OpenHelperSpans.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import android.database.CrossProcessCursor
44
import android.database.SQLException
55
import io.sentry.IScopes
66
import io.sentry.ISpan
7-
import io.sentry.Instrumenter
87
import io.sentry.ScopesAdapter
98
import io.sentry.SentryIntegrationPackageStorage
109
import io.sentry.SentryStackTraceFactory
@@ -46,12 +45,12 @@ internal class OpenHelperSpans(
4645
if (result is CrossProcessCursor) {
4746
return SentryCrossProcessCursor(result, this, sql) as T
4847
}
49-
span = scopes.span?.startChild("db.sql.query", sql, startTimestamp, Instrumenter.SENTRY)
48+
span = scopes.span?.startChild("db.sql.query", sql, startTimestamp)
5049
span?.spanContext?.origin = TRACE_ORIGIN
5150
span?.status = SpanStatus.OK
5251
result
5352
} catch (e: Throwable) {
54-
span = scopes.span?.startChild("db.sql.query", sql, startTimestamp, Instrumenter.SENTRY)
53+
span = scopes.span?.startChild("db.sql.query", sql, startTimestamp)
5554
span?.spanContext?.origin = TRACE_ORIGIN
5655
span?.status = SpanStatus.INTERNAL_ERROR
5756
span?.throwable = e

‎sentry-android-sqlite/src/main/java/io/sentry/sqlite/DriverSpans.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package io.sentry.sqlite
22

33
import io.sentry.IScopes
44
import io.sentry.ISpan
5-
import io.sentry.Instrumenter
65
import io.sentry.ScopesAdapter
76
import io.sentry.SentryDate
87
import io.sentry.SentryLongDate
@@ -50,7 +49,7 @@ internal class DriverSpans(private val scopes: IScopes, private val dbMetadata:
5049
val startTimestamp = SentryLongDate(startTimestampNanos)
5150
val endTimestamp = SentryLongDate(startTimestampNanos + durationNanos)
5251

53-
parent.startChild("db.sql.query", sql, startTimestamp, Instrumenter.SENTRY).apply {
52+
parent.startChild("db.sql.query", sql, startTimestamp).apply {
5453
spanContext.origin = SQLITE_TRACE_ORIGIN
5554
throwable?.let { this.throwable = it }
5655

‎sentry-compose/src/androidMain/kotlin/io/sentry/compose/SentryComposeTracing.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import androidx.compose.ui.ExperimentalComposeUiApi
99
import androidx.compose.ui.Modifier
1010
import androidx.compose.ui.draw.drawWithContent
1111
import io.sentry.ISpan
12-
import io.sentry.Instrumenter
1312
import io.sentry.Sentry
1413
import io.sentry.SentryDate
1514
import io.sentry.SpanOptions
@@ -129,7 +128,6 @@ private fun recordCompositionSpan(
129128
OP_COMPOSITION_SPAN,
130129
tag,
131130
startTimestamp,
132-
Instrumenter.SENTRY,
133131
SpanOptions().apply { origin = OP_TRACE_ORIGIN },
134132
)
135133
.run { finish(null, endTimestamp) }
@@ -154,7 +152,6 @@ private fun recordRenderSpan(
154152
OP_RENDER_SPAN,
155153
tag,
156154
startTimestamp,
157-
Instrumenter.SENTRY,
158155
SpanOptions().apply { origin = OP_TRACE_ORIGIN },
159156
)
160157
.run { finish(null, endTimestamp) }
@@ -244,7 +241,6 @@ private class BucketSpans {
244241
operation,
245242
description,
246243
startTimestamp,
247-
Instrumenter.SENTRY,
248244
SpanOptions().apply {
249245
origin = OP_TRACE_ORIGIN
250246
isTrimStart = true

‎sentry-opentelemetry/sentry-opentelemetry-bootstrap/api/sentry-opentelemetry-bootstrap.api‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ public final class io/sentry/opentelemetry/OtelStrongRefSpanWrapper : io/sentry/
8686
public fun startChild (Ljava/lang/String;)Lio/sentry/ISpan;
8787
public fun startChild (Ljava/lang/String;Ljava/lang/String;)Lio/sentry/ISpan;
8888
public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;)Lio/sentry/ISpan;
89-
public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;Lio/sentry/Instrumenter;)Lio/sentry/ISpan;
90-
public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;Lio/sentry/Instrumenter;Lio/sentry/SpanOptions;)Lio/sentry/ISpan;
89+
public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;Lio/sentry/SpanOptions;)Lio/sentry/ISpan;
9190
public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SpanOptions;)Lio/sentry/ISpan;
9291
public fun storeInContext (Lio/opentelemetry/context/Context;)Lio/opentelemetry/context/Context;
9392
public fun toBaggageHeader (Ljava/util/List;)Lio/sentry/BaggageHeader;
@@ -141,8 +140,7 @@ public final class io/sentry/opentelemetry/OtelTransactionSpanForwarder : io/sen
141140
public fun startChild (Ljava/lang/String;)Lio/sentry/ISpan;
142141
public fun startChild (Ljava/lang/String;Ljava/lang/String;)Lio/sentry/ISpan;
143142
public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;)Lio/sentry/ISpan;
144-
public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;Lio/sentry/Instrumenter;)Lio/sentry/ISpan;
145-
public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;Lio/sentry/Instrumenter;Lio/sentry/SpanOptions;)Lio/sentry/ISpan;
143+
public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;Lio/sentry/SpanOptions;)Lio/sentry/ISpan;
146144
public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SpanOptions;)Lio/sentry/ISpan;
147145
public fun toBaggageHeader (Ljava/util/List;)Lio/sentry/BaggageHeader;
148146
public fun toSentryTrace ()Lio/sentry/SentryTraceHeader;

‎sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/OtelStrongRefSpanWrapper.java‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import io.sentry.IScopes;
88
import io.sentry.ISentryLifecycleToken;
99
import io.sentry.ISpan;
10-
import io.sentry.Instrumenter;
1110
import io.sentry.MeasurementUnit;
1211
import io.sentry.SentryDate;
1312
import io.sentry.SentryTraceHeader;
@@ -125,29 +124,19 @@ public void setTransactionName(@NotNull String name, @NotNull TransactionNameSou
125124
return delegate.startChild(spanContext, spanOptions);
126125
}
127126

128-
@Override
129-
public @NotNull ISpan startChild(
130-
@NotNull String operation, @Nullable String description, @Nullable SentryDate timestamp) {
131-
return delegate.startChild(operation, description, timestamp);
132-
}
133-
134127
@Override
135128
public @NotNull ISpan startChild(
136129
@NotNull String operation,
137130
@Nullable String description,
138131
@Nullable SentryDate timestamp,
139-
@NotNull Instrumenter instrumenter) {
140-
return delegate.startChild(operation, description, timestamp, instrumenter);
132+
@NotNull SpanOptions spanOptions) {
133+
return delegate.startChild(operation, description, timestamp, spanOptions);
141134
}
142135

143136
@Override
144137
public @NotNull ISpan startChild(
145-
@NotNull String operation,
146-
@Nullable String description,
147-
@Nullable SentryDate timestamp,
148-
@NotNull Instrumenter instrumenter,
149-
@NotNull SpanOptions spanOptions) {
150-
return delegate.startChild(operation, description, timestamp, instrumenter, spanOptions);
138+
@NotNull String operation, @Nullable String description, @Nullable SentryDate timestamp) {
139+
return delegate.startChild(operation, description, timestamp);
151140
}
152141

153142
@Override

‎sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/OtelTransactionSpanForwarder.java‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import io.sentry.ISentryLifecycleToken;
88
import io.sentry.ISpan;
99
import io.sentry.ITransaction;
10-
import io.sentry.Instrumenter;
1110
import io.sentry.MeasurementUnit;
1211
import io.sentry.SentryDate;
1312
import io.sentry.SentryTraceHeader;
@@ -57,18 +56,8 @@ public OtelTransactionSpanForwarder(final @NotNull IOtelSpanWrapper rootSpan) {
5756
@NotNull String operation,
5857
@Nullable String description,
5958
@Nullable SentryDate timestamp,
60-
@NotNull Instrumenter instrumenter) {
61-
return rootSpan.startChild(operation, description, timestamp, instrumenter);
62-
}
63-
64-
@Override
65-
public @NotNull ISpan startChild(
66-
@NotNull String operation,
67-
@Nullable String description,
68-
@Nullable SentryDate timestamp,
69-
@NotNull Instrumenter instrumenter,
7059
@NotNull SpanOptions spanOptions) {
71-
return rootSpan.startChild(operation, description, timestamp, instrumenter, spanOptions);
60+
return rootSpan.startChild(operation, description, timestamp, spanOptions);
7261
}
7362

7463
@Override
@@ -224,7 +213,7 @@ public boolean isNoOp() {
224213
@Override
225214
public @NotNull ISpan startChild(
226215
@NotNull String operation, @Nullable String description, @Nullable SentryDate timestamp) {
227-
return rootSpan.startChild(operation, description, timestamp, Instrumenter.SENTRY);
216+
return rootSpan.startChild(operation, description, timestamp);
228217
}
229218

230219
@Override

‎sentry-opentelemetry/sentry-opentelemetry-core/api/sentry-opentelemetry-core.api‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@ public final class io/sentry/opentelemetry/OtelSpanWrapper : io/sentry/opentelem
9494
public fun startChild (Ljava/lang/String;)Lio/sentry/ISpan;
9595
public fun startChild (Ljava/lang/String;Ljava/lang/String;)Lio/sentry/ISpan;
9696
public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;)Lio/sentry/ISpan;
97-
public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;Lio/sentry/Instrumenter;)Lio/sentry/ISpan;
98-
public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;Lio/sentry/Instrumenter;Lio/sentry/SpanOptions;)Lio/sentry/ISpan;
97+
public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;Lio/sentry/SpanOptions;)Lio/sentry/ISpan;
9998
public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SpanOptions;)Lio/sentry/ISpan;
10099
public fun storeInContext (Lio/opentelemetry/context/Context;)Lio/opentelemetry/context/Context;
101100
public fun toBaggageHeader (Ljava/util/List;)Lio/sentry/BaggageHeader;

0 commit comments

Comments
 (0)