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

Jump to bottom

Fix jaeger receiver to honor TLS config #2866

Merged
merged 6 commits into from
Apr 20, 2021
Merged

Fix jaeger receiver to honor TLS config #2866

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3bcf919
Fix jaeger receiver HTTP to honor TLS config
dstdfx Mar 31, 2021
11f02a5
Update CHANGELOG.md
dstdfx Mar 31, 2021
f6f07e9
Use confighttp.HTTPServerSettings in receiver's configuration
dstdfx Apr 1, 2021
8793e63
Fix unittest
dstdfx Apr 1, 2021
67e69d9
Update CHANGELOG.md
dstdfx Apr 12, 2021
8d21bb0
Merge branch 'main' into honor-tls-jaeger-rcv
bogdandrutu Apr 20, 2021
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
Prev Previous commit
Next Next commit
Fix unittest 
Signed-off-by: Daniil Rutskiy <dstdfx@gmail.com>
  • Loading branch information
@dstdfx
dstdfx committed Apr 13, 2021
commit 8793e63173f6d9f18b5c338e0ff0116afff1f139
5 changes: 4 additions & 1 deletion receiver/jaegerreceiver/trace_receiver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,10 @@ func TestReception(t *testing.T) {
port := testutil.GetAvailablePort(t)
// 1. Create the Jaeger receiver aka "server"
config := &configuration{
CollectorHTTPPort: int(port), // that's the only one used by this test
CollectorHTTPPort: int(port),
CollectorHTTPSettings: confighttp.HTTPServerSettings{
Endpoint: fmt.Sprintf(":%d", port),
},
}
sink := new(consumertest.TracesSink)

Expand Down