Skip to content

Commit 0e1e4cd

Browse files
committed
Obsoloteing sanitize methods in this classes and updating tests accordingly
1 parent a807df2 commit 0e1e4cd

File tree

15 files changed

+43
-24
lines changed

15 files changed

+43
-24
lines changed

core/src/main/java/com/microsoft/applicationinsights/telemetry/BaseTelemetry.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.microsoft.applicationinsights.internal.schemav2.Envelope;
3333
import com.microsoft.applicationinsights.internal.util.LocalStringsUtils;
3434
import com.microsoft.applicationinsights.internal.util.Sanitizer;
35+
import org.apache.http.annotation.Obsolete;
3536
import sun.reflect.generics.reflectiveObjects.NotImplementedException;
3637

3738
/**
@@ -125,6 +126,7 @@ public Map<String, String> getProperties() {
125126
* Makes sure the data to send is sanitized from bad chars, proper length etc.
126127
*/
127128
@Override
129+
@Obsolete
128130
public void sanitize() {
129131
Sanitizer.sanitizeProperties(this.getProperties());
130132
additionalSanitize();
@@ -162,6 +164,7 @@ public void reset() {
162164
/**
163165
* Concrete classes should implement this method
164166
*/
167+
@Obsolete
165168
protected abstract void additionalSanitize();
166169

167170
/**

core/src/main/java/com/microsoft/applicationinsights/telemetry/EventTelemetry.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
import com.google.common.base.Strings;
3030
import com.microsoft.applicationinsights.internal.util.Sanitizer;
31+
import org.apache.http.annotation.Obsolete;
3132

3233
/**
3334
* Telemetry type used to track custom events in Azure Application Insights.
@@ -102,6 +103,7 @@ public void setName(String name) {
102103
* Sanitize name and metrics.
103104
*/
104105
@Override
106+
@Obsolete
105107
protected void additionalSanitize() {
106108
data.setName(Sanitizer.sanitizeName(data.getName()));
107109
Sanitizer.sanitizeMeasurements(this.getMetrics());

core/src/main/java/com/microsoft/applicationinsights/telemetry/ExceptionTelemetry.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ public void setSamplingPercentage(Double samplingPercentage) {
140140
this.samplingPercentage = samplingPercentage;
141141
}
142142

143+
@Obsolete
143144
@Override
144145
protected void additionalSanitize() {
145146
Sanitizer.sanitizeMeasurements(this.getMetrics());

core/src/main/java/com/microsoft/applicationinsights/telemetry/MetricTelemetry.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
import com.google.common.base.Strings;
3030
import com.microsoft.applicationinsights.internal.util.Sanitizer;
31+
import org.apache.http.annotation.Obsolete;
3132

3233
/**
3334
* Telemetry type used to track metrics sent to Azure Application Insights.
@@ -176,6 +177,7 @@ public void setStandardDeviation(Double value) {
176177
metric.setStdDev(value); updateKind();
177178
}
178179

180+
@Obsolete
179181
@Override
180182
protected void additionalSanitize() {
181183
metric.setName(Sanitizer.sanitizeName(metric.getName()));

core/src/main/java/com/microsoft/applicationinsights/telemetry/PageViewTelemetry.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import com.microsoft.applicationinsights.internal.schemav2.PageViewData;
2828
import com.microsoft.applicationinsights.internal.util.Sanitizer;
29+
import org.apache.http.annotation.Obsolete;
2930

3031
/**
3132
* Telemetry type used to track page views.
@@ -137,6 +138,7 @@ public void setSamplingPercentage(Double samplingPercentage) {
137138
}
138139

139140
@Override
141+
@Obsolete
140142
protected void additionalSanitize() {
141143
data.setName(Sanitizer.sanitizeName(data.getName()));
142144
Sanitizer.sanitizeMeasurements(this.getMetrics());

core/src/main/java/com/microsoft/applicationinsights/telemetry/PerformanceCounterTelemetry.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
import com.google.common.base.Preconditions;
2727
import com.google.common.base.Strings;
28+
import org.apache.http.annotation.Obsolete;
2829

2930
/**
3031
* The class that represents information about performance counters.
@@ -134,6 +135,7 @@ public double getValue() {
134135
}
135136

136137
@Override
138+
@Obsolete
137139
protected void additionalSanitize() {
138140

139141
}

core/src/main/java/com/microsoft/applicationinsights/telemetry/RemoteDependencyTelemetry.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ public void setSamplingPercentage(Double samplingPercentage) {
310310
}
311311

312312
@Override
313+
@Obsolete
313314
protected void additionalSanitize() {
314315
data.setName(Sanitizer.sanitizeName(data.getName()));
315316
}

core/src/main/java/com/microsoft/applicationinsights/telemetry/RequestTelemetry.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ public void setSamplingPercentage(Double samplingPercentage) {
272272
}
273273

274274
@Override
275+
@Obsolete
275276
protected void additionalSanitize() {
276277
data.setName(Sanitizer.sanitizeName(data.getName()));
277278
data.setId(Sanitizer.sanitizeName(data.getId()));

core/src/main/java/com/microsoft/applicationinsights/telemetry/SessionStateTelemetry.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.concurrent.ConcurrentHashMap;
2525

2626
import com.microsoft.applicationinsights.internal.schemav2.SessionStateData;
27+
import org.apache.http.annotation.Obsolete;
2728

2829
/**
2930
* Telemetry type used to track user sessions in Azure Application Insights.
@@ -75,6 +76,7 @@ public void setSessionState(SessionState sessionState) {
7576
data.setState(sessionState);;
7677
}
7778

79+
@Obsolete
7880
@Override
7981
protected void additionalSanitize() {
8082
}

core/src/main/java/com/microsoft/applicationinsights/telemetry/Telemetry.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121

2222
package com.microsoft.applicationinsights.telemetry;
2323

24+
import org.apache.http.annotation.Obsolete;
25+
2426
import java.io.IOException;
2527
import java.util.Date;
2628
import java.util.Map;
@@ -76,6 +78,7 @@ public interface Telemetry extends JsonSerializable
7678
/**
7779
* Sanitizes the properties of the telemetry item based on DP constraints.
7880
*/
81+
@Obsolete
7982
void sanitize();
8083

8184
/**

0 commit comments

Comments
 (0)