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

Move rate limiting and service name restrictions out of processor/stream #5492

Merged
merged 8 commits into from
Jun 19, 2021

Conversation

axw
Copy link
Member

@axw axw commented Jun 18, 2021

Motivation/summary

Move rate limiting and service name restrictions out of processor/stream, up into beater/api. These are cross-cutting, and separating them out means we both simplify processor/stream and make progress towards making the logic reusable for processor/otel.

How to test these changes

Non-functional change.

Related issues

Part of #5347

axw added 3 commits June 18, 2021 12:33
... and into beater/api/intake, injected into
the stream processor as a batch processor. This
paves the way for taking a similar approach for
otel.
Unexport some things that are no longer needed for tests.
... and into beater/api, injected into the stream
processor as a batch processor. This paves the way
for taking a similar approach for otel.
@axw axw added the v7.14.0 label Jun 18, 2021
@apmmachine
Copy link
Contributor

apmmachine commented Jun 18, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #5492 updated

  • Start Time: 2021-06-19T02:18:12.589+0000

  • Duration: 40 min 39 sec

  • Commit: d3d4a9b

Test stats 🧪

Test Results
Failed 0
Passed 6134
Skipped 120
Total 6254

Trends 🧪

Image of Build Times

Image of Tests

@axw axw marked this pull request as ready for review June 18, 2021 06:11
@axw axw requested a review from a team June 18, 2021 06:12
Rate limit after reading but before processing.
Simpler and in line with what we will do for OTel.
@axw axw requested a review from simitt June 18, 2021 13:04
@axw axw enabled auto-merge (squash) June 19, 2021 02:17
@axw axw merged commit f5664d8 into elastic:master Jun 19, 2021
@axw axw deleted the processor-stream-extraction branch June 19, 2021 02:58
mergify bot pushed a commit that referenced this pull request Jun 19, 2021
…eam (#5492)

* Move rate-limiting out of processor/stream

... and into beater/api/intake, injected into
the stream processor as a batch processor. This
paves the way for taking a similar approach for
otel.

* processor/stream: unexport some things

Unexport some things that are no longer needed for tests.

* Move allowed service names out of processor/stream

... and into beater/api, injected into the stream
processor as a batch processor. This paves the way
for taking a similar approach for otel.

* beater/api/intake: revise rate-limiting

Rate limit after reading but before processing.
Simpler and in line with what we will do for OTel.

* Remove stale comment

* Reinstate initial Allow

* beater/api/intake: add missing return

(cherry picked from commit f5664d8)
axw added a commit that referenced this pull request Jun 20, 2021
…eam (#5492) (#5497)

* Move rate-limiting out of processor/stream

... and into beater/api/intake, injected into
the stream processor as a batch processor. This
paves the way for taking a similar approach for
otel.

* processor/stream: unexport some things

Unexport some things that are no longer needed for tests.

* Move allowed service names out of processor/stream

... and into beater/api, injected into the stream
processor as a batch processor. This paves the way
for taking a similar approach for otel.

* beater/api/intake: revise rate-limiting

Rate limit after reading but before processing.
Simpler and in line with what we will do for OTel.

* Remove stale comment

* Reinstate initial Allow

* beater/api/intake: add missing return

(cherry picked from commit f5664d8)

Co-authored-by: Andrew Wilkins <[email protected]>
stuartnelson3 pushed a commit to stuartnelson3/apm-server that referenced this pull request Jun 22, 2021
…eam (elastic#5492)

* Move rate-limiting out of processor/stream

... and into beater/api/intake, injected into
the stream processor as a batch processor. This
paves the way for taking a similar approach for
otel.

* processor/stream: unexport some things

Unexport some things that are no longer needed for tests.

* Move allowed service names out of processor/stream

... and into beater/api, injected into the stream
processor as a batch processor. This paves the way
for taking a similar approach for otel.

* beater/api/intake: revise rate-limiting

Rate limit after reading but before processing.
Simpler and in line with what we will do for OTel.

* Remove stale comment

* Reinstate initial Allow

* beater/api/intake: add missing return
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants