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.

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

[7.x] Jaeger integration #3158

Merged
merged 7 commits into from
Jan 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
240 changes: 240 additions & 0 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,20 @@ Third party libraries used by the Apm Server project:
==========================================================================


--------------------------------------------------------------------
Dependency: github.com/apache/thrift
Revision: b2a4d4ae21c789b689dd162deb819665567f481c
License type (autodetected): Apache-2.0
./vendor/github.com/apache/thrift/LICENSE:
--------------------------------------------------------------------
Apache License 2.0

-------NOTICE-----
Apache Thrift
Copyright 2006-2010 The Apache Software Foundation.

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
--------------------------------------------------------------------
Dependency: github.com/armon/go-radix
Revision: 1a2de0c21c94309923825da3df33a4381872c795
Expand Down Expand Up @@ -106,6 +120,44 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

--------------------------------------------------------------------
Dependency: github.com/census-instrumentation/opencensus-proto
Revision: 26aa36c099c2041b432cf3cc8a26c5fb858d218b
License type (autodetected): Apache-2.0
./vendor/github.com/census-instrumentation/opencensus-proto/LICENSE:
--------------------------------------------------------------------
Apache License 2.0


--------------------------------------------------------------------
Dependency: github.com/client9/misspell
Revision: c0b55c8239520f6b5aa15a0207ca8b28027ba49e
License type (autodetected): MIT
./vendor/github.com/client9/misspell/LICENSE:
--------------------------------------------------------------------
The MIT License (MIT)

Copyright (c) 2015-2017 Nick Galbreath

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


--------------------------------------------------------------------
Dependency: github.com/containerd/containerd
Revision: 8ab81a0c2a00168b31360de774bb4e4eb47fe505
Expand Down Expand Up @@ -791,6 +843,15 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

--------------------------------------------------------------------
Dependency: github.com/gogo/googleapis
Revision: b8d18e97a9a193c846d32143391f6033a9d69849
License type (autodetected): Apache-2.0
./vendor/github.com/gogo/googleapis/LICENSE:
--------------------------------------------------------------------
Apache License 2.0


--------------------------------------------------------------------
Dependency: github.com/gogo/protobuf
Revision: 4c00d2f19fb91be5fecd8681fa83450a2a979e69
Expand Down Expand Up @@ -833,6 +894,15 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


--------------------------------------------------------------------
Dependency: github.com/golang/groupcache
Revision: 611e8accdfc92c4187d399e95ce826046d4c8d73
License type (autodetected): Apache-2.0
./vendor/github.com/golang/groupcache/LICENSE:
--------------------------------------------------------------------
Apache License 2.0


--------------------------------------------------------------------
Dependency: github.com/golang/lint
Revision: 959b441ac422379a43da2230f62be024250818b0
Expand Down Expand Up @@ -936,6 +1006,15 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------
Dependency: github.com/google/addlicense
Revision: be125746c2c46b087b012b979b996dfdad452d25
License type (autodetected): Apache-2.0
./vendor/github.com/google/addlicense/LICENSE:
--------------------------------------------------------------------
Apache License 2.0


--------------------------------------------------------------------
Dependency: github.com/google/go-cmp
Revision: 1b316004397f1f336546ca058ddb5b95c41a8772
Expand Down Expand Up @@ -1073,6 +1152,40 @@ License type (autodetected): Apache-2.0
Apache License 2.0


--------------------------------------------------------------------
Dependency: github.com/grpc-ecosystem/grpc-gateway
Revision: d63917fcb0d53f39184485b9b6a0893af18a5668
License type (autodetected): BSD-3-Clause
./vendor/github.com/grpc-ecosystem/grpc-gateway/LICENSE.txt:
--------------------------------------------------------------------
Copyright (c) 2015, Gengo, Inc.
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of Gengo, Inc. nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------
Dependency: github.com/hashicorp/go-uuid
Revision: 4f571afc59f3043a65f8fe6bf46d887b10a01d43
Expand Down Expand Up @@ -1913,6 +2026,24 @@ License type (autodetected): Apache-2.0
Apache License 2.0


--------------------------------------------------------------------
Dependency: github.com/jaegertracing/jaeger
Version: v1.16.0
Revision: 1c315785dddc80a39637c2b08b0a9bbe9ab1536c
License type (autodetected): Apache-2.0
./vendor/github.com/jaegertracing/jaeger/LICENSE:
--------------------------------------------------------------------
Apache License 2.0

-------NOTICE-----
Jaeger, Distributed Tracing Platform.

Copyright 2015-2019 The Jaeger Project Authors

Licensed under Apache License 2.0. See LICENSE for terms.

Includes software developed at Uber Technologies, Inc. (https://eng.uber.com/).

--------------------------------------------------------------------
Dependency: github.com/jcmturner/gofork
Revision: dc7c13fece037a4a36e2b3c69db4991498d30692
Expand Down Expand Up @@ -2107,6 +2238,33 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------
Dependency: github.com/kisielk/gotool
Revision: 80517062f582ea3340cd4baf70e86d539ae7d84d
License type (autodetected): MIT
./vendor/github.com/kisielk/gotool/LICENSE:
--------------------------------------------------------------------
Copyright (c) 2013 Kamil Kisiel <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

--------------------------------------------------------------------
Dependency: github.com/klauspost/compress
Revision: 14c9a76e3c95e47f8ccce949bba2c1101a8b85e6
Expand Down Expand Up @@ -2451,6 +2609,16 @@ License type (autodetected): Apache-2.0
Apache License 2.0


--------------------------------------------------------------------
Dependency: github.com/open-telemetry/opentelemetry-collector
Version: master
Revision: c300f13417023e53ddb643b312e6559899b54ac7
License type (autodetected): Apache-2.0
./vendor/github.com/open-telemetry/opentelemetry-collector/LICENSE:
--------------------------------------------------------------------
Apache License 2.0


--------------------------------------------------------------------
Dependency: github.com/opencontainers/go-digest
Revision: eaa60544f31ccf3b0653b1a118b76d33418ff41b
Expand All @@ -2469,6 +2637,15 @@ License type (autodetected): Apache-2.0
Apache License 2.0


--------------------------------------------------------------------
Dependency: github.com/opentracing/opentracing-go
Revision: a7454ce5950e83caac9774ef32cc8979e5975f30
License type (autodetected): Apache-2.0
./vendor/github.com/opentracing/opentracing-go/LICENSE:
--------------------------------------------------------------------
Apache License 2.0


--------------------------------------------------------------------
Dependency: github.com/patrickmn/go-cache
Revision: a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0
Expand All @@ -2495,6 +2672,33 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

--------------------------------------------------------------------
Dependency: github.com/pavius/impi
Revision: c1cbdcb8df2b23af8530360d87ac9a7fabc48618
License type (autodetected): MIT
./vendor/github.com/pavius/impi/LICENSE:
--------------------------------------------------------------------
The MIT License (MIT)

Copyright (c) 2017 Eran Duchan

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
--------------------------------------------------------------------
Dependency: github.com/pierrec/lz4
Revision: 90290f74b1b4d9c097f0a3b3c7eba2ef3875c699
Expand Down Expand Up @@ -3056,6 +3260,32 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------
Dependency: github.com/uber/tchannel-go
Revision: e6bc214d794a9d6062045dd672de210cf211994d
License type (autodetected): MIT
./vendor/github.com/uber/tchannel-go/LICENSE.md:
--------------------------------------------------------------------
Copyright (c) 2015 Uber Technologies, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

--------------------------------------------------------------------
Dependency: github.com/urso/go-bin
Revision: 781c575c9f0eb3cb9dca94521bd7ad7d5aec7fd4
Expand Down Expand Up @@ -3178,6 +3408,15 @@ License type (autodetected): Apache-2.0
Apache License 2.0


--------------------------------------------------------------------
Dependency: go.opencensus.io
Revision: 9c377598961b706d1542bd2d84d538b5094d596e
License type (autodetected): Apache-2.0
./vendor/go.opencensus.io/LICENSE:
--------------------------------------------------------------------
Apache License 2.0


--------------------------------------------------------------------
Dependency: go.uber.org/atomic
Revision: 8474b86a5a6f79c443ce4b2992817ff32cf208b8
Expand Down Expand Up @@ -3583,6 +3822,7 @@ Apache License 2.0

--------------------------------------------------------------------
Dependency: google.golang.org/grpc
Version: v1.25
Revision: 501c41df7f472c740d0674ff27122f3f48c80ce7
License type (autodetected): Apache-2.0
./vendor/google.golang.org/grpc/LICENSE:
Expand Down
19 changes: 19 additions & 0 deletions _meta/beat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,25 @@ apm-server:
#readonly: {}



#---------------------------- APM Server - Experimental Jaeger integration ----------------------------

# When enabling Jaeger integration, APM Server acts as Jaeger collector. It supports jaeger.thrift over HTTP
# and gRPC. This is an experimental feature, use with care.
#jaeger:
#grpc:
# Set to true to enable the Jaeger gRPC collector service.
#enabled: false
# Defines the gRPC host and port the server is listening on.
# Defaults to the standard Jaeger gRPC collector port 14250.
#host: "{{ .jaeger_grpc_hostport }}"
#http:
# Set to true to enable the Jaeger HTTP collector endpoint.
#enabled: false
# Defines the HTTP host and port the server is listening on.
# Defaults to the standard Jaeger HTTP collector port 14268.
#host: "{{ .jaeger_http_hostport }}"

#================================= General =================================

# Data is buffered in a memory queue before it is published to the configured output.
Expand Down
19 changes: 19 additions & 0 deletions apm-server.docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,25 @@ apm-server:
#readonly: {}



#---------------------------- APM Server - Experimental Jaeger integration ----------------------------

# When enabling Jaeger integration, APM Server acts as Jaeger collector. It supports jaeger.thrift over HTTP
# and gRPC. This is an experimental feature, use with care.
#jaeger:
#grpc:
# Set to true to enable the Jaeger gRPC collector service.
#enabled: false
# Defines the gRPC host and port the server is listening on.
# Defaults to the standard Jaeger gRPC collector port 14250.
#host: "0.0.0.0:14250"
#http:
# Set to true to enable the Jaeger HTTP collector endpoint.
#enabled: false
# Defines the HTTP host and port the server is listening on.
# Defaults to the standard Jaeger HTTP collector port 14268.
#host: "0.0.0.0:14268"

#================================= General =================================

# Data is buffered in a memory queue before it is published to the configured output.
Expand Down
Loading