Skip to content

Commit 323a463

Browse files
authored
Annotate deprecated APIs/Methods (#1157)
* added initial annotations * spotless apply template * clean up spotless formatting * reformat comment, fix accidental code change * undeprecatesplunkrumbuilder
1 parent 0a3fe6e commit 323a463

File tree

7 files changed

+82
-6
lines changed

7 files changed

+82
-6
lines changed

Diff for: splunk-otel-android-volley/src/main/java/com/splunk/rum/VolleyTracing.java

+43-5
Original file line numberDiff line numberDiff line change
@@ -22,54 +22,92 @@
2222
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
2323
import javax.net.ssl.SSLSocketFactory;
2424

25-
/** Entrypoint for tracing Volley clients. */
25+
/**
26+
* Entrypoint for tracing Volley clients.
27+
*
28+
* @deprecated This API is deprecated and will be removed in a future release.
29+
*/
30+
@Deprecated
2631
public final class VolleyTracing {
2732

28-
/** Returns a new {@link VolleyTracing} configured with the given {@link SplunkRum}. */
33+
/**
34+
* Returns a new {@link VolleyTracing} configured with the given {@link SplunkRum}.
35+
*
36+
* @deprecated This method is deprecated and will be removed in a future release.
37+
*/
38+
@Deprecated
2939
public static VolleyTracing create(SplunkRum splunkRum) {
3040
return create(splunkRum.getOpenTelemetry());
3141
}
3242

33-
/** Returns a new {@link VolleyTracing} configured with the given {@link OpenTelemetry}. */
43+
/**
44+
* Returns a new {@link VolleyTracing} configured with the given {@link OpenTelemetry}.
45+
*
46+
* @deprecated This method is deprecated and will be removed in a future release.
47+
*/
48+
@Deprecated
3449
public static VolleyTracing create(OpenTelemetry openTelemetry) {
3550
return builder(openTelemetry).build();
3651
}
3752

38-
/** Returns a new {@link VolleyTracingBuilder} configured with the given {@link SplunkRum}. */
53+
/**
54+
* Returns a new {@link VolleyTracingBuilder} configured with the given {@link SplunkRum}.
55+
*
56+
* @deprecated This method is deprecated and will be removed in a future release.
57+
*/
58+
@Deprecated
3959
public static VolleyTracingBuilder builder(SplunkRum splunkRum) {
4060
return new VolleyTracingBuilder(splunkRum.getOpenTelemetry());
4161
}
4262

4363
/**
4464
* Returns a new {@link VolleyTracingBuilder} configured with the given {@link OpenTelemetry}.
65+
*
66+
* @deprecated This method is deprecated and will be removed in a future release.
4567
*/
68+
@Deprecated
4669
public static VolleyTracingBuilder builder(OpenTelemetry openTelemetry) {
4770
return new VolleyTracingBuilder(openTelemetry);
4871
}
4972

5073
private final Instrumenter<RequestWrapper, HttpResponse> instrumenter;
5174

75+
/**
76+
* @deprecated This method is deprecated and will be removed in a future release.
77+
*/
78+
@Deprecated
5279
VolleyTracing(Instrumenter<RequestWrapper, HttpResponse> instrumenter) {
5380
this.instrumenter = instrumenter;
5481
}
5582

56-
/** Returns a new {@link HurlStack} capable of tracing requests. */
83+
/**
84+
* Returns a new {@link HurlStack} capable of tracing requests.
85+
*
86+
* @deprecated This method is deprecated and will be removed in a future release.
87+
*/
88+
@Deprecated
5789
public HurlStack newHurlStack() {
5890
return new TracingHurlStack(instrumenter);
5991
}
6092

6193
/**
6294
* Returns a new {@link HurlStack} capable of tracing requests configured with given {@link
6395
* HurlStack.UrlRewriter}.
96+
*
97+
* @deprecated This method is deprecated and will be removed in a future release.
6498
*/
99+
@Deprecated
65100
public HurlStack newHurlStack(HurlStack.UrlRewriter urlRewriter) {
66101
return new TracingHurlStack(instrumenter, urlRewriter);
67102
}
68103

69104
/**
70105
* Returns a new {@link HurlStack} capable of tracing requests configured with given {@link
71106
* HurlStack.UrlRewriter} and {@link SSLSocketFactory}.
107+
*
108+
* @deprecated This method is deprecated and will be removed in a future release.
72109
*/
110+
@Deprecated
73111
public HurlStack newHurlStack(
74112
HurlStack.UrlRewriter urlRewriter, SSLSocketFactory sslSocketFactory) {
75113
return new TracingHurlStack(instrumenter, urlRewriter, sslSocketFactory);

Diff for: splunk-otel-android-volley/src/main/java/com/splunk/rum/VolleyTracingBuilder.java

+17-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@
2929
import java.util.ArrayList;
3030
import java.util.List;
3131

32-
/** A builder for {@link VolleyTracing}. */
32+
/**
33+
* A builder for {@link VolleyTracing}.
34+
*
35+
* @deprecated This API is deprecated and will be removed in a future release.
36+
*/
37+
@Deprecated
3338
public final class VolleyTracingBuilder {
3439

3540
private static final String INSTRUMENTATION_NAME = "com.splunk.android.volley";
@@ -42,14 +47,18 @@ public final class VolleyTracingBuilder {
4247
HttpClientAttributesExtractor.builder(
4348
VolleyHttpClientAttributesGetter.INSTANCE);
4449

50+
@Deprecated
4551
VolleyTracingBuilder(OpenTelemetry openTelemetry) {
4652
this.openTelemetry = openTelemetry;
4753
}
4854

4955
/**
5056
* Adds an additional {@link AttributesExtractor} to invoke to set attributes to instrumented
5157
* items.
58+
*
59+
* @deprecated This method is deprecated and will be removed in a future release
5260
*/
61+
@Deprecated
5362
public VolleyTracingBuilder addAttributesExtractor(
5463
AttributesExtractor<RequestWrapper, HttpResponse> attributesExtractor) {
5564
additionalExtractors.add(attributesExtractor);
@@ -60,7 +69,9 @@ public VolleyTracingBuilder addAttributesExtractor(
6069
* Configures the HTTP request headers that will be captured as span attributes.
6170
*
6271
* @param requestHeaders A list of HTTP header names.
72+
* @deprecated This method is deprecated and will be removed in a future release
6373
*/
74+
@Deprecated
6475
public VolleyTracingBuilder setCapturedRequestHeaders(List<String> requestHeaders) {
6576
this.httpClientAttributesExtractorBuilder.setCapturedRequestHeaders(requestHeaders);
6677
return this;
@@ -70,15 +81,20 @@ public VolleyTracingBuilder setCapturedRequestHeaders(List<String> requestHeader
7081
* Configures the HTTP response headers that will be captured as span attributes.
7182
*
7283
* @param responseHeaders A list of HTTP header names.
84+
* @deprecated This method is deprecated and will be removed in a future release
7385
*/
86+
@Deprecated
7487
public VolleyTracingBuilder setCapturedResponseHeaders(List<String> responseHeaders) {
7588
this.httpClientAttributesExtractorBuilder.setCapturedResponseHeaders(responseHeaders);
7689
return this;
7790
}
7891

7992
/**
8093
* Returns a new {@link VolleyTracing} with the settings of this {@link VolleyTracingBuilder}.
94+
*
95+
* @deprecated This method is deprecated and will be removed in a future release
8196
*/
97+
@Deprecated
8298
public VolleyTracing build() {
8399
VolleyHttpClientAttributesGetter httpAttributesGetter =
84100
VolleyHttpClientAttributesGetter.INSTANCE;

Diff for: splunk-otel-android/src/main/java/com/splunk/rum/NoOpSplunkRum.java

+3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ private NoOpSplunkRum() {
3636
}
3737

3838
@Override
39+
@Deprecated
3940
public Call.Factory createRumOkHttpCallFactory(OkHttpClient client) {
4041
return client;
4142
}
@@ -81,11 +82,13 @@ void flushSpans() {
8182
}
8283

8384
@Override
85+
@Deprecated
8486
public void experimentalSetScreenName(String screenName) {
8587
// no-op
8688
}
8789

8890
@Override
91+
@Deprecated
8992
public void experimentalSetScreenName(String screenName, String spanType) {
9093
// no-op
9194
}

Diff for: splunk-otel-android/src/main/java/com/splunk/rum/RumScreenName.java

+3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,12 @@
2525
* This annotation can be used to customize the {@code screen.name} attribute for an instrumented
2626
* Fragment or Activity. @Deprecated RumScreenName moved to
2727
* io.opentelemetry.rum.internal.instrumentation package
28+
*
29+
* @deprecated This interface is deprecated and will be removed in a future release
2830
*/
2931
@Retention(RetentionPolicy.RUNTIME)
3032
@Target(ElementType.TYPE)
33+
@Deprecated
3134
public @interface RumScreenName {
3235
/** Return the customized screen name. */
3336
String value();

Diff for: splunk-otel-android/src/main/java/com/splunk/rum/SplunkRum.java

+8
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,9 @@ static SplunkRum initialize(SplunkRumBuilder builder, Application application) {
126126
*
127127
* @param screenName Name of the new screen or null when exiting explicit UI navigation mode.
128128
* @param spanType "Created", "Restarted", or "Resumed"
129+
* @deprecated This method is deprecated and will be removed in a future release
129130
*/
131+
@Deprecated
130132
public void experimentalSetScreenName(String screenName, String spanType) {
131133
screenAttributesAppender.setScreenName(screenName);
132134

@@ -140,7 +142,9 @@ public void experimentalSetScreenName(String screenName, String spanType) {
140142
* Starts a "Created" UI navigation span and remembers the last screen name.
141143
*
142144
* @param screenName Name of the new screen or null when exiting explicit UI navigation mode.
145+
* @deprecated This method is deprecated and will be removed in a future release
143146
*/
147+
@Deprecated
144148
public void experimentalSetScreenName(String screenName) {
145149
experimentalSetScreenName(screenName, "Created");
146150
}
@@ -177,7 +181,9 @@ public static SplunkRum noop() {
177181
*
178182
* @param client The {@link OkHttpClient} to wrap with OpenTelemetry and RUM instrumentation.
179183
* @return A {@link okhttp3.Call.Factory} implementation.
184+
* @deprecated This method is deprecated and will be removed in a future release
180185
*/
186+
@Deprecated
181187
public Call.Factory createRumOkHttpCallFactory(OkHttpClient client) {
182188
return createOkHttpTracing().newCallFactory(client);
183189
}
@@ -339,7 +345,9 @@ public void integrateWithBrowserRum(WebView webView) {
339345
* LocationListener} or {@code LocationCallback}.
340346
*
341347
* @param location the current location. Passing {@code null} removes the location data.
348+
* @deprecated This method is deprecated and will be removed in a future release
342349
*/
350+
@Deprecated
343351
public void updateLocation(@Nullable Location location) {
344352
if (location == null) {
345353
updateGlobalAttributes(

Diff for: splunk-otel-android/src/main/java/com/splunk/rum/SplunkRumBuilder.java

+6
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@ public SplunkRumBuilder setBeaconEndpoint(String beaconEndpoint) {
9191
* @param customizer that can make changes to the OkHttpSender.Builder
9292
* @return {@code this}
9393
* @since 1.4.0
94+
* @deprecated This method is deprecated and will be removed in a future release
9495
*/
96+
@Deprecated
9597
public SplunkRumBuilder setHttpSenderCustomizer(HttpSenderCustomizer customizer) {
9698
this.httpSenderCustomizer = customizer;
9799
return this;
@@ -173,7 +175,9 @@ public SplunkRumBuilder enableDiskBuffering() {
173175
* <p>This feature is disabled by default. You can enable it by calling this method.
174176
*
175177
* @return {@code this}
178+
* @deprecated This method is deprecated and will be removed in a future release
176179
*/
180+
@Deprecated
177181
public SplunkRumBuilder enableReactNativeSupport() {
178182
configFlags.enableReactNativeSupport();
179183
return this;
@@ -379,7 +383,9 @@ public SplunkRumBuilder enableBackgroundInstrumentationDeferredUntilForeground()
379383
* Enables experimental support for exporting via OTLP instead of Zipkin.
380384
*
381385
* @return {@code this}
386+
* @deprecated This method is deprecated and will be removed in a future release
382387
*/
388+
@Deprecated
383389
public SplunkRumBuilder enableExperimentalOtlpExporter() {
384390
if (isDiskBufferingEnabled()) {
385391
Log.w(SplunkRum.LOG_TAG, "OTLP export is not yet compatible with disk buffering!");

Diff for: splunk-otel-android/src/main/java/com/splunk/rum/incubating/HttpSenderCustomizer.java

+2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@
2323
* yet stable and its APIs are subject to change at any time.
2424
*
2525
* @since 1.4.0
26+
* @deprecated This API is deprecated and will be removed in a future release.
2627
*/
2728
public interface HttpSenderCustomizer {
2829

2930
HttpSenderCustomizer DEFAULT = x -> {};
3031

32+
@Deprecated
3133
void customize(OkHttpSender.Builder builder);
3234
}

0 commit comments

Comments
 (0)