Skip to content

Commit 20a8015

Browse files
trasktrask
committed
Do not set parent id when no parent
1 parent 0d79bed commit 20a8015

File tree

11 files changed

+152
-138
lines changed

11 files changed

+152
-138
lines changed

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.microsoft.applicationinsights.internal.schemav2.Data;
66
import com.microsoft.applicationinsights.internal.schemav2.Envelope;
77
import com.microsoft.applicationinsights.internal.schemav2.RemoteDependencyData;
8+
import com.microsoft.applicationinsights.internal.schemav2.RequestData;
89
import org.junit.*;
910

1011
import static org.hamcrest.Matchers.hasSize;
@@ -26,22 +27,23 @@ public void doCalcSendsRequestDataAndMetricData() {
2627
Envelope rdEnvelope = rdList.get(0);
2728
Envelope rddEnvelope = rddList.get(0);
2829

30+
RequestData rd = (RequestData) ((Data) rdEnvelope.getData()).getBaseData();
2931
RemoteDependencyData rdd = (RemoteDependencyData) ((Data) rddEnvelope.getData()).getBaseData();
3032

3133
assertEquals("Redis", rdd.getType());
3234
assertTrue(rdd.getSuccess());
3335

34-
assertSameOperationId(rdEnvelope, rddEnvelope);
36+
assertParentChild(rd, rdEnvelope, rddEnvelope);
3537
}
3638

37-
private static void assertSameOperationId(Envelope rdEnvelope, Envelope rddEnvelope) {
39+
private static void assertParentChild(RequestData rd, Envelope rdEnvelope, Envelope childEnvelope) {
3840
String operationId = rdEnvelope.getTags().get("ai.operation.id");
39-
String operationParentId = rdEnvelope.getTags().get("ai.operation.parentId");
40-
4141
assertNotNull(operationId);
42-
assertNotNull(operationParentId);
42+
assertEquals(operationId, childEnvelope.getTags().get("ai.operation.id"));
43+
44+
String operationParentId = rdEnvelope.getTags().get("ai.operation.parentId");
45+
assertNull(operationParentId);
4346

44-
assertEquals(operationId, rddEnvelope.getTags().get("ai.operation.id"));
45-
assertEquals(operationParentId, rddEnvelope.getTags().get("ai.operation.parentId"));
47+
assertEquals(rd.getId(), childEnvelope.getTags().get("ai.operation.parentId"));
4648
}
4749
}

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

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public void trackDependency() throws Exception {
5353
Envelope rdEnvelope = rdList.get(0);
5454
Envelope rddEnvelope = rddList.get(0);
5555

56+
RequestData rd = (RequestData) ((Data) rdEnvelope.getData()).getBaseData();
5657
RemoteDependencyData rdd = (RemoteDependencyData) ((Data) rddEnvelope.getData()).getBaseData();
5758

5859
final String expectedName = "DependencyTest";
@@ -63,7 +64,7 @@ public void trackDependency() throws Exception {
6364
assertEquals(expectedData, rdd.getData());
6465
assertEquals(expectedDuration, rdd.getDuration());
6566

66-
assertSameOperationId(rdEnvelope, rddEnvelope);
67+
assertParentChild(rd, rdEnvelope, rddEnvelope);
6768
}
6869

6970
@Test
@@ -76,6 +77,8 @@ public void testTrackEvent() throws Exception {
7677
Envelope edEnvelope1 = edList.get(0);
7778
Envelope edEnvelope2 = edList.get(1);
7879

80+
RequestData rd = (RequestData) ((Data) rdEnvelope.getData()).getBaseData();
81+
7982
List<EventData> events = mockedIngestion.getTelemetryDataByType("EventData");
8083
events.sort(new Comparator<EventData>() {
8184
@Override
@@ -93,8 +96,8 @@ public int compare(EventData o1, EventData o2) {
9396

9497
assertEquals("EventDataTest", ed2.getName());
9598

96-
assertSameOperationId(rdEnvelope, edEnvelope1);
97-
assertSameOperationId(rdEnvelope, edEnvelope2);
99+
assertParentChild(rd, rdEnvelope, edEnvelope1);
100+
assertParentChild(rd, rdEnvelope, edEnvelope2);
98101
}
99102

100103
@Test
@@ -108,6 +111,8 @@ public void testTrackException() throws Exception {
108111
Envelope edEnvelope2 = edList.get(1);
109112
Envelope edEnvelope3 = edList.get(2);
110113

114+
RequestData rd = (RequestData) ((Data) rdEnvelope.getData()).getBaseData();
115+
111116
final String expectedName = "This is track exception.";
112117
final String expectedProperties = "value";
113118
final Double expectedMetrice = 1d;
@@ -123,9 +128,9 @@ public void testTrackException() throws Exception {
123128
hasSeverityLevel(SeverityLevel.Error)
124129
)));
125130

126-
assertSameOperationId(rdEnvelope, edEnvelope1);
127-
assertSameOperationId(rdEnvelope, edEnvelope2);
128-
assertSameOperationId(rdEnvelope, edEnvelope3);
131+
assertParentChild(rd, rdEnvelope, edEnvelope1);
132+
assertParentChild(rd, rdEnvelope, edEnvelope2);
133+
assertParentChild(rd, rdEnvelope, edEnvelope3);
129134
}
130135

131136
@Test
@@ -179,6 +184,7 @@ public void trackMetric() throws Exception {
179184
Envelope rdEnvelope = rdList.get(0);
180185
Envelope mdEnvelope = mdList.get(0);
181186

187+
RequestData rd = (RequestData) ((Data) rdEnvelope.getData()).getBaseData();
182188
MetricData md = (MetricData) ((Data) mdEnvelope.getData()).getBaseData();
183189

184190
List<DataPoint> metrics = md.getMetrics();
@@ -196,7 +202,7 @@ public void trackMetric() throws Exception {
196202
assertNull("getMax was non-null", dp.getMax());
197203
assertNull("getStdDev was non-null", dp.getStdDev());
198204

199-
assertSameOperationId(rdEnvelope, mdEnvelope);
205+
assertParentChild(rd, rdEnvelope, mdEnvelope);
200206
}
201207

202208
@Test
@@ -210,6 +216,8 @@ public void testTrackTrace() throws Exception {
210216
Envelope mdEnvelope2 = mdList.get(1);
211217
Envelope mdEnvelope3 = mdList.get(2);
212218

219+
RequestData rd = (RequestData) ((Data) rdEnvelope.getData()).getBaseData();
220+
213221
final List<MessageData> messages = mockedIngestion.getTelemetryDataByType("MessageData");
214222
assertThat(messages, hasItem(
215223
TraceDataMatchers.hasMessage("This is first trace message.")
@@ -226,9 +234,9 @@ public void testTrackTrace() throws Exception {
226234
TraceDataMatchers.hasProperty("key", "value")
227235
)));
228236

229-
assertSameOperationId(rdEnvelope, mdEnvelope1);
230-
assertSameOperationId(rdEnvelope, mdEnvelope2);
231-
assertSameOperationId(rdEnvelope, mdEnvelope3);
237+
assertParentChild(rd, rdEnvelope, mdEnvelope1);
238+
assertParentChild(rd, rdEnvelope, mdEnvelope2);
239+
assertParentChild(rd, rdEnvelope, mdEnvelope3);
232240
}
233241

234242
@Test
@@ -241,6 +249,8 @@ public void testTrackPageView() throws Exception {
241249
Envelope pvdEnvelope1 = pvdList.get(0);
242250
Envelope pvdEnvelope2 = pvdList.get(1);
243251

252+
RequestData rd = (RequestData) ((Data) rdEnvelope.getData()).getBaseData();
253+
244254
final List<Domain> pageViews = mockedIngestion.getTelemetryDataByType("PageViewData");
245255
assertThat(pageViews, hasItem(allOf(
246256
PageViewDataMatchers.hasName("test-page"),
@@ -253,8 +263,8 @@ public void testTrackPageView() throws Exception {
253263
PageViewDataMatchers.hasProperty("key", "value")
254264
)));
255265

256-
assertSameOperationId(rdEnvelope, pvdEnvelope1);
257-
assertSameOperationId(rdEnvelope, pvdEnvelope2);
266+
assertParentChild(rd, rdEnvelope, pvdEnvelope1);
267+
assertParentChild(rd, rdEnvelope, pvdEnvelope2);
258268
}
259269

260270
@Test
@@ -266,11 +276,13 @@ public void testTrackPageView_JSP() throws Exception {
266276
Envelope rdEnvelope = rdList.get(0);
267277
Envelope pvdEnvelope = pvdList.get(0);
268278

279+
RequestData rd = (RequestData) ((Data) rdEnvelope.getData()).getBaseData();
280+
269281
PageViewData pv = (PageViewData) ((Data) pvdEnvelope.getData()).getBaseData();
270282
assertEquals("doPageView", pv.getName());
271283
assertEquals(new Duration(0), pv.getDuration());
272284

273-
assertSameOperationId(rdEnvelope, pvdEnvelope);
285+
assertParentChild(rd, rdEnvelope, pvdEnvelope);
274286
}
275287

276288
@Test
@@ -284,8 +296,6 @@ public void testAutoFailedRequestWithResultCode() throws Exception {
284296

285297
assertEquals(false, rd.getSuccess());
286298
assertEquals("404", rd.getResponseCode());
287-
288-
assertSameOperationId(rdEnvelope, rdEnvelope);
289299
}
290300

291301
@Test
@@ -346,18 +356,16 @@ private void validateSlowTest(int expectedDurationSeconds) throws Exception {
346356

347357
System.out.printf("Slow response time: expected=%d, actual=%d%n", expected, actual);
348358
assertThat(actual, both(greaterThanOrEqualTo(min)).and(lessThan(max)));
349-
350-
assertSameOperationId(rdEnvelope, rdEnvelope);
351359
}
352360

353-
private static void assertSameOperationId(Envelope rdEnvelope, Envelope otherEnvelope) {
361+
private static void assertParentChild(RequestData rd, Envelope rdEnvelope, Envelope childEnvelope) {
354362
String operationId = rdEnvelope.getTags().get("ai.operation.id");
355-
String operationParentId = rdEnvelope.getTags().get("ai.operation.parentId");
356-
357363
assertNotNull(operationId);
358-
assertNotNull(operationParentId);
364+
assertEquals(operationId, childEnvelope.getTags().get("ai.operation.id"));
365+
366+
String operationParentId = rdEnvelope.getTags().get("ai.operation.parentId");
367+
assertNull(operationParentId);
359368

360-
assertEquals(operationId, otherEnvelope.getTags().get("ai.operation.id"));
361-
assertEquals(operationParentId, otherEnvelope.getTags().get("ai.operation.parentId"));
369+
assertEquals(rd.getId(), childEnvelope.getTags().get("ai.operation.parentId"));
362370
}
363371
}

‎test/smoke/testApps/CustomInstrumentation/src/smokeTest/java/com/microsoft/applicationinsights/smoketestapp/CustomInstrumentationTest.java‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
import com.microsoft.applicationinsights.smoketest.UseAgent;
1414
import org.junit.Test;
1515

16-
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertNotNull;
18-
import static org.junit.Assert.assertTrue;
16+
import static org.junit.Assert.*;
1917

2018
@UseAgent("CustomInstrumentation")
2119
public class CustomInstrumentationTest extends AiSmokeTest {
@@ -37,7 +35,7 @@ public void customInstrumentationOne() throws Exception {
3735
assertEquals(rdd.getType(), "OTHER");
3836
assertEquals(rdd.getSuccess(), true);
3937

40-
assertSameOperationId(rdEnvelope, rddEnvelope);
38+
assertParentChild(rd, rdEnvelope, rddEnvelope);
4139
}
4240

4341
@Test
@@ -57,7 +55,7 @@ public void customInstrumentationTwo() throws Exception {
5755
assertEquals(rdd.getType(), "OTHER");
5856
assertEquals(rdd.getSuccess(), true);
5957

60-
assertSameOperationId(rdEnvelope, rddEnvelope);
58+
assertParentChild(rd, rdEnvelope, rddEnvelope);
6159
}
6260

6361
@Test
@@ -84,8 +82,8 @@ public void customInstrumentationThree() throws Exception {
8482
assertEquals(exceptions.size(), 1);
8583
assertEquals(exceptions.get(0).getMessage(), "Three");
8684

87-
assertSameOperationId(rdEnvelope, rddEnvelope);
88-
assertSameOperationId(edEnvelope, rddEnvelope);
85+
assertParentChild(rd, rdEnvelope, rddEnvelope);
86+
assertParentChild(rd, rdEnvelope, edEnvelope);
8987
}
9088

9189
@Test
@@ -105,7 +103,7 @@ public void customInstrumentationFour() throws Exception {
105103
assertEquals(rdd.getType(), "OTHER");
106104
assertEquals(rdd.getSuccess(), true);
107105

108-
assertSameOperationId(rdEnvelope, rddEnvelope);
106+
assertParentChild(rd, rdEnvelope, rddEnvelope);
109107
}
110108

111109
@Test
@@ -150,25 +148,25 @@ public void customInstrumentationFive() throws Exception {
150148
assertEquals(fiveRdd.getName(), "com/microsoft/applicationinsights/smoketestapp/TargetObject.five");
151149
assertEquals(fiveRdd.getType(), "OTHER");
152150
assertEquals(fiveRdd.getSuccess(), true);
153-
assertSameOperationId(rdEnvelope, fiveEnvelope);
151+
assertParentChild(rd, rdEnvelope, fiveEnvelope);
154152

155153
assertNotNull(sixRdd);
156154
assertEquals(sixRdd.getName(), "com/microsoft/applicationinsights/smoketestapp/TargetObject.six");
157155
assertEquals(sixRdd.getType(), "OTHER");
158156
assertEquals(sixRdd.getSuccess(), true);
159-
assertSameOperationId(rdEnvelope, sixEnvelope);
157+
assertParentChild(rd, rdEnvelope, sixEnvelope);
160158

161159
assertNotNull(oneRdd);
162160
assertEquals(oneRdd.getName(), "com/microsoft/applicationinsights/smoketestapp/TargetObject.one");
163161
assertEquals(oneRdd.getType(), "OTHER");
164162
assertEquals(oneRdd.getSuccess(), true);
165-
assertSameOperationId(rdEnvelope, oneEnvelope);
163+
assertParentChild(rd, rdEnvelope, oneEnvelope);
166164

167165
assertNotNull(twoRdd);
168166
assertEquals(twoRdd.getName(), "com/microsoft/applicationinsights/smoketestapp/TargetObject.two");
169167
assertEquals(twoRdd.getType(), "OTHER");
170168
assertEquals(twoRdd.getSuccess(), true);
171-
assertSameOperationId(rdEnvelope, twoEnvelope);
169+
assertParentChild(rd, rdEnvelope, twoEnvelope);
172170
}
173171

174172
@Test
@@ -187,7 +185,7 @@ public void customInstrumentationSeven() throws Exception {
187185
assertEquals(rdd.getName(), "com/microsoft/applicationinsights/smoketestapp/TargetObject.seven");
188186
assertEquals(rdd.getType(), "OTHER");
189187
assertEquals(rdd.getSuccess(), true);
190-
assertSameOperationId(rdEnvelope, rddEnvelope);
188+
assertParentChild(rd, rdEnvelope, rddEnvelope);
191189
}
192190

193191
@Test
@@ -209,12 +207,12 @@ public void customInstrumentationEight() throws Exception {
209207
assertEquals(rdd1.getName(), "com/microsoft/applicationinsights/smoketestapp/TargetObject.eight");
210208
assertEquals(rdd1.getType(), "OTHER");
211209
assertEquals(rdd1.getSuccess(), true);
212-
assertSameOperationId(rdEnvelope, rddEnvelope1);
210+
assertParentChild(rd, rdEnvelope, rddEnvelope1);
213211

214212
assertEquals(rdd2.getName(), "com/microsoft/applicationinsights/smoketestapp/TargetObject.eight");
215213
assertEquals(rdd2.getType(), "OTHER");
216214
assertEquals(rdd2.getSuccess(), true);
217-
assertSameOperationId(rdEnvelope, rddEnvelope2);
215+
assertParentChild(rd, rdEnvelope, rddEnvelope2);
218216
}
219217

220218
@Test
@@ -249,20 +247,20 @@ public void customInstrumentationNine() throws Exception {
249247
assertEquals(nineRdd.getName(), "com/microsoft/applicationinsights/smoketestapp/TargetObject.nine");
250248
assertEquals(nineRdd.getType(), "OTHER");
251249
assertEquals(nineRdd.getSuccess(), true);
252-
assertSameOperationId(rdEnvelope, nineEnvelope);
250+
assertParentChild(rd, rdEnvelope, nineEnvelope);
253251

254252
assertNotNull(httpRdd);
255-
assertSameOperationId(rdEnvelope, httpEnvelope);
253+
assertParentChild(rd, rdEnvelope, httpEnvelope);
256254
}
257255

258-
private static void assertSameOperationId(Envelope rdEnvelope, Envelope rddEnvelope) {
256+
private static void assertParentChild(RequestData rd, Envelope rdEnvelope, Envelope childEnvelope) {
259257
String operationId = rdEnvelope.getTags().get("ai.operation.id");
260-
String operationParentId = rdEnvelope.getTags().get("ai.operation.parentId");
261-
262258
assertNotNull(operationId);
263-
assertNotNull(operationParentId);
259+
assertEquals(operationId, childEnvelope.getTags().get("ai.operation.id"));
260+
261+
String operationParentId = rdEnvelope.getTags().get("ai.operation.parentId");
262+
assertNull(operationParentId);
264263

265-
assertEquals(operationId, rddEnvelope.getTags().get("ai.operation.id"));
266-
assertEquals(operationParentId, rddEnvelope.getTags().get("ai.operation.parentId"));
264+
assertEquals(rd.getId(), childEnvelope.getTags().get("ai.operation.parentId"));
267265
}
268266
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,14 @@ public void testAsyncDependencyCallWithHttpURLConnection() throws Exception {
124124
assertParentChild(rd, rdEnvelope, rddEnvelope);
125125
}
126126

127-
private static void assertParentChild(RequestData rd, Envelope rdEnvelope, Envelope rddEnvelope) {
127+
private static void assertParentChild(RequestData rd, Envelope rdEnvelope, Envelope childEnvelope) {
128128
String operationId = rdEnvelope.getTags().get("ai.operation.id");
129-
130129
assertNotNull(operationId);
130+
assertEquals(operationId, childEnvelope.getTags().get("ai.operation.id"));
131+
132+
String operationParentId = rdEnvelope.getTags().get("ai.operation.parentId");
133+
assertNull(operationParentId);
131134

132-
assertEquals(operationId, rddEnvelope.getTags().get("ai.operation.id"));
133-
assertEquals(rd.getId(), rddEnvelope.getTags().get("ai.operation.parentId"));
135+
assertEquals(rd.getId(), childEnvelope.getTags().get("ai.operation.parentId"));
134136
}
135137
}

0 commit comments

Comments
 (0)