Commit 8e85ebac6ca1e281710a953a7df0334c1f9ae1a9 - golang-github-opentracing-contrib-go-stdlib

allow user to set component name mqliang 6 years ago

2 changed file(s) with 43 addition(s) and 11 deletion(s). Raw diff Collapse all Expand all

+24

-8

nethttp/client.go less more

17	17	const (
18	18	keyTracer contextKey = iota
19	19	)
	20
	21	const defaultComponentName = "net/http"
20	22
21	23	// Transport wraps a RoundTripper. If a request is being traced with
22	24	// Tracer, Transport will inject the current span into the headers,

28	30	}
29	31
30	32	type clientOptions struct {
31		opName string
	33	operationName string
	34	componentName string
32	35	disableClientTrace bool
33	36	}
34	37

37	40
38	41	// OperationName returns a ClientOption that sets the operation
39	42	// name for the client-side span.
40		func OperationName(opName string) ClientOption {
	43	func OperationName(operationName string) ClientOption {
41	44	return func(options *clientOptions) {
42		options.opName = opName
	45	options.operationName = operationName
	46	}
	47	}
	48
	49	// ComponentName returns a ClientOption that sets the component
	50	// name for the client-side span.
	51	func ComponentName(componentName string) ClientOption {
	52	return func(options *clientOptions) {
	53	options.componentName = componentName
43	54	}
44	55	}
45	56

149	160	if parent != nil {
150	161	spanctx = parent.Context()
151	162	}
152		opName := h.opts.opName
153		if opName == "" {
154		opName = "HTTP Client"
	163	operationName := h.opts.operationName
	164	if operationName == "" {
	165	operationName = "HTTP Client"
155	166	}
156		root := h.tr.StartSpan(opName, opentracing.ChildOf(spanctx))
	167	root := h.tr.StartSpan(operationName, opentracing.ChildOf(spanctx))
157	168	h.root = root
158	169	}
159	170
160	171	ctx := h.root.Context()
161	172	h.sp = h.tr.StartSpan("HTTP "+req.Method, opentracing.ChildOf(ctx))
162	173	ext.SpanKindRPCClient.Set(h.sp)
163		ext.Component.Set(h.sp, "net/http")
	174
	175	componentName := h.opts.componentName
	176	if componentName == "" {
	177	componentName = defaultComponentName
	178	}
	179	ext.Component.Set(h.sp, componentName)
164	180
165	181	return h.sp
166	182	}

+19

-3

nethttp/server.go less more

19	19	}
20	20
21	21	type mwOptions struct {
22		opNameFunc func(r *http.Request) string
	22	opNameFunc func(r *http.Request) string
	23	componentName string
23	24	}
24	25
25		// MWOption contols the behavior of the Middleware.
	26	// MWOption controls the behavior of the Middleware.
26	27	type MWOption func(*mwOptions)
27	28
28	29	// OperationNameFunc returns a MWOption that uses given function f

30	31	func OperationNameFunc(f func(r *http.Request) string) MWOption {
31	32	return func(options *mwOptions) {
32	33	options.opNameFunc = f
	34	}
	35	}
	36
	37	// MWComponentName returns a MWOption that sets the component name
	38	// name for the server-side span.
	39	func MWComponentName(componentName string) MWOption {
	40	return func(options *mwOptions) {
	41	options.componentName = componentName
33	42	}
34	43	}
35	44

66	75	sp := tr.StartSpan(opts.opNameFunc(r), ext.RPCServerOption(ctx))
67	76	ext.HTTPMethod.Set(sp, r.Method)
68	77	ext.HTTPUrl.Set(sp, r.URL.String())
69		ext.Component.Set(sp, "net/http")
	78
	79	// set component name, use "net/http" if caller does not specify
	80	componentName := opts.componentName
	81	if componentName == "" {
	82	componentName = defaultComponentName
	83	}
	84	ext.Component.Set(sp, componentName)
	85
70	86	w = &statusCodeTracker{w, 200}
71	87	r = r.WithContext(opentracing.ContextWithSpan(r.Context(), sp))
72	88