Skip to content

Commit 54063ce

Browse files
Nabil-SalahNabil-Salah
authored
Migrate converter thrift jaeger (#37823)
#### Description Remove jaeger model/converter/thrift/jaeger dependency #### Link to tracking issue Resolves #37820 Part of jaegertracing/jaeger#6409 #### Testing #### Documentation --------- Signed-off-by: nabil salah <[email protected]>
1 parent 053221f commit 54063ce

17 files changed

+1394
-2
lines changed

‎.chloggen/migrating_converter_thrift_jaeger.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: pkg/translator/jaeger/internal/jaeger
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Remove jaeger model/converter/thrift/jaeger dependency
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [37820]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

‎pkg/translator/jaeger/go.mod

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/
33
go 1.23.0
44

55
require (
6+
github.com/gogo/protobuf v1.3.2
67
github.com/jaegertracing/jaeger-idl v0.5.0
8+
github.com/kr/pretty v0.3.1
79
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.119.0
810
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.119.0
911
github.com/stretchr/testify v1.10.0
@@ -15,11 +17,13 @@ require (
1517
require (
1618
github.com/apache/thrift v0.21.0 // indirect
1719
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
18-
github.com/gogo/protobuf v1.3.2 // indirect
20+
github.com/gogo/googleapis v1.4.1 // indirect
1921
github.com/json-iterator/go v1.1.12 // indirect
22+
github.com/kr/text v0.2.0 // indirect
2023
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2124
github.com/modern-go/reflect2 v1.0.2 // indirect
2225
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
26+
github.com/rogpeppe/go-internal v1.10.0 // indirect
2327
go.opentelemetry.io/collector/pdata/pprofile v0.119.1-0.20250210123122-44b3eeda354c // indirect
2428
go.uber.org/multierr v1.11.0 // indirect
2529
golang.org/x/net v0.34.0 // indirect

‎pkg/translator/jaeger/go.sum

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/translator/jaeger/jaegerthriftcoverter/fixtures/domain_01.json

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
{
2+
"spans": [
3+
{
4+
"traceId": "AAAAAAAAAABSlpqJVVcaPw==",
5+
"spanId": "AAAAAABkfZg=",
6+
"operationName": "get",
7+
"references": [
8+
{
9+
"refType": "CHILD_OF",
10+
"traceId": "AAAAAAAAAABSlpqJVVcaPw==",
11+
"spanId": "AAAAAABoxOM="
12+
}
13+
],
14+
"startTime": "2017-01-26T16:46:31.639875-05:00",
15+
"duration": "22938000ns",
16+
"tags": [
17+
{
18+
"key": "http.url",
19+
"vType": "STRING",
20+
"vStr": "http://127.0.0.1:15598/client_transactions"
21+
},
22+
{
23+
"key": "span.kind",
24+
"vType": "STRING",
25+
"vStr": "server"
26+
},
27+
{
28+
"key": "peer.port",
29+
"vType": "INT64",
30+
"vInt64": 53931
31+
},
32+
{
33+
"key": "someBool",
34+
"vType": "BOOL",
35+
"vBool": true
36+
},
37+
{
38+
"key": "someDouble",
39+
"vType": "FLOAT64",
40+
"vFloat64": 129.8
41+
},
42+
{
43+
"key": "peer.service",
44+
"vType": "STRING",
45+
"vStr": "rtapi"
46+
},
47+
{
48+
"key": "peer.ipv4",
49+
"vType": "INT64",
50+
"vInt64": 3224716605
51+
}
52+
],
53+
"process": {
54+
"serviceName": "api",
55+
"tags": [
56+
{
57+
"key": "hostname",
58+
"vType": "STRING",
59+
"vStr": "api246-sjc1"
60+
},
61+
{
62+
"key": "ip",
63+
"vType": "STRING",
64+
"vStr": "10.53.69.61"
65+
},
66+
{
67+
"key": "jaeger.version",
68+
"vType": "STRING",
69+
"vStr": "Python-3.1.0"
70+
}
71+
]
72+
},
73+
"logs": [
74+
{
75+
"timestamp": "2017-01-26T16:46:31.639875-05:00",
76+
"fields": [
77+
{
78+
"key": "key1",
79+
"vType": "STRING",
80+
"vStr": "value1"
81+
},
82+
{
83+
"key": "key2",
84+
"vType": "STRING",
85+
"vStr": "value2"
86+
}
87+
]
88+
},
89+
{
90+
"timestamp": "2017-01-26T16:46:31.639875-05:00",
91+
"fields": [
92+
{
93+
"key": "event",
94+
"vType": "STRING",
95+
"vStr": "nothing"
96+
}
97+
]
98+
}
99+
]
100+
}
101+
]
102+
}

‎pkg/translator/jaeger/jaegerthriftcoverter/fixtures/domain_02.json

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
"spans": [
3+
{
4+
"traceId": "AAAAAAAAAABSlpqJVVcaPw==",
5+
"spanId": "AAAAAABkfZg=",
6+
"operationName": "get",
7+
"references": [
8+
{
9+
"refType": "CHILD_OF",
10+
"traceId": "AAAAAAAAAABSlpqJVVcaPw==",
11+
"spanId": "AAAAAABoxOM="
12+
}
13+
],
14+
"startTime": "2017-01-26T16:46:31.639875-05:00",
15+
"duration": "22938000ns",
16+
"tags": [
17+
{
18+
"key": "peer.service",
19+
"vType": "BINARY",
20+
"vBinary": "AAAAAAAAMDk="
21+
}
22+
],
23+
"process": {
24+
"serviceName": "api"
25+
}
26+
},
27+
{
28+
"traceId": "AAAAAAAAAABSlpqJVVcaPw==",
29+
"spanId": "AAAAAABkfZk=",
30+
"operationName": "get",
31+
"references": [
32+
{
33+
"refType": "FOLLOWS_FROM",
34+
"traceId": "AAAAAAAAAABSlpqJVVcaPw==",
35+
"spanId": "AAAAAABoxOM="
36+
}
37+
],
38+
"startTime": "2017-01-26T16:46:31.639875-05:00",
39+
"duration": "22938000ns",
40+
"process": {
41+
"serviceName": "api"
42+
}
43+
}
44+
]
45+
}

0 commit comments

Comments
 (0)