Skip to content

Commit

Permalink
Migrate converter thrift jaeger (#37823)
Browse files Browse the repository at this point in the history
#### 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 <nabil.salah203@gmail.com>
  • Loading branch information
Nabil-Salah authored Feb 14, 2025
1 parent 053221f commit 54063ce
Show file tree
Hide file tree
Showing 17 changed files with 1,394 additions and 2 deletions.
27 changes: 27 additions & 0 deletions .chloggen/migrating_converter_thrift_jaeger.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: pkg/translator/jaeger/internal/jaeger

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Remove jaeger model/converter/thrift/jaeger dependency

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [37820]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
6 changes: 5 additions & 1 deletion pkg/translator/jaeger/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/
go 1.23.0

require (
github.com/gogo/protobuf v1.3.2
github.com/jaegertracing/jaeger-idl v0.5.0
github.com/kr/pretty v0.3.1
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.119.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.119.0
github.com/stretchr/testify v1.10.0
Expand All @@ -15,11 +17,13 @@ require (
require (
github.com/apache/thrift v0.21.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/gogo/googleapis v1.4.1 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.119.1-0.20250210123122-44b3eeda354c // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.34.0 // indirect
Expand Down
5 changes: 5 additions & 0 deletions pkg/translator/jaeger/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

102 changes: 102 additions & 0 deletions pkg/translator/jaeger/jaegerthriftcoverter/fixtures/domain_01.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
{
"spans": [
{
"traceId": "AAAAAAAAAABSlpqJVVcaPw==",
"spanId": "AAAAAABkfZg=",
"operationName": "get",
"references": [
{
"refType": "CHILD_OF",
"traceId": "AAAAAAAAAABSlpqJVVcaPw==",
"spanId": "AAAAAABoxOM="
}
],
"startTime": "2017-01-26T16:46:31.639875-05:00",
"duration": "22938000ns",
"tags": [
{
"key": "http.url",
"vType": "STRING",
"vStr": "http://127.0.0.1:15598/client_transactions"
},
{
"key": "span.kind",
"vType": "STRING",
"vStr": "server"
},
{
"key": "peer.port",
"vType": "INT64",
"vInt64": 53931
},
{
"key": "someBool",
"vType": "BOOL",
"vBool": true
},
{
"key": "someDouble",
"vType": "FLOAT64",
"vFloat64": 129.8
},
{
"key": "peer.service",
"vType": "STRING",
"vStr": "rtapi"
},
{
"key": "peer.ipv4",
"vType": "INT64",
"vInt64": 3224716605
}
],
"process": {
"serviceName": "api",
"tags": [
{
"key": "hostname",
"vType": "STRING",
"vStr": "api246-sjc1"
},
{
"key": "ip",
"vType": "STRING",
"vStr": "10.53.69.61"
},
{
"key": "jaeger.version",
"vType": "STRING",
"vStr": "Python-3.1.0"
}
]
},
"logs": [
{
"timestamp": "2017-01-26T16:46:31.639875-05:00",
"fields": [
{
"key": "key1",
"vType": "STRING",
"vStr": "value1"
},
{
"key": "key2",
"vType": "STRING",
"vStr": "value2"
}
]
},
{
"timestamp": "2017-01-26T16:46:31.639875-05:00",
"fields": [
{
"key": "event",
"vType": "STRING",
"vStr": "nothing"
}
]
}
]
}
]
}
45 changes: 45 additions & 0 deletions pkg/translator/jaeger/jaegerthriftcoverter/fixtures/domain_02.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"spans": [
{
"traceId": "AAAAAAAAAABSlpqJVVcaPw==",
"spanId": "AAAAAABkfZg=",
"operationName": "get",
"references": [
{
"refType": "CHILD_OF",
"traceId": "AAAAAAAAAABSlpqJVVcaPw==",
"spanId": "AAAAAABoxOM="
}
],
"startTime": "2017-01-26T16:46:31.639875-05:00",
"duration": "22938000ns",
"tags": [
{
"key": "peer.service",
"vType": "BINARY",
"vBinary": "AAAAAAAAMDk="
}
],
"process": {
"serviceName": "api"
}
},
{
"traceId": "AAAAAAAAAABSlpqJVVcaPw==",
"spanId": "AAAAAABkfZk=",
"operationName": "get",
"references": [
{
"refType": "FOLLOWS_FROM",
"traceId": "AAAAAAAAAABSlpqJVVcaPw==",
"spanId": "AAAAAABoxOM="
}
],
"startTime": "2017-01-26T16:46:31.639875-05:00",
"duration": "22938000ns",
"process": {
"serviceName": "api"
}
}
]
}
Loading

0 comments on commit 54063ce

Please sign in to comment.