[exporter/syslog]: fix setting network connection #31202
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andrzej-stencel
approved these changes
Feb 13, 2024
kasia-kujawa
force-pushed
the
kkujawa-fix-31130
branch
from
5de5123
to
9d54ac1
Compare
| @@ -78,8 +78,8 @@ func (s *sender) dial() error { | |||
| s.conn = nil | |||
| } | |||
| var err error | |||
| if s.tlsConfig != nil { | |||
| s.conn, err = tls.Dial("tcp", s.addr, s.tlsConfig) | |||
| if s.tlsConfig != nil && s.network == "tcp" { | |||
There was a problem hiding this comment.
nit: maybe a constant for "tcp" would be ideal
There was a problem hiding this comment.
I'll open a new pull request to change tcp/udp strings into constants, we use these strings in several places.
rnishtala-sumo
approved these changes
Feb 16, 2024
andrzej-stencel
added
the
ready to merge
This was referenced Feb 20, 2024
kasia-kujawa
force-pushed
the
kkujawa-fix-31130
branch
from
3619478
to
0c38e5d
Compare
do not load TLS configuration for UDP Signed-off-by: Katarzyna Kujawa <kkujawa@sumologic.com>
kasia-kujawa
force-pushed
the
kkujawa-fix-31130
branch
from
0c38e5d
to
7d8072b
Compare
This was referenced Feb 27, 2024
dmitryax
approved these changes
Feb 27, 2024
XinRanZhAWS
pushed a commit
to XinRanZhAWS/opentelemetry-collector-contrib
that referenced
this pull request
Mar 13, 2024
**Description:** fix setting network connection, do not load TLS configuration for UDP **Link to tracking Issue:** open-telemetry#31130 **Testing:** unit test, manual tests with syslog server **Documentation:** added information that TLS config is applied only when TCP is used Signed-off-by: Katarzyna Kujawa <kkujawa@sumologic.com>
This was referenced Apr 10, 2024
codeboten
added a commit
that referenced
this pull request
May 1, 2024
use consts for network protocol names, changes were suggested in #31202 (comment) **Testing:** unit tests, manual tests with syslog server --------- Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description: fix setting network connection, do not load TLS configuration for UDP
Link to tracking Issue: #31130
Testing: unit test, manual tests with syslog server
Documentation: added information that TLS config is applied only when TCP is used