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

Added netcore namespace #33

Merged
merged 1 commit into from
Oct 23, 2017
Merged

Added netcore namespace #33

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
1 change: 1 addition & 0 deletions thrift/agent.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ include "jaeger.thrift"
include "zipkincore.thrift"

namespace java com.uber.jaeger.agent.thrift
namespace netcore Jaeger.Thrift.Agent
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since which Thrift version is this instruction supported?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

netcore is supported for dotnet-1.0.0-preview in Thrift 0.10.0
As of today, I merged in dotnet 2.0.0 official support into the thrift master which will become 0.11.0.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. In this case we shouldn't merge this since most of our client libs are using thrift 0.9.

We either need to strip this string during builds of other clients, or better have it added in dotnet project only.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yurishkuro I ran the thrift files against 0.9.2 and didn't get an issue. I did not alter the Makefile because of the version bump. At the moment I'm using the changes that just got merged to Master by @jeking3 so can't add a build file for that unless I use an unofficial thrift docker container for the build


service Agent {
oneway void emitZipkinBatch(1: list<zipkincore.Span> spans)
Expand Down
1 change: 1 addition & 0 deletions thrift/aggregation_validator.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
# THE SOFTWARE.

namespace java com.uber.jaeger.thriftjava
namespace netcore Jaeger.Thrift.Agent

# ValidateTraceResponse returns ok when a trace has been written to redis.
struct ValidateTraceResponse {
Expand Down
1 change: 1 addition & 0 deletions thrift/baggage.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
# THE SOFTWARE.

namespace java com.uber.jaeger.thriftjava
namespace netcore Jaeger.Thrift.Agent

# BaggageRestriction contains the baggage key and the maximum length of the baggage value.
struct BaggageRestriction {
Expand Down
1 change: 1 addition & 0 deletions thrift/crossdock/tracetest.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
namespace java com.uber.jaeger.crossdock.thrift
namespace netcore Jaeger.Thrift.Crossdock

enum Transport { HTTP, TCHANNEL, DUMMY }

Expand Down
1 change: 1 addition & 0 deletions thrift/dependency.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
# THE SOFTWARE.

namespace java com.uber.jaeger.thriftjava
namespace netcore Jaeger.Thrift.Agent

struct DependencyLink {
// parent service name (caller)
Expand Down
1 change: 1 addition & 0 deletions thrift/jaeger.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
# THE SOFTWARE.

namespace java com.uber.jaeger.thriftjava
namespace netcore Jaeger.Thrift

# TagType denotes the type of a Tag's value.
enum TagType { STRING, DOUBLE, BOOL, LONG, BINARY }
Expand Down
1 change: 1 addition & 0 deletions thrift/sampling.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
# THE SOFTWARE.

namespace java com.uber.jaeger.thrift.sampling_manager
namespace netcore Jaeger.Thrift.Agent

enum SamplingStrategyType { PROBABILISTIC, RATE_LIMITING }

Expand Down
1 change: 1 addition & 0 deletions thrift/zipkincore.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
namespace java com.twitter.zipkin.thriftjava
#@namespace scala com.twitter.zipkin.thriftscala
namespace rb Zipkin
namespace netcore Jaeger.Thrift.Agent.Zipkin

#************** Annotation.value **************
/**
Expand Down