Skip to content
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

[extension/jaegerremotesampling]: Replace Thrift-gen with Proto-gen types for sampling strategies #18485

Merged
merged 24 commits into from
Sep 6, 2023
Merged

[extension/jaegerremotesampling]: Replace Thrift-gen with Proto-gen types for sampling strategies #18485

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e24018d
[extension/jaegerremotesampling] move current state into deprecated pkg
frzifus Aug 25, 2023
9bd7d5c
[extension/jaegerremotesampling] remove mod files from deprecated pkg
frzifus Aug 25, 2023
72d7113
[extension/jaegerremotesampling] bump jaeger version from 1.41 to 1.48
frzifus Aug 25, 2023
0d315e7
[extension/jaegerremotesampling] register featuregate
frzifus Aug 25, 2023
5297c36
[pkg/translator/zipkin] bump to jaeger 1.48
frzifus Aug 25, 2023
4e94c5f
[receiver/jaegerreceiver] move current state into deprecated pkg
frzifus Aug 25, 2023
eaf7368
[receiver/jaegerreceiver] bump jaeger to 1.48
frzifus Aug 25, 2023
855a8de
[receiver/jaegerreceiver] register featuregate
frzifus Aug 25, 2023
fb46ce5
*: add changelog entry
frzifus Aug 25, 2023
07d1505
Update extension/jaegerremotesampling/factory.go
frzifus Aug 28, 2023
b990974
jaeger: add otel license header
frzifus Aug 30, 2023
c72a3e7
[extension/jaegerremotesampling] move old jaeger impl into internal
frzifus Aug 30, 2023
e8fe9c1
[receiver/jaegerreceiver] move old jaeger impl into internal
frzifus Aug 30, 2023
e660754
fix pkg paths
frzifus Aug 30, 2023
f80dfe5
*: make gotidy
frzifus Aug 30, 2023
497f7e2
fix
frzifus Aug 30, 2023
3982190
[extension/jaegerremotesampling] fix linting
frzifus Aug 31, 2023
b3045aa
[receiver/jaegerreceiver] fix linting
frzifus Aug 31, 2023
6468cce
Merge branch 'main' into jaegerremotesampling_replace_thrift-gen_with…
frzifus Aug 31, 2023
8e96c1c
Merge branch 'main' into jaegerremotesampling_replace_thrift-gen_with…
frzifus Aug 31, 2023
a4f2962
fix
frzifus Aug 31, 2023
f99ee72
Merge branch 'main' into jaegerremotesampling_replace_thrift-gen_with…
frzifus Aug 31, 2023
c542a2b
Merge branch 'main' into jaegerremotesampling_replace_thrift-gen_with…
frzifus Sep 4, 2023
25bd3b9
Merge branch 'main' into jaegerremotesampling_replace_thrift-gen_with…
frzifus Sep 6, 2023
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
Prev Previous commit
Next Next commit
[pkg/translator/zipkin] bump to jaeger 1.48 
Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de>
  • Loading branch information
@frzifus
frzifus committed Aug 30, 2023
commit 5297c364cf49b103a964219cbcb90fb4e5dae707
6 changes: 4 additions & 2 deletions pkg/translator/zipkin/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/
go 1.20

require (
github.com/jaegertracing/jaeger v1.41.0
github.com/jaegertracing/jaeger v1.48.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.84.0
github.com/openzipkin/zipkin-go v0.4.2
github.com/stretchr/testify v1.8.4
Expand All @@ -23,7 +23,9 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
go.uber.org/atomic v1.10.0 // indirect
go.opentelemetry.io/otel v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.25.0 // indirect
golang.org/x/net v0.14.0 // indirect
Expand Down
8 changes: 8 additions & 0 deletions pkg/translator/zipkin/go.sum
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion pkg/translator/zipkin/zipkinv1/thrift.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package zipkinv1 // import "github.com/open-telemetry/opentelemetry-collector-co

import (
"bytes"
"context"
"encoding/base64"
"encoding/binary"
"errors"
Expand All @@ -24,7 +25,7 @@ type thriftUnmarshaler struct{}

// UnmarshalTraces from Thrift bytes.
func (t thriftUnmarshaler) UnmarshalTraces(buf []byte) (ptrace.Traces, error) {
spans, err := jaegerzipkin.DeserializeThrift(buf)
spans, err := jaegerzipkin.DeserializeThrift(context.TODO(), buf)
if err != nil {
return ptrace.Traces{}, err
}
Expand Down
3 changes: 2 additions & 1 deletion pkg/translator/zipkin/zipkinv1/thrift_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package zipkinv1

import (
"context"
"encoding/binary"
"encoding/json"
"math"
Expand Down Expand Up @@ -51,7 +52,7 @@ func TestV1ThriftToTraces(t *testing.T) {

var zSpans []*zipkincore.Span
require.NoError(t, json.Unmarshal(blob, &zSpans), "failed to unmarshal json test file")
thriftBytes := zipkin.SerializeThrift(zSpans)
thriftBytes := zipkin.SerializeThrift(context.TODO(), zSpans)

td, err := thriftUnmarshaler{}.UnmarshalTraces(thriftBytes)
require.NoError(t, err, "Failed to translate zipkinv1 thrift to OC proto")
Expand Down