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

Jaeger http thrift #3081

Merged
merged 10 commits into from
Dec 20, 2019
Merged

Jaeger http thrift #3081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9bc4be0
vendor some more things
axw Dec 19, 2019
a797d1e
testdata/tls: regenerate certificates
axw Dec 19, 2019
6117986
beater/config: add JaegerConfig.HTTP
axw Dec 19, 2019
cc0a807
beater/request: move context pool
axw Dec 19, 2019
fde1827
beater/jaeger: add HTTP endpoint
axw Dec 19, 2019
6b4259e
fix golint
axw Dec 19, 2019
647b09d
vendor: update jaeger, add missing package
axw Dec 19, 2019
ad31536
Move approvals test into beater/jaeger
axw Dec 20, 2019
34ca6dd
beater/config: fix struct tags
axw Dec 20, 2019
39debaf
beater/jaeger: make fmt
axw Dec 20, 2019
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
40 changes: 20 additions & 20 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2004,7 +2004,8 @@ Apache License 2.0

--------------------------------------------------------------------
Dependency: github.com/jaegertracing/jaeger
Revision: e4b97b38c4785d9a593483241f0a1d3abe007e1c
Version: v1.16.0
Revision: 1c315785dddc80a39637c2b08b0a9bbe9ab1536c
License type (autodetected): Apache-2.0
./vendor/github.com/jaegertracing/jaeger/LICENSE:
--------------------------------------------------------------------
Expand Down Expand Up @@ -2652,7 +2653,7 @@ Apache License 2.0
--------------------------------------------------------------------
Dependency: github.com/open-telemetry/opentelemetry-collector
Version: master
Revision: e94dd19191e0ba67d5d17c4504de5e97f512eb75
Revision: c300f13417023e53ddb643b312e6559899b54ac7
License type (autodetected): Apache-2.0
./vendor/github.com/open-telemetry/opentelemetry-collector/LICENSE:
--------------------------------------------------------------------
Expand Down Expand Up @@ -3218,28 +3219,27 @@ Revision: f35b8ab0b5a2cef36673838d662e249dd9c94686
License type (autodetected): MIT
./vendor/github.com/stretchr/testify/LICENSE:
--------------------------------------------------------------------
Copyright (c) 2012 - 2013 Mat Ryer and Tyler Bunnell
MIT License

Please consider promoting this project if you find it useful.
Copyright (c) 2012-2018 Mat Ryer and Tyler Bunnell

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:
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 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.
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/t-yuki/gocover-cobertura
Expand Down
13 changes: 10 additions & 3 deletions _meta/beat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,11 +396,18 @@ apm-server:
#---------------------------- APM Server - Open Telemetry Collector integration ----------------------------

#jaeger:
# Enable jaeger collector listening for traces sent from jaeger agent via gRPC. Disabled by default.
#enabled: false
#grpc:
# Defines the gRPC host and port the server is listening on. Defaults to Jaeger collector default port 14250.
# 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 =================================

Expand Down
13 changes: 10 additions & 3 deletions apm-server.docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,11 +396,18 @@ apm-server:
#---------------------------- APM Server - Open Telemetry Collector integration ----------------------------

#jaeger:
# Enable jaeger collector listening for traces sent from jaeger agent via gRPC. Disabled by default.
#enabled: false
#grpc:
# Defines the gRPC host and port the server is listening on. Defaults to Jaeger collector default port 14250.
# 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 =================================

Expand Down
13 changes: 10 additions & 3 deletions apm-server.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,11 +396,18 @@ apm-server:
#---------------------------- APM Server - Open Telemetry Collector integration ----------------------------

#jaeger:
# Enable jaeger collector listening for traces sent from jaeger agent via gRPC. Disabled by default.
#enabled: false
#grpc:
# Defines the gRPC host and port the server is listening on. Defaults to Jaeger collector default port 14250.
# 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: "localhost: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: "localhost:14268"

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

Expand Down
96 changes: 0 additions & 96 deletions beater/api/jaeger/grpc.go
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions beater/api/jaeger/grpc_approval_test.go
View file
Open in desktop

This file was deleted.

Loading