Skip to content

Commit 73831f0

Browse files
committed
Export default trace header name
1 parent 7838b98 commit 73831f0

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

book_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func TestParseRunnerForHttpRunner(t *testing.T) {
152152
endpoint: secureUrl,
153153
client: client,
154154
validator: &nopValidator{},
155-
traceHeaderName: defaultTraceHeaderName,
155+
traceHeaderName: DefaultTraceHeaderName,
156156
},
157157
},
158158
{
@@ -162,7 +162,7 @@ func TestParseRunnerForHttpRunner(t *testing.T) {
162162
endpoint: url,
163163
client: client,
164164
validator: &nopValidator{},
165-
traceHeaderName: defaultTraceHeaderName,
165+
traceHeaderName: DefaultTraceHeaderName,
166166
},
167167
},
168168
}

grpc.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func newGrpcRunner(name, target string) (*grpcRunner, error) {
106106
name: name,
107107
target: target,
108108
mds: map[string]protoreflect.MethodDescriptor{},
109-
traceHeaderName: strings.ToLower(defaultTraceHeaderName),
109+
traceHeaderName: strings.ToLower(DefaultTraceHeaderName),
110110
}, nil
111111
}
112112

@@ -851,7 +851,7 @@ func (r *grpcRequest) setTraceHeader(s *step) error {
851851
r.headers.Set(s.grpcRunner.traceHeaderName, string(tj))
852852
} else {
853853
// by Default
854-
r.headers.Set(defaultTraceHeaderName, string(tj))
854+
r.headers.Set(DefaultTraceHeaderName, string(tj))
855855
}
856856
return nil
857857
}

grpc_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ func TestGrpcTraceHeader(t *testing.T) {
591591
}
592592
latest := len(ts.Requests()) - 1
593593
recvReq := ts.Requests()[latest]
594-
if len(recvReq.Headers.Get(defaultTraceHeaderName)) != 1 {
594+
if len(recvReq.Headers.Get(DefaultTraceHeaderName)) != 1 {
595595
t.Error("got empty trace header")
596596
}
597597
})

http.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func newHTTPRunner(name, endpoint string) (*httpRunner, error) {
9191
Timeout: time.Second * 30,
9292
},
9393
validator: newNopValidator(),
94-
traceHeaderName: defaultTraceHeaderName,
94+
traceHeaderName: DefaultTraceHeaderName,
9595
}, nil
9696
}
9797

@@ -100,7 +100,7 @@ func newHTTPRunnerWithHandler(name string, h http.Handler) (*httpRunner, error)
100100
name: name,
101101
handler: h,
102102
validator: newNopValidator(),
103-
traceHeaderName: defaultTraceHeaderName,
103+
traceHeaderName: DefaultTraceHeaderName,
104104
}, nil
105105
}
106106

@@ -341,7 +341,7 @@ func (r *httpRequest) setTraceHeader(s *step) error {
341341
r.headers.Set(s.httpRunner.traceHeaderName, string(tj))
342342
} else {
343343
// by Default
344-
r.headers.Set(defaultTraceHeaderName, string(tj))
344+
r.headers.Set(DefaultTraceHeaderName, string(tj))
345345
}
346346
return nil
347347
}

http_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ func TestSetTraceHeader(t *testing.T) {
853853
if err := r.setTraceHeader(tt.step); err != nil {
854854
t.Error(err)
855855
}
856-
got := r.headers.Get(defaultTraceHeaderName)
856+
got := r.headers.Get(DefaultTraceHeaderName)
857857
if got != tt.want {
858858
t.Errorf("got %v\nwant %v", got, tt.want)
859859
}

option.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ func GrpcRunner(name string, cc *grpc.ClientConn) Option {
410410
name: name,
411411
cc: cc,
412412
mds: map[string]protoreflect.MethodDescriptor{},
413-
traceHeaderName: defaultTraceHeaderName,
413+
traceHeaderName: DefaultTraceHeaderName,
414414
}
415415
bk.grpcRunners[name] = r
416416
return nil
@@ -428,7 +428,7 @@ func GrpcRunnerWithOptions(name, target string, opts ...grpcRunnerOption) Option
428428
name: name,
429429
target: target,
430430
mds: map[string]protoreflect.MethodDescriptor{},
431-
traceHeaderName: defaultTraceHeaderName,
431+
traceHeaderName: DefaultTraceHeaderName,
432432
}
433433
if len(opts) > 0 {
434434
c := &grpcRunnerConfig{}

option_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func TestOptionOverlay(t *testing.T) {
5757
httpRunners: map[string]*httpRunner{
5858
"req": {
5959
name: "req",
60-
traceHeaderName: defaultTraceHeaderName,
60+
traceHeaderName: DefaultTraceHeaderName,
6161
},
6262
},
6363
dbRunners: map[string]*dbRunner{},
@@ -105,7 +105,7 @@ func TestOptionOverlay(t *testing.T) {
105105
httpRunners: map[string]*httpRunner{
106106
"req": {
107107
name: "req",
108-
traceHeaderName: defaultTraceHeaderName,
108+
traceHeaderName: DefaultTraceHeaderName,
109109
},
110110
},
111111
dbRunners: map[string]*dbRunner{},
@@ -160,7 +160,7 @@ func TestOptionOverlay(t *testing.T) {
160160
httpRunners: map[string]*httpRunner{
161161
"req": {
162162
name: "req",
163-
traceHeaderName: defaultTraceHeaderName,
163+
traceHeaderName: DefaultTraceHeaderName,
164164
},
165165
},
166166
dbRunners: map[string]*dbRunner{
@@ -233,7 +233,7 @@ func TestOptionUnderlay(t *testing.T) {
233233
httpRunners: map[string]*httpRunner{
234234
"req": {
235235
name: "req",
236-
traceHeaderName: defaultTraceHeaderName,
236+
traceHeaderName: DefaultTraceHeaderName,
237237
},
238238
},
239239
dbRunners: map[string]*dbRunner{},
@@ -281,7 +281,7 @@ func TestOptionUnderlay(t *testing.T) {
281281
httpRunners: map[string]*httpRunner{
282282
"req": {
283283
name: "req",
284-
traceHeaderName: defaultTraceHeaderName,
284+
traceHeaderName: DefaultTraceHeaderName,
285285
},
286286
},
287287
dbRunners: map[string]*dbRunner{},
@@ -336,7 +336,7 @@ func TestOptionUnderlay(t *testing.T) {
336336
httpRunners: map[string]*httpRunner{
337337
"req": {
338338
name: "req",
339-
traceHeaderName: defaultTraceHeaderName,
339+
traceHeaderName: DefaultTraceHeaderName,
340340
},
341341
},
342342
dbRunners: map[string]*dbRunner{

trace.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package runn
22

3-
const defaultTraceHeaderName = "X-Runn-Trace"
3+
const DefaultTraceHeaderName = "X-Runn-Trace"
44

55
type trace struct {
66
RunID string `json:"id"`

0 commit comments

Comments
 (0)