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

packetbeat/beater: help the GC clean up the Npcap installer if it's not used #30513

Merged
merged 1 commit into from
Feb 22, 2022

Conversation

efd6
Copy link
Contributor

@efd6 efd6 commented Feb 22, 2022

What does this PR do?

The installer bytes are released in the install case but this was accidentally removed in #30048. This frees ~1MB of runtime memory after start up has been completed.

The change is not critical, but it would be nice to have in 8.1.

Why is it important?

Reduces memory footprint of the beat.

Checklist

  • My code follows the style guidelines of this project
    - [ ] I have commented my code, particularly in hard-to-understand areas
    - [ ] I have made corresponding changes to the documentation
    - [ ] I have made corresponding change to the default configuration files
    - [ ] I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

  • Note that the same action happens as a deferred operation in the install path below this change when the temp file is removed.

defer func() {
// The init sequence duplicates the embedded binary.
// Get rid of the part we can. The remainder is in
// the packetbeat text section as a string.
npcap.Installer = nil
// Remove the installer from the file system.
os.RemoveAll(tmp)
}()

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

…ot used

The installer bytes are released in the install case but this was accidentally
removed in elastic#30048. This frees ~1MB of runtime memory after start up has been
completed.
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Feb 22, 2022
@mergify mergify bot assigned efd6 Feb 22, 2022
@efd6
Copy link
Contributor Author

efd6 commented Feb 22, 2022

/test

@elasticmachine
Copy link
Collaborator

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2022-02-22T21:32:02.563+0000

  • Duration: 85 min 41 sec

Test stats 🧪

Test Results
Failed 0
Passed 3328
Skipped 36
Total 3364

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@efd6 efd6 merged commit d76e445 into elastic:main Feb 22, 2022
@efd6 efd6 deleted the noninstallcleanup branch February 22, 2022 22:58
mergify bot pushed a commit that referenced this pull request Feb 22, 2022
…ot used (#30513)

The installer bytes are released in the install case but this was accidentally
removed in #30048. This frees ~1MB of runtime memory after start up has been
completed.

(cherry picked from commit d76e445)
efd6 added a commit that referenced this pull request Feb 23, 2022
…ot used (#30513) (#30546)

The installer bytes are released in the install case but this was accidentally
removed in #30048. This frees ~1MB of runtime memory after start up has been
completed.

(cherry picked from commit d76e445)

Co-authored-by: Dan Kortschak <90160302+efd6@users.noreply.github.com>
v1v added a commit that referenced this pull request Mar 2, 2022
…-29710

* '8.1' of github.com:elastic/beats: (51 commits)
  refactor pushDockerImages (#30414) (#30624)
  ci: add windows-2022 in the extended meta-stage (#30528) (#30630)
  Curate k8s testing versions to only keep the actively maintained (#30619) (#30625)
  [8.1](backport #30355) Add Beats upgrade docs for 8.0 (#30612)
  Remove references to gcp from the Functionbeat docs (#30579) (#30609)
  x-pack/auditbeat/module/system/socket: defend against exec with zero arguments (#30586) (#30597)
  [MySQL Enterprise] Adding default paths values to manifest.yml (#30598) (#30604)
  metricbeat - fix elasticsearch and kibana integration tests failures in 8.0 (#30566) (#30594)
  Install gawk as a replacement for mawk in Docker containers. (#30452) (#30465)
  [Filebeat] Remove RecordedFuture dataset from Threat Intel module (#30564) (#30568)
  Adjust the documentation of `backoff` options in filestream input (#30552) (#30557)
  packetbeat/beater: help the GC clean up the Npcap installer if it's not used (#30513) (#30546)
  Osquerybeat: Add install verification for osquerybeat (#30388) (#30404)
  Update docker/distribution to 2.8.0 (#30462) (#30540)
  Add `parsers` examples to `filestream` reference configuration (#30529) (#30537)
  [8.1](backport #30068) ZooKeeper module: Adapt to ZooKeeper 3.6+ `mntr` response fields' changes. (#30360)
  [8.1](backport #30512) Switch skip to use `CI` (#30525)
  Forward-port 8.0.1 changelog to 8.1 (#30517)
  packetbeat/beater: don't attempt to install npcap when already installed (#30509) (#30511)
  Add drop and explicit tests to avoid duplicate ingest of elasticsearch logs (#30440) (#30488)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants