Skip to content

Commit 49e0854

Browse files
trasktrask
authored
Suppress redis encoding events (#1593)
1 parent b036c0c commit 49e0854

File tree

27 files changed

+58
-0
lines changed

27 files changed

+58
-0
lines changed

‎agent/exporter/src/main/java/com/microsoft/applicationinsights/agent/Exporter.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,12 @@ private static String nullAwareConcat(String str1, String str2, String separator
616616

617617
private void exportEvents(SpanData span, Double samplingPercentage) {
618618
for (EventData event : span.getEvents()) {
619+
boolean lettuce51 =
620+
span.getInstrumentationLibraryInfo().getName().equals("io.opentelemetry.javaagent.lettuce-5.1");
621+
if (lettuce51 && event.getName().startsWith("redis.encode.")) {
622+
// special case as these are noisy and come from the underlying library itself
623+
continue;
624+
}
619625
EventTelemetry telemetry = new EventTelemetry(event.getName());
620626
String operationId = span.getTraceId();
621627
telemetry.getContext().getOperation().setId(operationId);

‎test/smoke/testApps/AzureSdk/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AzureSdkDisabledTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public void test() throws Exception {
2121
Envelope rdEnvelope = rdList.get(0);
2222
String operationId = rdEnvelope.getTags().get("ai.operation.id");
2323
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
24+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
2425

2526
Envelope rddEnvelope = rddList.get(0);
2627

‎test/smoke/testApps/AzureSdk/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/AzureSdkTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public void test() throws Exception {
2121
Envelope rdEnvelope = rdList.get(0);
2222
String operationId = rdEnvelope.getTags().get("ai.operation.id");
2323
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 2, operationId);
24+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
2425

2526
Envelope rddEnvelope1 = rddList.get(0);
2627
Envelope rddEnvelope2 = rddList.get(1);

‎test/smoke/testApps/CachingCalculator/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JedisTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public void doCalcSendsRequestDataAndMetricData() throws Exception {
2323
String operationId = rdEnvelope.getTags().get("ai.operation.id");
2424

2525
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
26+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
2627

2728
Envelope rddEnvelope = rddList.get(0);
2829

‎test/smoke/testApps/Cassandra/src/smokeTest/java/com/microsoft/applicationinsights/smoketestapp/CassandraTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public void cassandra() throws Exception {
3333
String operationId = rdEnvelope.getTags().get("ai.operation.id");
3434

3535
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
36+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
3637

3738
Envelope rddEnvelope = rddList.get(0);
3839

‎test/smoke/testApps/CoreAndFilter/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/CoreAndFilterTests.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public void trackDependency() throws Exception {
5252
String operationId = rdEnvelope.getTags().get("ai.operation.id");
5353

5454
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
55+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
5556

5657
Envelope rddEnvelope = rddList.get(0);
5758

@@ -114,6 +115,7 @@ public void testTrackException() throws Exception {
114115
Envelope rdEnvelope = rdList.get(0);
115116
String operationId = rdEnvelope.getTags().get("ai.operation.id");
116117
List<Envelope> edList = mockedIngestion.waitForItemsInOperation("ExceptionData", 3, operationId);
118+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
117119

118120
Envelope edEnvelope1 = edList.get(0);
119121
Envelope edEnvelope2 = edList.get(1);
@@ -255,6 +257,7 @@ public void testTrackPageView() throws Exception {
255257
Envelope rdEnvelope = rdList.get(0);
256258
String operationId = rdEnvelope.getTags().get("ai.operation.id");
257259
List<Envelope> pvdList = mockedIngestion.waitForItemsInOperation("PageViewData", 3, operationId);
260+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
258261

259262
RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
260263

@@ -337,6 +340,7 @@ public void testTrackPageView_JSP() throws Exception {
337340
Envelope rdEnvelope = rdList.get(0);
338341
String operationId = rdEnvelope.getTags().get("ai.operation.id");
339342
List<Envelope> pvdList = mockedIngestion.waitForItemsInOperation("PageViewData", 1, operationId);
343+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
340344

341345
Envelope pvdEnvelope = pvdList.get(0);
342346

‎test/smoke/testApps/HttpClients/src/smokeTest/java/com/microsoft/applicationinsights/smoketestapp/HttpClientSmokeTest.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public void testApacheHttpClient4() throws Exception {
2424
Envelope rdEnvelope = rdList.get(0);
2525
String operationId = rdEnvelope.getTags().get("ai.operation.id");
2626
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
27+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
2728

2829
Envelope rddEnvelope = rddList.get(0);
2930

@@ -51,6 +52,7 @@ public void testApacheHttpClient4WithResponseHandler() throws Exception {
5152
Envelope rdEnvelope = rdList.get(0);
5253
String operationId = rdEnvelope.getTags().get("ai.operation.id");
5354
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
55+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
5456

5557
Envelope rddEnvelope = rddList.get(0);
5658

@@ -78,6 +80,7 @@ public void testApacheHttpClient3() throws Exception {
7880
Envelope rdEnvelope = rdList.get(0);
7981
String operationId = rdEnvelope.getTags().get("ai.operation.id");
8082
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
83+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
8184

8285
Envelope rddEnvelope = rddList.get(0);
8386

@@ -105,6 +108,7 @@ public void testApacheHttpAsyncClient() throws Exception {
105108
Envelope rdEnvelope = rdList.get(0);
106109
String operationId = rdEnvelope.getTags().get("ai.operation.id");
107110
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
111+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
108112

109113
Envelope rddEnvelope = rddList.get(0);
110114

@@ -132,6 +136,7 @@ public void testOkHttp3() throws Exception {
132136
Envelope rdEnvelope = rdList.get(0);
133137
String operationId = rdEnvelope.getTags().get("ai.operation.id");
134138
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
139+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
135140

136141
Envelope rddEnvelope = rddList.get(0);
137142

@@ -160,6 +165,7 @@ public void testOkHttp2() throws Exception {
160165
Envelope rdEnvelope = rdList.get(0);
161166
String operationId = rdEnvelope.getTags().get("ai.operation.id");
162167
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
168+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
163169

164170
Envelope rddEnvelope = rddList.get(0);
165171

@@ -187,6 +193,7 @@ public void testHttpURLConnection() throws Exception {
187193
Envelope rdEnvelope = rdList.get(0);
188194
String operationId = rdEnvelope.getTags().get("ai.operation.id");
189195
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
196+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
190197

191198
Envelope rddEnvelope = rddList.get(0);
192199

@@ -214,6 +221,7 @@ public void testSpringWebClient() throws Exception {
214221
Envelope rdEnvelope = rdList.get(0);
215222
String operationId = rdEnvelope.getTags().get("ai.operation.id");
216223
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
224+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
217225

218226
Envelope rddEnvelope = rddList.get(0);
219227

‎test/smoke/testApps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsDisabledTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ public void doMostBasicTest() throws Exception {
2222

2323
String operationId = rdEnvelope.getTags().get("ai.operation.id");
2424
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
25+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
26+
2527
Envelope rddEnvelope = rddList.get(0);
2628
RemoteDependencyData rdd = (RemoteDependencyData) ((Data<?>) rddEnvelope.getData()).getBaseData();
2729

‎test/smoke/testApps/JMS/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JmsTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public void doMostBasicTest() throws Exception {
2121
Envelope rdEnvelope1 = getRequestEnvelope(rdList, "/sendMessage");
2222
String operationId = rdEnvelope1.getTags().get("ai.operation.id");
2323
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 3, operationId);
24+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
2425

2526
Envelope rdEnvelope2 = getRequestEnvelope(rdList, "message process");
2627
Envelope rddEnvelope1 = getDependencyEnvelope(rddList, "HelloController.sendMessage");

‎test/smoke/testApps/Jdbc/src/smokeTest/java/com/microsoft/applicationinsights/smoketestapp/JdbcTest.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public void hsqldbPreparedStatement() throws Exception {
4747
String operationId = rdEnvelope.getTags().get("ai.operation.id");
4848

4949
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
50+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
5051

5152
Envelope rddEnvelope = rddList.get(0);
5253

@@ -75,6 +76,7 @@ public void hsqldbStatement() throws Exception {
7576
String operationId = rdEnvelope.getTags().get("ai.operation.id");
7677

7778
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
79+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
7880

7981
Envelope rddEnvelope = rddList.get(0);
8082

@@ -103,6 +105,7 @@ public void hsqldbLargeStatement() throws Exception {
103105
String operationId = rdEnvelope.getTags().get("ai.operation.id");
104106

105107
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
108+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
106109

107110
Envelope rddEnvelope = rddList.get(0);
108111

@@ -135,6 +138,7 @@ public void hsqldbBatchPreparedStatement() throws Exception {
135138
String operationId = rdEnvelope.getTags().get("ai.operation.id");
136139

137140
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
141+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
138142

139143
Envelope rddEnvelope = rddList.get(0);
140144

@@ -165,6 +169,7 @@ public void hsqldbBatchStatement() throws Exception {
165169
String operationId = rdEnvelope.getTags().get("ai.operation.id");
166170

167171
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
172+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
168173

169174
Envelope rddEnvelope = rddList.get(0);
170175

@@ -267,6 +272,7 @@ public void postgresPreparedStatement() throws Exception {
267272
String operationId = rdEnvelope.getTags().get("ai.operation.id");
268273

269274
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
275+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
270276

271277
Envelope rddEnvelope = rddList.get(0);
272278

@@ -295,6 +301,7 @@ public void postgresStatement() throws Exception {
295301
String operationId = rdEnvelope.getTags().get("ai.operation.id");
296302

297303
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
304+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
298305

299306
Envelope rddEnvelope = rddList.get(0);
300307

@@ -323,6 +330,7 @@ public void sqlServerPreparedStatement() throws Exception {
323330
String operationId = rdEnvelope.getTags().get("ai.operation.id");
324331

325332
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
333+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
326334

327335
Envelope rddEnvelope = rddList.get(0);
328336

@@ -350,6 +358,7 @@ public void sqlServerStatement() throws Exception {
350358
String operationId = rdEnvelope.getTags().get("ai.operation.id");
351359

352360
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
361+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
353362

354363
Envelope rddEnvelope = rddList.get(0);
355364

@@ -379,6 +388,7 @@ public void oraclePreparedStatement() throws Exception {
379388
String operationId = rdEnvelope.getTags().get("ai.operation.id");
380389

381390
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
391+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
382392

383393
Envelope rddEnvelope = rddList.get(0);
384394

@@ -408,6 +418,7 @@ public void oracleStatement() throws Exception {
408418
String operationId = rdEnvelope.getTags().get("ai.operation.id");
409419

410420
List<Envelope> rddList = mockedIngestion.waitForItemsInOperation("RemoteDependencyData", 1, operationId);
421+
assertEquals(0, mockedIngestion.getCountForType("EventData"));
411422

412423
Envelope rddEnvelope = rddList.get(0);
413424

0 commit comments

Comments
 (0)