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

Jump to bottom

Vendor Thrift dependency #1551

Merged
merged 14 commits into from
Feb 19, 2021
Merged

Vendor Thrift dependency #1551

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8a2384f
Vendor Thrift dependency
punya Feb 18, 2021
f027c53
Fix build
punya Feb 18, 2021
2003154
Changelog entry
punya Feb 18, 2021
b6254b9
Ignore third_party for coverage purposes
punya Feb 18, 2021
29c5148
Re-run tests
punya Feb 18, 2021
f7117b2
Re-run tests
punya Feb 19, 2021
154b06d
Re-run tests
punya Feb 19, 2021
4a32715
Re-run tests
punya Feb 19, 2021
21eca16
Merge branch 'main' into vendor-thrift
MrAlias Feb 19, 2021
e38595e
Relax time comparisons
punya Feb 19, 2021
af21b46
Merge branch 'time-comparisons' into vendor-thrift
punya Feb 19, 2021
9b21669
Re-run tests
punya Feb 19, 2021
5e22991
Relax more time comparisons
punya Feb 19, 2021
dc1b314
Re-run tests
punya Feb 19, 2021
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
4 changes: 4 additions & 0 deletions exporters/trace/jaeger/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ OpenTelemetry Jaeger exporter
```
go get -u go.opentelemetry.io/otel/exporters/trace/jaeger
```

## Maintenance

This exporter uses a vendored copy of the Apache Thrift library (v0.13.0) at a custom import path. When re-generating Thrift code in future, please adapt import paths as necessary.
2 changes: 1 addition & 1 deletion exporters/trace/jaeger/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"net"
"time"

"github.com/apache/thrift/lib/go/thrift"
"go.opentelemetry.io/otel/exporters/trace/jaeger/internal/vendor/github.com/apache/thrift/lib/go/thrift"

gen "go.opentelemetry.io/otel/exporters/trace/jaeger/internal/gen-go/jaeger"
)
Expand Down
1 change: 0 additions & 1 deletion exporters/trace/jaeger/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ replace (
)

require (
github.com/apache/thrift v0.13.0
github.com/google/go-cmp v0.5.4
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/otel v0.17.0
Expand Down
2 changes: 0 additions & 2 deletions exporters/trace/jaeger/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/apache/thrift v0.13.0 h1:5hryIiq9gtn+MiLVn0wP37kb/uTeRZgN08WoCsAhIhI=
github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
Expand Down
2 changes: 1 addition & 1 deletion exporters/trace/jaeger/internal/gen-go/jaeger/agent.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporters/trace/jaeger/internal/gen-go/jaeger/collector-remote/collector-remote.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporters/trace/jaeger/internal/gen-go/jaeger/jaeger-consts.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporters/trace/jaeger/internal/gen-go/jaeger/jaeger.go
View file
Open in desktop

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

239 changes: 239 additions & 0 deletions exporters/trace/jaeger/internal/vendor/github.com/apache/thrift/LICENSE
View file
Open in desktop

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

5 changes: 5 additions & 0 deletions exporters/trace/jaeger/internal/vendor/github.com/apache/thrift/NOTICE
View file
Open in desktop

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

Loading