Skip to content

Commit 6f47bd6

Browse files
Kyle-VerhoogKyle-Verhoog
authored
chore(deps): update ddtrace (#253)
bumping ddtrace bc some random tests are segfaulting and i think it's ddtrace-related.... bumping ddtrace caused some snapshots to fail and now a bunch of windows tests are failing...
1 parent 48f5162 commit 6f47bd6

10 files changed

+191
-48
lines changed

‎test_deps.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ddtrace==3.11.0
1+
ddtrace==3.15.0
22
pytest
33
riot==0.20.1
44
PyYAML==6.0.3

‎tests/conftest.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
from aiohttp.web import Response
2323
from ddsketch import LogCollapsingLowestDenseDDSketch
2424
from ddsketch.pb.proto import DDSketchProto
25+
from ddtrace import config
2526
import grpc.aio as grpc_aio
2627
import msgpack
2728
from opentelemetry.proto.collector.logs.v1.logs_service_pb2_grpc import LogsServiceStub
@@ -42,6 +43,9 @@
4243
from ddapm_test_agent.trace_snapshot import DEFAULT_SNAPSHOT_IGNORES
4344

4445

46+
# Fix the service name to make tests consistently pass local and in CI.
47+
config.service = ""
48+
4549
pytest_plugins = "aiohttp.pytest_plugin"
4650

4751

‎tests/integration_snapshots/test_multi_trace.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
"error": 0,
1111
"meta": {
1212
"_dd.p.dm": "-0",
13-
"_dd.p.tid": "65caa2a800000000",
13+
"_dd.p.tid": "68e68f4300000000",
1414
"language": "python",
15-
"runtime-id": "ce77bb0dd15e4f36aa106905fdddbc19"
15+
"runtime-id": "a17fe963cb6c4dfaaf0bbb73d29976e9"
1616
},
1717
"metrics": {
1818
"_dd.top_level": 1,
1919
"_dd.tracer_kr": 1.0,
2020
"_sampling_priority_v1": 1,
21-
"process_id": 94638
21+
"process_id": 44199
2222
},
23-
"duration": 223000,
24-
"start": 1707778728600188000
23+
"duration": 89000,
24+
"start": 1759940419298507000
2525
},
2626
{
2727
"name": "child0",
@@ -32,8 +32,8 @@
3232
"parent_id": 1,
3333
"type": "",
3434
"error": 0,
35-
"duration": 9000,
36-
"start": 1707778728600249000
35+
"duration": 14000,
36+
"start": 1759940419298570000
3737
}],
3838
[
3939
{
@@ -47,18 +47,18 @@
4747
"error": 0,
4848
"meta": {
4949
"_dd.p.dm": "-0",
50-
"_dd.p.tid": "65caa2a800000000",
50+
"_dd.p.tid": "68e68f4300000000",
5151
"language": "python",
52-
"runtime-id": "ce77bb0dd15e4f36aa106905fdddbc19"
52+
"runtime-id": "a17fe963cb6c4dfaaf0bbb73d29976e9"
5353
},
5454
"metrics": {
5555
"_dd.top_level": 1,
5656
"_dd.tracer_kr": 1.0,
5757
"_sampling_priority_v1": 1,
58-
"process_id": 94638
58+
"process_id": 44199
5959
},
60-
"duration": 136000,
61-
"start": 1707778728600778000
60+
"duration": 34000,
61+
"start": 1759940419314834000
6262
},
6363
{
6464
"name": "child1",
@@ -69,6 +69,6 @@
6969
"parent_id": 1,
7070
"type": "",
7171
"error": 0,
72-
"duration": 8000,
73-
"start": 1707778728600803000
72+
"duration": 7000,
73+
"start": 1759940419314856000
7474
}]]

‎tests/integration_snapshots/test_single_trace.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
"meta": {
1212
"_dd.base_service": "",
1313
"_dd.p.dm": "-0",
14-
"_dd.p.tid": "65caa2a600000000",
14+
"_dd.p.tid": "68e68f3d00000000",
1515
"language": "python",
16-
"runtime-id": "ce77bb0dd15e4f36aa106905fdddbc19"
16+
"runtime-id": "fed87db4f462440e8279440b11a394e4"
1717
},
1818
"metrics": {
1919
"_dd.top_level": 1,
2020
"_dd.tracer_kr": 1.0,
2121
"_sampling_priority_v1": 1,
22-
"process_id": 94638
22+
"process_id": 44128
2323
},
24-
"duration": 57000,
25-
"start": 1707778726658859000
24+
"duration": 38000,
25+
"start": 1759940413390843000
2626
}]]

‎tests/integration_snapshots/test_trace_distributed_propagated.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
"type": "",
1010
"error": 0,
1111
"meta": {
12-
"_dd.p.dm": "-3",
12+
"_dd.p.dm": "-0",
1313
"language": "python",
14-
"runtime-id": "ce77bb0dd15e4f36aa106905fdddbc19"
14+
"runtime-id": "f41a72c378a44fa19936a90858bdcf4b"
1515
},
1616
"metrics": {
1717
"_dd.top_level": 1,
1818
"_dd.tracer_kr": 1.0,
1919
"_sampling_priority_v1": 1,
20-
"process_id": 94638
20+
"process_id": 44248
2121
},
22-
"duration": 162000,
23-
"start": 1707778728991370000
22+
"duration": 49000,
23+
"start": 1759940420748099000
2424
},
2525
{
2626
"name": "child",
@@ -31,6 +31,6 @@
3131
"parent_id": 1,
3232
"type": "",
3333
"error": 0,
34-
"duration": 6000,
35-
"start": 1707778728991395000
34+
"duration": 9000,
35+
"start": 1759940420748129000
3636
}]]

‎tests/integration_snapshots/test_trace_distributed_same_payload.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
"error": 0,
1111
"meta": {
1212
"_dd.p.dm": "-0",
13-
"_dd.p.tid": "65caa2a800000000",
13+
"_dd.p.tid": "68e68f4400000000",
1414
"language": "python",
15-
"runtime-id": "ce77bb0dd15e4f36aa106905fdddbc19"
15+
"runtime-id": "4462e49f0f9b432ab62de16a0798af9f"
1616
},
1717
"metrics": {
1818
"_dd.top_level": 1,
1919
"_dd.tracer_kr": 1.0,
2020
"_sampling_priority_v1": 1,
21-
"process_id": 94638
21+
"process_id": 44234
2222
},
23-
"duration": 210000,
24-
"start": 1707778728801900000
23+
"duration": 65000,
24+
"start": 1759940420028363000
2525
},
2626
{
2727
"name": "child0",
@@ -32,8 +32,8 @@
3232
"parent_id": 1,
3333
"type": "",
3434
"error": 0,
35-
"duration": 7000,
36-
"start": 1707778728801961000
35+
"duration": 12000,
36+
"start": 1759940420028405000
3737
},
3838
{
3939
"name": "root1",
@@ -46,18 +46,18 @@
4646
"error": 0,
4747
"meta": {
4848
"_dd.p.dm": "-0",
49-
"_dd.p.tid": "65caa2a800000000",
49+
"_dd.p.tid": "68e68f4400000000",
5050
"language": "python",
51-
"runtime-id": "ce77bb0dd15e4f36aa106905fdddbc19"
51+
"runtime-id": "4462e49f0f9b432ab62de16a0798af9f"
5252
},
5353
"metrics": {
5454
"_dd.top_level": 1,
5555
"_dd.tracer_kr": 1.0,
5656
"_sampling_priority_v1": 1,
57-
"process_id": 94638
57+
"process_id": 44234
5858
},
59-
"duration": 103000,
60-
"start": 1707778728802478000
59+
"duration": 26000,
60+
"start": 1759940420042497000
6161
},
6262
{
6363
"name": "child1",
@@ -68,6 +68,6 @@
6868
"parent_id": 3,
6969
"type": "",
7070
"error": 0,
71-
"duration": 6000,
72-
"start": 1707778728802490000
71+
"duration": 7000,
72+
"start": 1759940420042512000
7373
}]]

‎tests/integration_snapshots/test_trace_missing_received.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
"error": 0,
1111
"meta": {
1212
"_dd.p.dm": "-0",
13-
"_dd.p.tid": "65caa2a900000000",
13+
"_dd.p.tid": "68e68f4500000000",
1414
"language": "python",
15-
"runtime-id": "ce77bb0dd15e4f36aa106905fdddbc19"
15+
"runtime-id": "c9fafd4ce8e5490291a720c8c8ef660b"
1616
},
1717
"metrics": {
1818
"_dd.top_level": 1,
1919
"_dd.tracer_kr": 1.0,
2020
"_sampling_priority_v1": 1,
21-
"process_id": 94638
21+
"process_id": 44278
2222
},
23-
"duration": 220000,
24-
"start": 1707778729179859000
23+
"duration": 68000,
24+
"start": 1759940421492184000
2525
},
2626
{
2727
"name": "child0",
@@ -32,6 +32,6 @@
3232
"parent_id": 1,
3333
"type": "",
3434
"error": 0,
35-
"duration": 9000,
36-
"start": 1707778729179924000
35+
"duration": 15000,
36+
"start": 1759940421492225000
3737
}]]

‎tests/integration_snapshots/test_trace_stats.json‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
[[
2+
{
3+
"name": "http.request",
4+
"service": "",
5+
"resource": "/users/view",
6+
"trace_id": 0,
7+
"span_id": 1,
8+
"parent_id": 0,
9+
"type": "",
10+
"error": 0,
11+
"meta": {
12+
"_dd.p.dm": "-3",
13+
"_dd.p.ksr": "0",
14+
"_dd.p.tid": "68e68ed400000000",
15+
"language": "python",
16+
"runtime-id": "6c0e6f7ea24a423bb099504dddd4f5e6"
17+
},
18+
"metrics": {
19+
"_dd.rule_psr": 0.0,
20+
"_dd.top_level": 1,
21+
"_dd.tracer_kr": 1.0,
22+
"_sampling_priority_v1": -1,
23+
"process_id": 43445
24+
},
25+
"duration": 23000,
26+
"start": 1759940308841385000
27+
}],
28+
[
29+
{
30+
"name": "http.request",
31+
"service": "",
32+
"resource": "/users/view",
33+
"trace_id": 1,
34+
"span_id": 1,
35+
"parent_id": 0,
36+
"type": "",
37+
"error": 0,
38+
"meta": {
39+
"_dd.p.dm": "-3",
40+
"_dd.p.ksr": "0",
41+
"_dd.p.tid": "68e68ed400000000",
42+
"language": "python",
43+
"runtime-id": "6c0e6f7ea24a423bb099504dddd4f5e6"
44+
},
45+
"metrics": {
46+
"_dd.rule_psr": 0.0,
47+
"_dd.top_level": 1,
48+
"_dd.tracer_kr": 1.0,
49+
"_sampling_priority_v1": -1,
50+
"process_id": 43445
51+
},
52+
"duration": 7000,
53+
"start": 1759940308841551000
54+
}],
55+
[
56+
{
57+
"name": "http.request",
58+
"service": "",
59+
"resource": "/users/view",
60+
"trace_id": 2,
61+
"span_id": 1,
62+
"parent_id": 0,
63+
"type": "",
64+
"error": 0,
65+
"meta": {
66+
"_dd.p.dm": "-3",
67+
"_dd.p.ksr": "0",
68+
"_dd.p.tid": "68e68ed400000000",
69+
"language": "python",
70+
"runtime-id": "6c0e6f7ea24a423bb099504dddd4f5e6"
71+
},
72+
"metrics": {
73+
"_dd.rule_psr": 0.0,
74+
"_dd.top_level": 1,
75+
"_dd.tracer_kr": 1.0,
76+
"_sampling_priority_v1": -1,
77+
"process_id": 43445
78+
},
79+
"duration": 5000,
80+
"start": 1759940308841584000
81+
}],
82+
[
83+
{
84+
"name": "http.request",
85+
"service": "",
86+
"resource": "/users/view",
87+
"trace_id": 3,
88+
"span_id": 1,
89+
"parent_id": 0,
90+
"type": "",
91+
"error": 0,
92+
"meta": {
93+
"_dd.p.dm": "-3",
94+
"_dd.p.ksr": "0",
95+
"_dd.p.tid": "68e68ed400000000",
96+
"language": "python",
97+
"runtime-id": "6c0e6f7ea24a423bb099504dddd4f5e6"
98+
},
99+
"metrics": {
100+
"_dd.rule_psr": 0.0,
101+
"_dd.top_level": 1,
102+
"_dd.tracer_kr": 1.0,
103+
"_sampling_priority_v1": -1,
104+
"process_id": 43445
105+
},
106+
"duration": 3000,
107+
"start": 1759940308841610000
108+
}],
109+
[
110+
{
111+
"name": "http.request",
112+
"service": "",
113+
"resource": "/users/view",
114+
"trace_id": 4,
115+
"span_id": 1,
116+
"parent_id": 0,
117+
"type": "",
118+
"error": 1,
119+
"meta": {
120+
"_dd.p.dm": "-3",
121+
"_dd.p.ksr": "0",
122+
"_dd.p.tid": "68e68ed400000000",
123+
"language": "python",
124+
"runtime-id": "6c0e6f7ea24a423bb099504dddd4f5e6"
125+
},
126+
"metrics": {
127+
"_dd.rule_psr": 0.0,
128+
"_dd.top_level": 1,
129+
"_dd.tracer_kr": 1.0,
130+
"_sampling_priority_v1": -1,
131+
"process_id": 43445
132+
},
133+
"duration": 4000,
134+
"start": 1759940308841628000
135+
}]]

‎tests/test_checks.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import platform
12
import time
23

34
import pytest
@@ -102,6 +103,7 @@ async def test_trace_content_length(agent, agent_enabled_checks):
102103
assert "Check 'trace_content_length' failed: content length" in await resp.text()
103104

104105

106+
@pytest.mark.skipif(platform.system() == "Windows", reason="Test doesn't work on Windows")
105107
@pytest.mark.parametrize("agent_enabled_checks", ["trace_stall"])
106108
async def test_trace_stall(
107109
agent,

0 commit comments

Comments
 (0)