Skip to content

Remove deprecated functions from jaeger translator #8032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 22, 2022
Merged

Remove deprecated functions from jaeger translator #8032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

### 🛑 Breaking changes 🛑

- Remove deprecated functions from jaeger translator (#8032)

### 🚩 Deprecations 🚩

### 🧰 Bug fixes 🧰
Expand Down
19 changes: 0 additions & 19 deletions pkg/translator/jaeger/jaegerproto_to_traces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,6 @@ import (

var blankJaegerProtoSpan = new(model.Span)

// Deprecated: [0.45.0] use `jaeger.ProtoToTraces`
func ProtoBatchesToInternalTraces(batches []*model.Batch) pdata.Traces {
td, _ := ProtoToTraces(batches)
return td
}

// ProtoToTraces converts multiple Jaeger proto batches to internal traces
func ProtoToTraces(batches []*model.Batch) (pdata.Traces, error) {
traceData := pdata.NewTraces()
Expand All @@ -59,19 +53,6 @@ func ProtoToTraces(batches []*model.Batch) (pdata.Traces, error) {
return traceData, nil
}

// Deprecated: [0.45.0] use `jaeger.ProtoToTraces`
func ProtoBatchToInternalTraces(batch model.Batch) pdata.Traces {
traceData := pdata.NewTraces()

if batch.GetProcess() == nil && len(batch.GetSpans()) == 0 {
return traceData
}

protoBatchToResourceSpans(batch, traceData.ResourceSpans().AppendEmpty())

return traceData
}

func protoBatchToResourceSpans(batch model.Batch, dest pdata.ResourceSpans) {
jSpans := batch.GetSpans()

Expand Down
6 changes: 0 additions & 6 deletions pkg/translator/jaeger/jaegerthrift_to_traces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@ import (

var blankJaegerThriftSpan = new(jaeger.Span)

// Deprecated: [0.45.0] use `jaeger.ThriftToTraces`
func ThriftBatchToInternalTraces(batches *jaeger.Batch) pdata.Traces {
td, _ := ThriftToTraces(batches)
return td
}

// ThriftToTraces transforms a Thrift trace batch into pdata.Traces.
func ThriftToTraces(batches *jaeger.Batch) (pdata.Traces, error) {
traceData := pdata.NewTraces()
Expand Down
5 changes: 0 additions & 5 deletions pkg/translator/jaeger/traces_to_jaegerproto.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/tracetranslator"
)

// Deprecated: [0.45.0] use `jaeger.ProtoToTraces`
func InternalTracesToJaegerProto(td pdata.Traces) ([]*model.Batch, error) {
return ProtoFromTraces(td)
}

// ProtoFromTraces translates internal trace data into the Jaeger Proto for GRPC.
// Returns slice of translated Jaeger batches and error if translation failed.
func ProtoFromTraces(td pdata.Traces) ([]*model.Batch, error) {
Expand Down