-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
[confighttp] Apply MaxRequestBodySize to the result of a decompressed body #10289
Merged
mx-psi
merged 4 commits into
open-telemetry:main
from
jpkrohling:jpkrohling/apply-size-restriction-to-decompressed
Jun 3, 2024
Merged
[confighttp] Apply MaxRequestBodySize to the result of a decompressed body #10289
mx-psi
merged 4 commits into
open-telemetry:main
from
jpkrohling:jpkrohling/apply-size-restriction-to-decompressed
Jun 3, 2024
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
… body Signed-off-by: Juraci Paixão Kröhling <[email protected]>
MovieStoreGuy
approved these changes
Jun 3, 2024
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
MovieStoreGuy
approved these changes
Jun 3, 2024
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
Signed-off-by: Juraci Paixão Kröhling <[email protected]>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #10289 +/- ##
==========================================
+ Coverage 92.61% 92.65% +0.03%
==========================================
Files 386 386
Lines 18229 18232 +3
==========================================
+ Hits 16882 16892 +10
+ Misses 1002 996 -6
+ Partials 345 344 -1 ☔ View full report in Codecov by Sentry. |
mx-psi
approved these changes
Jun 3, 2024
Aneurysm9
added a commit
to aws-observability/aws-otel-collector
that referenced
this pull request
Jun 5, 2024
Upstream changes to address potential decompression-related failures in the `confighttp` and `configgrpc` modules are backported. See open-telemetry/opentelemetry-collector#10289 and open-telemetry/opentelemetry-collector#10323 for more details. Signed-off-by: Anthony J Mirabella <[email protected]>
Aneurysm9
added a commit
to aws-observability/aws-otel-collector
that referenced
this pull request
Jun 6, 2024
Upstream changes to address potential decompression-related failures in the `confighttp` and `configgrpc` modules are backported. See open-telemetry/opentelemetry-collector#10289 and open-telemetry/opentelemetry-collector#10323 for more details. Signed-off-by: Anthony J Mirabella <[email protected]>
Aneurysm9
added a commit
to aws-observability/aws-otel-collector
that referenced
this pull request
Jun 6, 2024
Upstream changes to address potential decompression-related failures in the `confighttp` and `configgrpc` modules are backported. See open-telemetry/opentelemetry-collector#10289 and open-telemetry/opentelemetry-collector#10323 for more details. Signed-off-by: Anthony J Mirabella <[email protected]>
steves-canva
pushed a commit
to Canva/opentelemetry-collector
that referenced
this pull request
Jun 14, 2024
… body (open-telemetry#10289) This change applies a restriction on the size of the decompressed payload. Before this change, this is the result of the test added in this PR: ``` --- FAIL: TestServerWithDecompression (0.03s) /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/confighttp_test.go:1327: Error Trace: /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/confighttp_test.go:1327 /usr/lib/golang/src/net/http/server.go:2166 /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/compression.go:163 /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/confighttp.go:455 /usr/lib/golang/src/net/http/server.go:2166 /home/jpkroehling/go/pkg/mod/go.opentelemetry.io/contrib/instrumentation/net/http/[email protected]/handler.go:212 /home/jpkroehling/go/pkg/mod/go.opentelemetry.io/contrib/instrumentation/net/http/[email protected]/handler.go:73 /usr/lib/golang/src/net/http/server.go:2166 /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/clientinfohandler.go:26 /usr/lib/golang/src/net/http/server.go:3137 /usr/lib/golang/src/net/http/server.go:2039 /usr/lib/golang/src/runtime/asm_amd64.s:1695 Error: An error is expected but got nil. Test: TestServerWithDecompression /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/confighttp_test.go:1328: Error Trace: /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/confighttp_test.go:1328 /usr/lib/golang/src/net/http/server.go:2166 /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/compression.go:163 /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/confighttp.go:455 /usr/lib/golang/src/net/http/server.go:2166 /home/jpkroehling/go/pkg/mod/go.opentelemetry.io/contrib/instrumentation/net/http/[email protected]/handler.go:212 /home/jpkroehling/go/pkg/mod/go.opentelemetry.io/contrib/instrumentation/net/http/[email protected]/handler.go:73 /usr/lib/golang/src/net/http/server.go:2166 /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/clientinfohandler.go:26 /usr/lib/golang/src/net/http/server.go:3137 /usr/lib/golang/src/net/http/server.go:2039 /usr/lib/golang/src/runtime/asm_amd64.s:1695 Error: Test: TestServerWithDecompression /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/confighttp_test.go:1357: Error Trace: /home/jpkroehling/Projects/src/github.com/open-telemetry/opentelemetry-collector/config/confighttp/confighttp_test.go:1357 Error: Not equal: expected: 200 actual : 400 Test: TestServerWithDecompression FAIL FAIL go.opentelemetry.io/collector/config/confighttp 0.036s FAIL ``` Signed-off-by: Juraci Paixão Kröhling <[email protected]> --------- Signed-off-by: Juraci Paixão Kröhling <[email protected]>
This was referenced Jul 26, 2024
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.
This change applies a restriction on the size of the decompressed payload. Before this change, this is the result of the test added in this PR:
Signed-off-by: Juraci Paixão Kröhling [email protected]