Skip to content

Commit 807668d

Browse files
black-adderblack-adder
authored
Merge branch 'master' into move_adaptive_sampling_over
2 parents 2b8f0a5 + c296998 commit 807668d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+4065
-1308
lines changed

‎CHANGELOG.md

+47-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,28 @@
11
Changes by Version
22
==================
33

4-
1.8.0 (unreleased)
4+
1.8.0 (2018-11-12)
55
------------------
66

77
#### Backend Changes
88

99
##### Breaking Changes
1010

11+
- Refactor agent configuration ([#1092](https://github.com/jaegertracing/jaeger/pull/1092), [@pavolloffay](https://github.com/pavolloffay))
12+
13+
The following agent flags has has been deprecated in order to support multiple reporters:
14+
```bash
15+
--collector.host-port
16+
--discovery.conn-check-timeout
17+
--discovery.min-peers
18+
```
19+
New flags:
20+
```bash
21+
--reporter.tchannel.host-port
22+
--reporter.tchannel.discovery.conn-check-timeout
23+
--reporter.tchannel.discovery.min-peers
24+
```
25+
1126
- Various changes around metrics produced by jaeger-query: Names scoped to the query component, generated for all span readers (not just ES), consolidate query metrics and include result tag ([#1074](https://github.com/jaegertracing/jaeger/pull/1074), [#1075](https://github.com/jaegertracing/jaeger/pull/1075) and [#1096](https://github.com/jaegertracing/jaeger/pull/1096), [@objectiser](https://github.com/objectiser))
1227

1328
For example, sample of metrics produced for `find_traces` operation before:
@@ -31,13 +46,32 @@ jaeger_query_requests{operation="find_traces",result="ok"} 2
3146
jaeger_query_responses_bucket{operation="find_traces",le="0.005"} 2
3247
```
3348

49+
##### New Features
50+
51+
- Configurable deadlock detector interval for ingester ([#1134](https://github.com/jaegertracing/jaeger/pull/1134), [@marqc](https://github.com/marqc))
52+
- Emit spans for elastic storage backend ([#1128](https://github.com/jaegertracing/jaeger/pull/1128), [@annanay25](https://github.com/annanay25))
53+
- Allow to use TLS certificates for Elasticsearch authentication ([#1139](https://github.com/jaegertracing/jaeger/pull/1139), [@clyang82](https://github.com/clyang82))
54+
- Add ingester metrics, healthcheck and rename Kafka cli flags ([#1094](https://github.com/jaegertracing/jaeger/pull/1094), [@ledor473](https://github.com/ledor473))
55+
- Add a metric for number of partitions held ([#1154](https://github.com/jaegertracing/jaeger/pull/1154), [@vprithvi](https://github.com/vprithvi))
56+
- Log jaeger-collector tchannel port ([#1136](https://github.com/jaegertracing/jaeger/pull/1136), [@mindaugasrukas](https://github.com/mindaugasrukas))
57+
- Support tracer env based initialization in hotrod ([#1115](https://github.com/jaegertracing/jaeger/pull/1115), [@eundoosong](https://github.com/eundoosong))
58+
- Publish ingester as binaries and docker image ([#1086](https://github.com/jaegertracing/jaeger/pull/1086), [@ledor473](https://github.com/ledor473))
59+
- Use Go 1.11 ([#1104](https://github.com/jaegertracing/jaeger/pull/1104), [@isaachier](https://github.com/isaachier))
60+
- Tag images with commit SHA and publish to `-snapshot` repository ([#1082](https://github.com/jaegertracing/jaeger/pull/1082), [@pavolloffay](https://github.com/pavolloffay))
61+
62+
##### Bug fixes, Minor Improvements
63+
64+
- Fix child span context while tracing cassandra queries ([#1131](https://github.com/jaegertracing/jaeger/pull/1131), [@annanay25](https://github.com/annanay25))
65+
- Deadlock detector hack for Kafka driver instability ([#1087](https://github.com/jaegertracing/jaeger/pull/1087), [@vprithvi](https://github.com/vprithvi))
66+
- Fix processor overriding data in a buffer ([#1099](https://github.com/jaegertracing/jaeger/pull/1099), [@pavolloffay](https://github.com/pavolloffay))
67+
3468
#### UI Changes
3569

3670
##### New Features
3771

38-
- Span Search - Highlight search results ([#238](https://github.com/jaegertracing/jaeger-ui/pull/238)), thanks to David Yeghshatyan [@davit-y](https://github.com/davit-y)
39-
- Span Search - Improve search logic ([#237](https://github.com/jaegertracing/jaeger-ui/pull/237)), thanks to David Yeghshatyan [@davit-y](https://github.com/davit-y)
40-
- Span Search - Add result count, navigation and clear buttons ([#234](https://github.com/jaegertracing/jaeger-ui/pull/234)), thanks to David Yeghshatyan [@davit-y](https://github.com/davit-y)
72+
- Span Search - Highlight search results ([#238](https://github.com/jaegertracing/jaeger-ui/pull/238)), [@davit-y](https://github.com/davit-y)
73+
- Span Search - Improve search logic ([#237](https://github.com/jaegertracing/jaeger-ui/pull/237)), [@davit-y](https://github.com/davit-y)
74+
- Span Search - Add result count, navigation and clear buttons ([#234](https://github.com/jaegertracing/jaeger-ui/pull/234)), [@davit-y](https://github.com/davit-y)
4175

4276
##### Bug Fixes, Minor Improvements
4377

@@ -59,7 +93,7 @@ jaeger_query_responses_bucket{operation="find_traces",le="0.005"} 2
5993

6094
#### Backend Changes
6195

62-
##### Breaking changes
96+
##### Breaking Changes
6397

6498
- `jaeger-standalone` binary has been renamed to `jaeger-all-in-one`. This change also includes package rename from `standalone` to `all-in-one` ([#1062](https://github.com/jaegertracing/jaeger/pull/1062), [@pavolloffay](https://github.com/pavolloffay))
6599

@@ -78,7 +112,7 @@ jaeger_query_responses_bucket{operation="find_traces",le="0.005"} 2
78112

79113
#### Backend Changes
80114

81-
##### Breaking Changes!!!
115+
##### Breaking Changes
82116

83117
- The storage implementations no longer write the parentSpanID field to storage (#856).
84118
If you are upgrading to this version, **you must upgrade query service first**!
@@ -178,7 +212,7 @@ jaeger_query_responses_bucket{operation="find_traces",le="0.005"} 2
178212

179213
- Support traces with >10k spans in Elasticsearch (#668) - thanks to @sramakr
180214

181-
##### Fixes
215+
##### Bug Fixes, Minor Improvements
182216

183217
- Allow slash '/' in service names (#586)
184218
- Log errors from HotROD services (#769)
@@ -200,7 +234,7 @@ jaeger_query_responses_bucket{operation="find_traces",le="0.005"} 2
200234
- Collect metrics from ES bulk service (#688) <Pavol Loffay>
201235
- Allow zero replicas for Elasticsearch (#754) <bharat-p>
202236

203-
##### Fixes
237+
##### Bug Fixes, Minor Improvements
204238

205239
- Apply namespace when creating Prometheus metrics factory (fix for #732) (#733) <Yuri Shkuro>
206240
- Disable double compression on Prom Handler - fixes #697 (#735) <Juraci Paixão Kröhling>
@@ -220,7 +254,7 @@ jaeger_query_responses_bucket{operation="find_traces",le="0.005"} 2
220254
- Track Javascript errors via Google Analytics (fixes [#39](https://github.com/jaegertracing/jaeger-ui/issues/39))
221255
- Add Google Analytics event tracking for actions in trace view ([#191](https://github.com/jaegertracing/jaeger-ui/issues/191))
222256

223-
##### Fixes
257+
##### Bug Fixes, Minor Improvements
224258

225259
- Clearly identify traces without a root span (fixes [#190](https://github.com/jaegertracing/jaeger-ui/issues/190))
226260
- Fix [#166](https://github.com/jaegertracing/jaeger-ui/issues/166) JS error on search page after viewing 404 trace
@@ -241,7 +275,7 @@ jaeger_query_responses_bucket{operation="find_traces",le="0.005"} 2
241275
- Make agent host port configurable in hotrod (#663) <Pavol Loffay>
242276
- Add signal handling to standalone (#657) <Pavol Loffay>
243277

244-
##### Fixes
278+
##### Bug Fixes, Minor Improvements
245279

246280
- Remove the override of GOMAXPROCS (#679) <Cruth kvinc>
247281
- Use UTC timezone for ES indices (#646) <Pavol Loffay>
@@ -256,7 +290,7 @@ jaeger_query_responses_bucket{operation="find_traces",le="0.005"} 2
256290
- Fix [#165](https://github.com/jaegertracing/jaeger-ui/issues/165) - Search results are shown without a date
257291
- Fix [#69](https://github.com/jaegertracing/jaeger-ui/issues/69) - Missing endpoints in jaeger ui dropdown
258292

259-
##### Fixes
293+
##### Bug Fixes, Minor Improvements
260294

261295
- Fix 2 digit lookback (12h, 24h) parsing (https://github.com/jaegertracing/jaeger-ui/issues/167)
262296

@@ -272,7 +306,7 @@ jaeger_query_responses_bucket{operation="find_traces",le="0.005"} 2
272306
- Add CA certificates to collector/query images (#485)
273307
- Parse zipkin v2 high trace id (#596)
274308

275-
##### Fixes
309+
##### Bug Fixes, Minor Improvements
276310

277311
- Skip nil and zero length hits in ElasticSearch storage (#601)
278312
- Make Cassandra service_name_index inserts idempotent (#587)
@@ -290,7 +324,7 @@ jaeger_query_responses_bucket{operation="find_traces",le="0.005"} 2
290324
- Add View Option for raw/unadjusted trace (https://github.com/jaegertracing/jaeger-ui/issues/153)
291325
- Add timezone tooltip to custom lookback form-field (https://github.com/jaegertracing/jaeger-ui/pull/161)
292326

293-
##### Fixes
327+
##### Bug Fixes, Minor Improvements
294328

295329
- Use consistent icons for logs expanded/collapsed (https://github.com/jaegertracing/jaeger-ui/issues/86)
296330
- Encode service name in API calls to allow '/' (https://github.com/jaegertracing/jaeger-ui/issues/138)

‎Makefile

+27-17
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ TOP_PKGS := $(shell glide novendor | \
66
grep -v \
77
-e ./thrift-gen/... \
88
-e ./swagger-gen/... \
9+
-e ./proto-gen/... \
910
-e ./examples/... \
1011
-e ./scripts/...\
1112
)
@@ -17,6 +18,7 @@ ALL_SRC := $(shell find . -name "*.go" | \
1718
-e vendor \
1819
-e /thrift-gen/ \
1920
-e /swagger-gen/ \
21+
-e /proto-gen/ \
2022
-e /examples/ \
2123
-e doc.go \
2224
-e model.pb.go \
@@ -335,6 +337,20 @@ generate-mocks: install-mockery
335337
echo-version:
336338
@echo $(GIT_CLOSEST_TAG)
337339

340+
PROTO_INCLUDES := \
341+
-I model/proto \
342+
-I vendor/github.com/grpc-ecosystem/grpc-gateway \
343+
-I vendor/github.com/gogo/googleapis \
344+
-I vendor/github.com/gogo/protobuf
345+
# Remapping of std types to gogo types (must not contain spaces)
346+
PROTO_GOGO_MAPPINGS := $(shell echo \
347+
Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types, \
348+
Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types, \
349+
Mgoogle/protobuf/empty.proto=github.com/gogo/protobuf/types, \
350+
Mgoogle/api/annotations.proto=github.com/gogo/googleapis/google/api, \
351+
Mmodel.proto=github.com/jaegertracing/jaeger/model \
352+
| sed 's/ //g')
353+
338354
.PHONY: proto
339355
proto:
340356
# Generate gogo, gRPC-Gateway, swagger, go-validators output.
@@ -362,31 +378,25 @@ proto:
362378
# (https://medium.com/@linchenon/generate-grpc-and-protobuf-libraries-with-containers-c15ba4e4f3ad)
363379
#
364380
protoc \
365-
-I model/proto \
366-
-I vendor/github.com/grpc-ecosystem/grpc-gateway/ \
367-
-I vendor/github.com/gogo/googleapis/ \
368-
-I vendor/ \
369-
--gogo_out=plugins=grpc,\
370-
Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,\
371-
Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,\
372-
Mgoogle/protobuf/empty.proto=github.com/gogo/protobuf/types,\
373-
Mgoogle/api/annotations.proto=github.com/gogo/googleapis/google/api:\
374-
$$GOPATH/src/github.com/jaegertracing/jaeger/model/ \
375-
--grpc-gateway_out=\
376-
Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,\
377-
Mgoogle/protobuf/empty.proto=github.com/gogo/protobuf/types,\
378-
Mgoogle/api/annotations.proto=github.com/gogo/googleapis/google/api:\
379-
$$GOPATH/src/github.com/jaegertracing/jaeger/model \
380-
--swagger_out=model/proto/openapi/ \
381+
$(PROTO_INCLUDES) \
382+
--gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/model/ \
381383
model/proto/model.proto
382384

385+
protoc \
386+
$(PROTO_INCLUDES) \
387+
--gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v2/ \
388+
--grpc-gateway_out=$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v2/ \
389+
--swagger_out=$(PWD)/proto-gen/openapi/ \
390+
model/proto/api_v2.proto
391+
383392
protoc \
384393
-I model/proto \
385-
--go_out=$$GOPATH/src/github.com/jaegertracing/jaeger/model/prototest/ \
394+
--go_out=$(PWD)/model/prototest/ \
386395
model/proto/model_test.proto
387396

388397
.PHONY: proto-install
389398
proto-install:
399+
go get -u github.com/golang/glog
390400
go install \
391401
./vendor/github.com/golang/protobuf/protoc-gen-go \
392402
./vendor/github.com/gogo/protobuf/protoc-gen-gogo \

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ For example, any given Jaeger installation at Uber is typically processing sever
3333

3434
### Native support for OpenTracing
3535

36-
Jaeger backend, Web UI, and instrumentation libraries have been designed from ground up to support the OpenTracing standard.
36+
Jaeger backend, Web UI, and instrumentation libraries have been designed from ground up to support the [OpenTracing standard](https://opentracing.io/specification/).
3737
* Represent traces as directed acyclic graphs (not just trees) via [span references](https://github.com/opentracing/specification/blob/master/specification.md#references-between-spans)
3838
* Support strongly typed span _tags_ and _structured logs_
3939
* Support general distributed context propagation mechanism via _baggage_

‎cmd/agent/app/agent.go

+6
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ func NewAgent(
4949
return a
5050
}
5151

52+
// GetServer returns HTTP server used by the agent.
53+
func (a *Agent) GetServer() *http.Server {
54+
return a.httpServer
55+
}
56+
5257
// Run runs all of agent UDP and HTTP servers in separate go-routines.
5358
// It returns an error when it's immediately apparent on startup, but
5459
// any errors happening after starting the servers are only logged.
@@ -60,6 +65,7 @@ func (a *Agent) Run() error {
6065
a.httpAddr.Store(listener.Addr().String())
6166
a.closer = listener
6267
go func() {
68+
a.logger.Info("Starting jaeger-agent HTTP server", zap.Int("http-port", listener.Addr().(*net.TCPAddr).Port))
6369
if err := a.httpServer.Serve(listener); err != nil {
6470
a.logger.Error("http server failure", zap.Error(err))
6571
}

‎cmd/agent/app/agent_test.go

+10-7
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func TestAgentSamplingEndpoint(t *testing.T) {
6565
require.NoError(t, err)
6666
body, err := ioutil.ReadAll(resp.Body)
6767
assert.NoError(t, err)
68-
assert.Equal(t, "tcollector error: no peers available\n", string(body))
68+
assert.Equal(t, "collector error: no peers available\n", string(body))
6969
})
7070
}
7171

@@ -95,21 +95,24 @@ func withRunningAgent(t *testing.T, testcase func(string, chan error)) {
9595
HTTPServer: HTTPServerConfiguration{
9696
HostPort: ":0",
9797
},
98-
Metrics: jmetrics.Builder{
99-
Backend: "prometheus",
100-
HTTPRoute: "/metrics",
101-
},
10298
}
10399
logger, logBuf := testutils.NewLogger()
104-
f, _ := cfg.Metrics.CreateMetricsFactory("jaeger")
105-
agent, err := cfg.CreateAgent(fakeCollectorProxy{}, logger, f)
100+
//f, _ := cfg.Metrics.CreateMetricsFactory("jaeger")
101+
mBldr := &jmetrics.Builder{HTTPRoute: "/metrics", Backend: "prometheus"}
102+
mFactory, err := mBldr.CreateMetricsFactory("jaeger")
103+
require.NoError(t, err)
104+
agent, err := cfg.CreateAgent(fakeCollectorProxy{}, logger, mFactory)
106105
require.NoError(t, err)
107106
ch := make(chan error, 2)
108107
go func() {
109108
if err := agent.Run(); err != nil {
110109
t.Errorf("error from agent.Run(): %s", err)
111110
ch <- err
112111
}
112+
if h := mBldr.Handler(); mFactory != nil && h != nil {
113+
logger.Info("Registering metrics handler with HTTP server", zap.String("route", mBldr.HTTPRoute))
114+
agent.GetServer().Handler.(*http.ServeMux).Handle(mBldr.HTTPRoute, h)
115+
}
113116
close(ch)
114117
}()
115118

‎cmd/agent/app/builder.go

+3-9
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"github.com/jaegertracing/jaeger/cmd/agent/app/reporter"
2929
"github.com/jaegertracing/jaeger/cmd/agent/app/servers"
3030
"github.com/jaegertracing/jaeger/cmd/agent/app/servers/thriftudp"
31-
jmetrics "github.com/jaegertracing/jaeger/pkg/metrics"
3231
zipkinThrift "github.com/jaegertracing/jaeger/thrift-gen/agent"
3332
jaegerThrift "github.com/jaegertracing/jaeger/thrift-gen/jaeger"
3433
)
@@ -72,7 +71,6 @@ type CollectorProxy interface {
7271
type Builder struct {
7372
Processors []ProcessorConfiguration `yaml:"processors"`
7473
HTTPServer HTTPServerConfiguration `yaml:"httpServer"`
75-
Metrics jmetrics.Builder `yaml:"metrics"`
7674

7775
reporters []reporter.Reporter
7876
}
@@ -110,7 +108,7 @@ func (b *Builder) CreateAgent(primaryProxy CollectorProxy, logger *zap.Logger, m
110108
if err != nil {
111109
return nil, err
112110
}
113-
server := b.HTTPServer.getHTTPServer(primaryProxy.GetManager(), mFactory, &b.Metrics)
111+
server := b.HTTPServer.getHTTPServer(primaryProxy.GetManager(), mFactory)
114112
return NewAgent(processors, server, logger), nil
115113
}
116114

@@ -156,15 +154,11 @@ func (b *Builder) getProcessors(rep reporter.Reporter, mFactory metrics.Factory,
156154
}
157155

158156
// GetHTTPServer creates an HTTP server that provides sampling strategies and baggage restrictions to client libraries.
159-
func (c HTTPServerConfiguration) getHTTPServer(manager httpserver.ClientConfigManager, mFactory metrics.Factory, mBuilder *jmetrics.Builder) *http.Server {
157+
func (c HTTPServerConfiguration) getHTTPServer(manager httpserver.ClientConfigManager, mFactory metrics.Factory) *http.Server {
160158
if c.HostPort == "" {
161159
c.HostPort = defaultHTTPServerHostPort
162160
}
163-
server := httpserver.NewHTTPServer(c.HostPort, manager, mFactory)
164-
if h := mBuilder.Handler(); mFactory != nil && h != nil {
165-
server.Handler.(*http.ServeMux).Handle(mBuilder.HTTPRoute, h)
166-
}
167-
return server
161+
return httpserver.NewHTTPServer(c.HostPort, manager, mFactory)
168162
}
169163

170164
// GetThriftProcessor gets a TBufferedServer backed Processor using the collector configuration

‎cmd/agent/app/builder_test.go

-9
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,6 @@ func TestBuilderWithExtraReporter(t *testing.T) {
107107
assert.NotNil(t, agent)
108108
}
109109

110-
func TestBuilderMetricsHandler(t *testing.T) {
111-
b := &Builder{}
112-
b.Metrics.Backend = "expvar"
113-
b.Metrics.HTTPRoute = "/expvar"
114-
agent, err := b.CreateAgent(fakeCollectorProxy{}, zap.NewNop(), metrics.NullFactory)
115-
assert.NoError(t, err)
116-
assert.NotNil(t, agent)
117-
}
118-
119110
func TestBuilderWithProcessorErrors(t *testing.T) {
120111
testCases := []struct {
121112
model Model

‎cmd/agent/app/flags.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,11 @@ func AddFlags(flags *flag.FlagSet) {
5151
flags.String(
5252
httpServerHostPort,
5353
defaultHTTPServerHostPort,
54-
"host:port of the http server (e.g. for /sampling point and /baggage endpoint)")
54+
"host:port of the http server (e.g. for /sampling point and /baggageRestrictions endpoint)")
5555
}
5656

5757
// InitFromViper initializes Builder with properties retrieved from Viper.
5858
func (b *Builder) InitFromViper(v *viper.Viper) *Builder {
59-
b.Metrics.InitFromViper(v)
60-
6159
for _, processor := range defaultProcessors {
6260
prefix := fmt.Sprintf("processor.%s-%s.", processor.model, processor.protocol)
6361
p := &ProcessorConfiguration{Model: processor.model, Protocol: processor.protocol}

‎cmd/agent/app/httpserver/server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func (h *httpHandler) serveSamplingHTTP(w http.ResponseWriter, r *http.Request,
108108
resp, err := h.manager.GetSamplingStrategy(service)
109109
if err != nil {
110110
h.metrics.TCollectorProxyFailures.Inc(1)
111-
http.Error(w, fmt.Sprintf("tcollector error: %+v", err), http.StatusInternalServerError)
111+
http.Error(w, fmt.Sprintf("collector error: %+v", err), http.StatusInternalServerError)
112112
return
113113
}
114114
jsonBytes, err := json.Marshal(resp)
@@ -138,7 +138,7 @@ func (h *httpHandler) serveBaggageHTTP(w http.ResponseWriter, r *http.Request) {
138138
resp, err := h.manager.GetBaggageRestrictions(service)
139139
if err != nil {
140140
h.metrics.TCollectorProxyFailures.Inc(1)
141-
http.Error(w, fmt.Sprintf("tcollector error: %+v", err), http.StatusInternalServerError)
141+
http.Error(w, fmt.Sprintf("collector error: %+v", err), http.StatusInternalServerError)
142142
return
143143
}
144144
// NB. it's literally impossible for this Marshal to fail

0 commit comments

Comments
 (0)