Fix: message size check in timeout test (#1014)

Fix message size check in `TestMessageTimeoutReached`. Since the message parser has parsed two packets of size 63 << 10, then the message size should be 63 << 11

.github/dependabot.yaml

@@ -8,14 +8,3 @@ updates:
     pull-request-branch-name:
       # Separate sections of the branch name with a hyphen
       separator: "-"
-
-  - package-ecosystem: "gomod"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-      
-  - package-ecosystem: "docker"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-      

.github/workflows/ci-docker.yaml

@@ -8,13 +8,13 @@ jobs:
     steps:
       -
         name: "Checkout repository"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       -
         name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v1
       -
         name: "Cache Docker layers"
-        uses: actions/cache@v3.0.5
+        uses: actions/cache@v2
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -28,7 +28,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: "Build and push docker image"
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v2
         with:
           context: .
           push: true

.github/workflows/ci-test.yaml

@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.18.x, 1.19.x] # two latest minor versions
+        go-version: [1.15.x, 1.16.x] # two latest minor versions
     runs-on: ubuntu-latest
     steps:
     - name: update package index
@@ -16,8 +16,8 @@ jobs:
       with:
         go-version: ${{ matrix.go-version }}
     - name: checkout code
-      uses: actions/checkout@v3
-    - uses: actions/cache@v3.0.5
+      uses: actions/checkout@v2
+    - uses: actions/cache@v2
       with:
         path: |
           ~/go/pkg/mod              # Module download cache

.github/workflows/codesee-arch-diagram.yml

@@ -1,23 +0,0 @@
-# This workflow was added by CodeSee. Learn more at https://codesee.io/
-# This is v2.0 of this workflow file
-on:
-  push:
-    branches:
-      - master
-  pull_request_target:
-    types: [opened, synchronize, reopened]
-
-name: CodeSee
-
-permissions: read-all
-
-jobs:
-  codesee:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    name: Analyze the repo with CodeSee
-    steps:
-      - uses: Codesee-io/codesee-action@v2
-        with:
-          codesee-token: ${{ secrets.CODESEE_ARCH_DIAG_API_TOKEN }}
-          codesee-url: https://app.codesee.io

.github/workflows/probe.yaml

@@ -1,38 +0,0 @@
-name: AI Comment Handler
-
-
-on:
-  pull_request:
-    types: [opened] #[opened , labeled]
-  issue_comment:
-    types: [created]          
-  issues:
-    types: [opened] #[opened, labeled]  
-    
-# Define permissions needed for the workflow
-permissions:
-  issues: write
-  pull-requests: write
-  contents: read
-
-jobs:
-  trigger_probe_chat:
-    # Uncomment if you want to run on on specific lables, in this example `probe`
-    # if: |
-    #   (github.event_name == 'pull_request' && github.event.action == 'opened') || 
-    #   (github.event_name == 'issues' && github.event.action == 'opened') || 
-    #   (github.event_name == 'issue_comment' && github.event.action == 'created') || 
-    #   ((github.event_name == 'pull_request' || github.event_name == 'issues') && 
-    #    github.event.action == 'labeled' && github.event.label.name == 'probe')
-    # Use the reusable workflow from your repository (replace <your-org/repo> and <ref>)
-    uses: buger/probe/.github/workflows/probe.yml@main
-    # Pass required inputs
-    with:
-      command_prefix: "/probe" # Or '/ai', '/ask', etc.
-      # Optionally override the default npx command if the secret isn't set
-      # default_probe_chat_command: 'node path/to/custom/script.js'
-    # Pass ALL secrets from this repository to the reusable workflow
-    # This includes GITHUB_TOKEN, PROBE_CHAT_COMMAND (if set), ANTHROPIC_API_KEY, etc.
-    secrets:
-      ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-      ANTHROPIC_API_URL: ${{ secrets.ANTHROPIC_API_URL }}

.github/workflows/semgrep.yml

@@ -1,23 +0,0 @@
-on:
-  pull_request: {}
-  push:
-    branches:
-    - main
-    - master
-    paths:
-    - .github/workflows/semgrep.yml
-  schedule:
-  # random HH:MM to avoid a load spike on GitHub Actions at 00:00
-  - cron: 53 23 * * *
-name: Semgrep
-jobs:
-  semgrep:
-    name: Scan
-    runs-on: ubuntu-20.04
-    env:
-      SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
-    container:
-      image: returntocorp/semgrep
-    steps:
-    - uses: actions/checkout@v3
-    - run: semgrep ci

.gitignore

@@ -11,11 +11,9 @@ vendor
 hey
 
 *.bin
-lib/
-output/
+
 *.gz
 *.zip
-.aider*
 
 *.class
 
@@ -34,4 +32,3 @@ goreplay
 corpus
 crashers
 suppressions
-dist

COMM-LICENSE

@@ -2,7 +2,7 @@ END-USER LICENSE AGREEMENT
 
 ------------------------------------------------------------------------------
 
-IMPORTANT: THIS SOFTWARE END-USER LICENSE AGREEMENT ("EULA") IS A LEGAL AGREEMENT (“Agreement”) BETWEEN YOU (THE CUSTOMER, EITHER AS AN INDIVIDUAL OR, IF PURCHASED OR OTHERWISE ACQUIRED BY OR FOR AN ENTITY, AS AN ENTITY), hereafter "Customer", AND Replay Software LLC ("Licensor"). READ IT CAREFULLY BEFORE COMPLETING THE INSTALLATION PROCESS AND USING GOREPLAY PRO AND RELATED SOFTWARE COMPONENTS (“SOFTWARE”). IT PROVIDES A LICENSE TO USE THE SOFTWARE AND CONTAINS WARRANTY INFORMATION AND LIABILITY DISCLAIMERS. BY INSTALLING AND USING THE SOFTWARE, YOU ARE CONFIRMING YOUR ACCEPTANCE OF THE SOFTWARE AND AGREEING TO BECOME BOUND BY THE TERMS OF THIS AGREEMENT.
+IMPORTANT: THIS SOFTWARE END-USER LICENSE AGREEMENT ("EULA") IS A LEGAL AGREEMENT (“Agreement”) BETWEEN YOU (THE CUSTOMER, EITHER AS AN INDIVIDUAL OR, IF PURCHASED OR OTHERWISE ACQUIRED BY OR FOR AN ENTITY, AS AN ENTITY) AND GoReplay LLC. READ IT CAREFULLY BEFORE COMPLETING THE INSTALLATION PROCESS AND USING GOREPLAY PRO AND RELATED SOFTWARE COMPONENTS (“SOFTWARE”). IT PROVIDES A LICENSE TO USE THE SOFTWARE AND CONTAINS WARRANTY INFORMATION AND LIABILITY DISCLAIMERS. BY INSTALLING AND USING THE SOFTWARE, YOU ARE CONFIRMING YOUR ACCEPTANCE OF THE SOFTWARE AND AGREEING TO BECOME BOUND BY THE TERMS OF THIS AGREEMENT.
 
 ------------------------------------------------------------------------------
 
@@ -14,17 +14,17 @@ In order to use the Software under this Agreement, you must receive a “Source
 
 1.2 Unlimited Organization License. If you purchased an Organization License (included with the GoReplay Pro Software), you may install the Software on an unlimited number of Hosts. “Host” means any physical or virtual machine which is controlled by you. You may concurrently run the software on an unlimited number of Hosts.
 
-1.3 Appliance License. If you purchased an Appliance License, you may distribute the Software in any applications, frameworks, or elements (collectively referred to as an “Application” or “Applications”) that you develop using the Software in accordance with this EULA, provided that such distribution does not violate the restrictions set forth in section 3 of this EULA. You must not remove, obscure or interfere with any copyright, acknowledgment, attribution, trademark, warning or disclaimer statement affixed to, incorporated in or otherwise applied in connection with the Software. You are required to ensure that the Software is not reused by or with any applications other than those with which you distribute it as permitted herein. For example, if You install the Software on a customer’s server, that customer is not permitted to use the Software independently of your Application. You must inform Licensor of your knowledge of any infringing use of the Software by any of your customers. You are liable for compliance by those third parties with the terms and conditions of this EULA. You will not owe Licensor any royalties for your distribution of the Software in accordance with this EULA.
+1.3 Appliance License. If you purchased an Appliance License, you may distribute the Software in any applications, frameworks, or elements (collectively referred to as an “Application” or “Applications”) that you develop using the Software in accordance with this EULA, provided that such distribution does not violate the restrictions set forth in section 3 of this EULA. You must not remove, obscure or interfere with any copyright, acknowledgment, attribution, trademark, warning or disclaimer statement affixed to, incorporated in or otherwise applied in connection with the Software. You are required to ensure that the Software is not reused by or with any applications other than those with which you distribute it as permitted herein. For example, if You install the Software on a customer’s server, that customer is not permitted to use the Software independently of your Application. You must inform GoReplay LLC of your knowledge of any infringing use of the Software by any of your customers. You are liable for compliance by those third parties with the terms and conditions of this EULA. You will not owe GoReplay LLC any royalties for your distribution of the Software in accordance with this EULA.
 
 1.4 Archive Copies. You are entitled to make a reasonable amount of copies of the Software for archival purposes. Each copy must reproduce all copyright and other proprietary rights notices on or in the Software Product.
 
 1.5 Electronic Delivery. All Software and license documentation shall be delivered by electronic means unless otherwise specified on the applicable invoice or at the time of purchase. Software shall be deemed delivered when it is made available for download by you (“Delivery”).        
 
-2. Modifications. Licensor shall provide you with source code so that you can create Modifications of the original software. “Modification” means: (a) any addition to or deletion from the contents of a file included in the original Software or previous Modifications created by You, or (b) any new file that contains any part of the original Software or previous Modifications. While you retain all rights to any original work authored by you as part of the Modifications, We continue to own all copyright and other intellectual property rights in the Software.
+2. Modifications. GoReplay LLC shall provide you with source code so that you can create Modifications of the original software. “Modification” means: (a) any addition to or deletion from the contents of a file included in the original Software or previous Modifications created by You, or (b) any new file that contains any part of the original Software or previous Modifications. While you retain all rights to any original work authored by you as part of the Modifications, We continue to own all copyright and other intellectual property rights in the Software.
 
 3. Restricted Uses. 
 
-3.1 You shall not (and shall not allow any third party to): (a) decompile, disassemble, or otherwise reverse engineer the Software or attempt to reconstruct or discover any source code, underlying ideas, algorithms, file formats or programming interfaces of the Software by any means whatsoever (except and only to the extent that applicable law prohibits or restricts reverse engineering restrictions); (b) distribute, sell, sublicense, rent, lease or use the Software for time sharing, hosting, service provider or like purposes, except as expressly permitted under this Agreement; (c) redistribute the Software or Modifications other than by including the Software or a portion thereof within your own product, which must have substantially different functionality than the Software or Modifications and must not allow any third party to use the Software or Modifications, or any portions thereof, for software development or application development purposes; (d) redistribute the Software as part of a product, "appliance" or "virtual server"; (e) redistribute the Software on any server which is not directly under your control; (f) remove any product identification, proprietary, copyright or other notices contained in the Software; (g) modify any part of the Software, create a derivative work of any part of the Software (except as permitted in Section 4), or incorporate the Software, except to the extent expressly authorized in writing by Licensor; (h) publicly disseminate performance information or analysis (including, without limitation, benchmarks) from any source relating to the Software; (i) utilize any equipment, device, software, or other means designed to circumvent or remove any form of Source URL or copy protection used by Licensor in connection with the Software, or use the Software together with any authorization code, Source URL, serial number, or other copy protection device not supplied by Licensor; (j) use the Software to develop a product which is competitive with any Licensor product offerings; or (k) use unauthorized Source URLS or keycode(s) or distribute or publish Source URLs or keycode(s), except as may be expressly permitted by Licensor in writing. If your unique Source URL is ever published, Licensor reserves the right to terminate your access without notice.
+3.1 You shall not (and shall not allow any third party to): (a) decompile, disassemble, or otherwise reverse engineer the Software or attempt to reconstruct or discover any source code, underlying ideas, algorithms, file formats or programming interfaces of the Software by any means whatsoever (except and only to the extent that applicable law prohibits or restricts reverse engineering restrictions); (b) distribute, sell, sublicense, rent, lease or use the Software for time sharing, hosting, service provider or like purposes, except as expressly permitted under this Agreement; (c) redistribute the Software or Modifications other than by including the Software or a portion thereof within your own product, which must have substantially different functionality than the Software or Modifications and must not allow any third party to use the Software or Modifications, or any portions thereof, for software development or application development purposes; (d) redistribute the Software as part of a product, "appliance" or "virtual server"; (e) redistribute the Software on any server which is not directly under your control; (f) remove any product identification, proprietary, copyright or other notices contained in the Software; (g) modify any part of the Software, create a derivative work of any part of the Software (except as permitted in Section 4), or incorporate the Software, except to the extent expressly authorized in writing by GoReplay LLC; (h) publicly disseminate performance information or analysis (including, without limitation, benchmarks) from any source relating to the Software; (i) utilize any equipment, device, software, or other means designed to circumvent or remove any form of Source URL or copy protection used by GoReplay LLC in connection with the Software, or use the Software together with any authorization code, Source URL, serial number, or other copy protection device not supplied by GoReplay LLC; (j) use the Software to develop a product which is competitive with any GoReplay LLC product offerings; or (k) use unauthorized Source URLS or keycode(s) or distribute or publish Source URLs or keycode(s), except as may be expressly permitted by GoReplay LLC in writing. If your unique Source URL is ever published, GoReplay LLC reserves the right to terminate your access without notice.
 
 3.2 UNDER NO CIRCUMSTANCES MAY YOU USE THE SOFTWARE AS PART OF A PRODUCT OR SERVICE THAT PROVIDES SIMILAR FUNCTIONALITY TO THE SOFTWARE ITSELF.
 
@@ -32,33 +32,35 @@ The Open Source version of the Software (“LGPL Version”) is licensed
 under the terms of the GNU Lesser General Public License versions 3.0
 (“LGPL”) and not under this EULA. 
 
-4. Ownership. Notwithstanding anything to the contrary contained herein, except for the limited license rights expressly provided herein, Licensor and its suppliers have and will retain all rights, title and interest (including, without limitation, all patent, copyright, trademark, trade secret and other intellectual property rights) in and to the Software and all copies, modifications and derivative works thereof (including any changes which incorporate any of your ideas, feedback or suggestions). You acknowledge that you are obtaining only a limited license right to the Software, and that irrespective of any use of the words “purchase”, “sale” or like terms hereunder no ownership rights are being conveyed to you under this Agreement or otherwise. 
+4. Ownership. Notwithstanding anything to the contrary contained herein, except for the limited license rights expressly provided herein, GoReplay LLC and its suppliers have and will retain all rights, title and interest (including, without limitation, all patent, copyright, trademark, trade secret and other intellectual property rights) in and to the Software and all copies, modifications and derivative works thereof (including any changes which incorporate any of your ideas, feedback or suggestions). You acknowledge that you are obtaining only a limited license right to the Software, and that irrespective of any use of the words “purchase”, “sale” or like terms hereunder no ownership rights are being conveyed to you under this Agreement or otherwise. 
 
-5. Fees and Payment. The Software license fees will be due and payable in full as set forth in the applicable invoice or at the time of purchase. If the Software does not function properly within two weeks of purchase, please contact us within those two weeks for a refund. You shall be responsible for all taxes, withholdings, duties and levies arising from the order (excluding taxes based on the net income of Licensor). 
+5. Fees and Payment. The Software license fees will be due and payable in full as set forth in the applicable invoice or at the time of purchase. If the Software does not function properly within two weeks of purchase, please contact us within those two weeks for a refund. You shall be responsible for all taxes, withholdings, duties and levies arising from the order (excluding taxes based on the net income of GoReplay LLC). 
 
 6. Support, Maintenance and Services. Subject to the terms and conditions of this Agreement, as set forth in your invoice, and as set forth on the GoReplay Pro support page (https://github.com/buger/goreplay/wiki/Pro-Support), support and maintenance services may be included with the purchase of your license subscription.
 
 7. Term of Agreement. 
 
-7.1 Term. This Agreement is effective as of the Delivery of the Software and expires at such time as all license and service subscriptions hereunder have expired in accordance with their own terms (the “Term”). For clarification, the term of your license under this Agreement may be perpetual, limited for Evaluation Version, or designated as a fixed-term license in the Invoice, and shall be specified at your time of purchase. Either party may terminate this Agreement (including all related Invoices) if the other party: (a) fails to cure any material breach of this Agreement within thirty (30) days after written notice of such breach, provided that Licensor may terminate this Agreement immediately upon any breach of Section 3 or if you exceed any other restrictions contained in Section 1, unless otherwise specified in this agreement; (b) ceases operation without a successor; or (c) seeks protection under any bankruptcy, receivership, trust deed, creditors arrangement, composition or comparable proceeding, or if any such proceeding is instituted against such party (and not dismissed within sixty (60) days)). Termination is not an exclusive remedy and the exercise by either party of any remedy under this Agreement will be without prejudice to any other remedies it may have under this Agreement, by law, or otherwise.        
+7.1 Term. This Agreement is effective as of the Delivery of the Software and expires at such time as all license and service subscriptions hereunder have expired in accordance with their own terms (the “Term”). For clarification, the term of your license under this Agreement may be perpetual, limited for Evaluation Version, or designated as a fixed-term license in the Invoice, and shall be specified at your time of purchase. Either party may terminate this Agreement (including all related Invoices) if the other party: (a) fails to cure any material breach of this Agreement within thirty (30) days after written notice of such breach, provided that GoReplay LLC may terminate this Agreement immediately upon any breach of Section 3 or if you exceed any other restrictions contained in Section 1, unless otherwise specified in this agreement; (b) ceases operation without a successor; or (c) seeks protection under any bankruptcy, receivership, trust deed, creditors arrangement, composition or comparable proceeding, or if any such proceeding is instituted against such party (and not dismissed within sixty (60) days)). Termination is not an exclusive remedy and the exercise by either party of any remedy under this Agreement will be without prejudice to any other remedies it may have under this Agreement, by law, or otherwise.        
 
 7.2 Termination. Upon any termination of this Agreement, you shall cease any and all use of any Software and destroy all copies thereof. 
 
-7.3 Expiration of License. Upon the expiration of any term under this Agreement, (a) all Software updates and services pursuant to the license shall cease, (b) you may only continue to run existing installations of the Software, (c) you may not install the Software on any additional Hosts, and (d) any new installation of the Software shall require the purchase of a new license subscription from Licensor.
+7.3 Expiration of License. Upon the expiration of any term under this Agreement, (a) all Software updates and services pursuant to the license shall cease, (b) you may only continue to run existing installations of the Software, (c) you may not install the Software on any additional Hosts, and (d) any new installation of the Software shall require the purchase of a new license subscription from GoReplay LLC.
 
-8. Disclaimer of Warranties. The Software is provided "as is," with all faults, defects and errors, and without warranty of any kind. Licensor does not warrant that the Software will be free of bugs, errors, viruses or other defects, and Licensor shall have no liability of any kind for the use of or inability to use the Software, the Software content or any associated service, and you acknowledge that it is not technically practicable for Licensor to do so. 
-To the maximum extent permitted by applicable law, Licensor disclaims all warranties, express, implied, arising by law or otherwise, regarding the Software, the Software content and their respective performance or suitability for your intended use, including without limitation any implied warranty of merchantability, fitness for a particular purpose.
-Notwithstanding the foregoing, Licensor represents and warrants that it either owns the entire right to, title to, interest in, or has the right to license, the Software, and your proper use of the same will not violate any intellectual property or proprietary rights of another.
+8. Disclaimer of Warranties. The Software is provided "as is," with all faults, defects and errors, and without warranty of any kind. GoReplay LLC does not warrant that the Software will be free of bugs, errors, viruses or other defects, and GoReplay LLC shall have no liability of any kind for the use of or inability to use the Software, the Software content or any associated service, and you acknowledge that it is not technically practicable for GoReplay LLC to do so. 
+To the maximum extent permitted by applicable law, GoReplay LLC disclaims all warranties, express, implied, arising by law or otherwise, regarding the Software, the Software content and their respective performance or suitability for your intended use, including without limitation any implied warranty of merchantability, fitness for a particular purpose.
+Notwithstanding the foregoing, GoReplay LLC represents and warrants that it either owns the entire right to, title to, interest in, or has the right to license, the Software, and your proper use of the same will not violate any intellectual property or proprietary rights of another.
 
 9. Limitation of Liability. 
 
-In no event will either party be liable for any direct, indirect, consequential, incidental, special, exemplary, or punitive damages or liabilities whatsoever arising from or relating to the Software, the Software content or this Agreement, whether based on contract, tort (including negligence), strict liability or other theory, even if such party has been advised of the possibility of such damages. Except for indemnification obligations in Section 13.5, in no event will Licensor liability exceed the Software license price as indicated in the invoice. The existence of more than one claim will not enlarge or extend this limit.
+In no event will either party be liable for any direct, indirect, consequential, incidental, special, exemplary, or punitive damages or liabilities whatsoever arising from or relating to the Software, the Software content or this Agreement, whether based on contract, tort (including negligence), strict liability or other theory, even if such party has been advised of the possibility of such damages.
 
-10. Remedies. Your exclusive remedy and Licensor’ entire liability for breach of this Agreement shall be limited, at Licensor’ sole and exclusive discretion, to (a) replacement of any defective software or documentation; or (b) refund of the license fee paid to Licensor, payable in accordance with Licensor' refund policy.
+In no event will GoReplay LLC liability exceed the Software license price as indicated in the invoice. The existence of more than one claim will not enlarge or extend this limit.
+
+10. Remedies. Your exclusive remedy and GoReplay LLC’ entire liability for breach of this Agreement shall be limited, at GoReplay LLC’ sole and exclusive discretion, to (a) replacement of any defective software or documentation; or (b) refund of the license fee paid to GoReplay LLC, payable in accordance with GoReplay LLC' refund policy.
 
 11. Acknowledgements.
 
-11.1 Consent to the Use of Data. You agree that Licensor and its affiliates may collect and use technical information gathered as part of the product support services to be used in an anonymized manner. Licensor may use this information solely to improve products and services and will not disclose this information in a form that personally identifies you.
+11.1 Consent to the Use of Data. You agree that GoReplay LLC and its affiliates may collect and use technical information gathered as part of the product support services to be used in an anonymized manner. GoReplay LLC may use this information solely to improve products and services and will not disclose this information in a form that personally identifies you.
 
 11.2 Verification. We or a certified auditor acting on our behalf, may, upon its reasonable request and at its expense, audit you with respect to the use of the Software, subject to your reasonable information security and confidentiality protections. Such audit may be conducted by mail, electronic means or through an in-person visit to your place of business. Any such in-person audit shall be conducted during regular business hours at your facilities and shall not unreasonably interfere with your business activities. We shall not remove, copy, or redistribute any electronic material during the course of an audit. If an audit reveals that you are using the Software in a way that is in material violation of the terms of the EULA, then you shall pay our reasonable costs of conducting the audit. In the case of a material violation, you agree to pay Us any amounts owing that are attributable to the unauthorized use. In the alternative, We reserve the right, at our sole option, to terminate the licenses for the Software.
 
@@ -71,13 +73,13 @@ In no event will either party be liable for any direct, indirect, consequential,
 
 13.1 Entire Agreement. This Agreement sets forth our entire agreement with respect to the Software and the subject matter hereof and supersedes all prior and contemporaneous understandings and agreements whether written or oral.
 
-13.2 Amendment. Licensor reserves the right, in its sole discretion, to amend this Agreement from time. Amendments to this Agreement can be located at: https://github.com/buger/goreplay/blob/master/COMM-LICENSE.
+13.2 Amendment. GoReplay LLC reserves the right, in its sole discretion, to amend this Agreement from time. Amendments to this Agreement can be located at: https://github.com/buger/goreplay/blob/master/COMM-LICENSE.
 
-13.3 Assignment. You may not assign this Agreement or any of its rights under this Agreement without the prior written consent of Licensor and any attempted assignment without such consent shall be void.
+13.3 Assignment. You may not assign this Agreement or any of its rights under this Agreement without the prior written consent of GoReplay LLC and any attempted assignment without such consent shall be void.
 
 13.4 Export Compliance. Each party agrees to comply with all applicable laws and regulations, including laws, regulations, orders or other restrictions on export, re-export or redistribution of software.
 
-13.5 Indemnification. Licensor agrees to defend, indemnify, and hold harmless You from and against any lawsuits, claims, losses, damages, fines and expenses (including attorneys' fees and costs) arising out of a claim brought by a third-party alleging that the Software directly infringes such third-party’s intellectual property rights; provided that Licensor shall have no indemnity obligation for claims arising out of your modification to the Software. You agree to defend, indemnify, and hold harmless Licensor from and against any lawsuits, claims, losses, damages, fines and expenses (including attorneys' fees and costs) brought by a third-party arising out of your modifications to the Software or breach of this Agreement.
+13.5 Indemnification. You agree to defend, indemnify, and hold harmless GoReplay LLC from and against any lawsuits, claims, losses, damages, fines and expenses (including attorneys' fees and costs) arising out of your use of the Software or breach of this Agreement.
 
 13.6 Governing Law. This Agreement is governed by the laws of the State of Oregon and the United States without regard to conflicts of laws provisions thereof, and without regard to the United Nations Convention on the International Sale of Goods or the Uniform Computer Information Transactions Act, as currently enacted by any jurisdiction or as may be codified or amended from time to time by any jurisdiction. The jurisdiction and venue for actions related to the subject matter hereof shall be the state of Oregon and United States federal courts located in Portland, Oregon, and both parties hereby submit to the personal jurisdiction of such courts. 
 
@@ -89,4 +91,4 @@ In no event will either party be liable for any direct, indirect, consequential,
 
 13.10 Headings. The headings of sections and paragraphs of this Agreement are for convenience of reference only and are not intended to restrict, affect or be of any weight in the interpretation or construction of the provisions of such sections or paragraphs.
 
-14. Contact Information. If you have any questions about this EULA, or if you want to contact Licensor for any reason, please direct correspondence to hello@goreplay.org
+14. Contact Information. If you have any questions about this EULA, or if you want to contact GoReplay LLC for any reason, please direct correspondence to info@gortool.com

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.16 as builder
+FROM alpine:3.12 as builder
 
 ARG RELEASE_VERSION
 
@@ -7,6 +7,5 @@ RUN wget https://github.com/buger/goreplay/releases/download/${RELEASE_VERSION}/
 RUN tar xzf gor.tar.gz
 
 FROM scratch
-COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /gor .
 ENTRYPOINT ["./gor"]

Dockerfile.dev

@@ -1,20 +1,14 @@
-ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
+FROM golang:1.15
 
-RUN apk add --no-cache \
-    gcc \
-    g++ \
-    make \
-    linux-headers \
-    bison \
-    flex \
-    git \
-    wget
+RUN apt-get update && apt-get install ruby vim-common -y
 
+RUN apt-get install flex bison -y
 RUN wget http://www.tcpdump.org/release/libpcap-1.10.0.tar.gz && tar xzf libpcap-1.10.0.tar.gz && cd libpcap-1.10.0 && ./configure && make install
 
+RUN go get github.com/google/gopacket
+RUN go get -u golang.org/x/lint/golint
+
 WORKDIR /go/src/github.com/buger/goreplay/
 ADD . /go/src/github.com/buger/goreplay/
 
-RUN go get golang.org/x/lint/golint
 RUN go get

LICENSE.txt

@@ -3,7 +3,7 @@ Copyright (c) 2011-present Leonid Bugaev
 Portions of this software are licensed as follows:
 
 * All content residing under the "doc/" directory of this repository is licensed under "Creative Commons: CC BY-SA 4.0 license".
-* The file "pro.go" and all files ending with the "_pro.go" suffix are released under the commercial license specified in the "COMM-LICENSE" file.
+* Files with the following names "pro.go", "s3_reader.go", "output_s3.go" are released under the commercial license specified in "COMM-LICENSE" file.
 * Content outside of the above mentioned directories or restrictions above is available under the "LGPLv3" license as defined below.
 
 

Makefile

@@ -1,99 +1,82 @@
 SOURCE = $(shell ls -1 *.go | grep -v _test.go)
-PROJECT_NAME := goreplay
 SOURCE_PATH = /go/src/github.com/buger/goreplay/
 PORT = 8000
 FADDR = :8000
-DIST_PATH = dist
-CONTAINER_AMD=gor-amd64
-CONTAINER_ARM=gor-arm64
-RUN = docker run --rm -v `pwd`:$(SOURCE_PATH) -e AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID) -e AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY) -p 0.0.0.0:$(PORT):$(PORT) -t -i $(CONTAINER_AMD)
+CONTAINER=gor
+PREFIX=
+RUN = docker run -v `pwd`:$(SOURCE_PATH) -e AWS_ACCESS_KEY_ID=$(AWS_ACCESS_KEY_ID) -e AWS_SECRET_ACCESS_KEY=$(AWS_SECRET_ACCESS_KEY) -p 0.0.0.0:$(PORT):$(PORT) -t -i $(CONTAINER)
 BENCHMARK = BenchmarkRAWInput
 TEST = TestRawListenerBench
 BIN_NAME = gor
-VERSION := DEV-$(shell date +%s)
-CUSTOM_TAGS := --tags "ngo$(if $(CUSTOM_BUILD_TAGS), $(CUSTOM_BUILD_TAGS),)"
-LDFLAGS = -ldflags "-X main.VERSION=$(VERSION) -extldflags \"-static\" -X main.DEMO=$(DEMO)"
-MAC_LDFLAGS = -ldflags "-X main.VERSION=$(VERSION) -X main.DEMO=$(DEMO)"
-DOCKER_FPM_CMD := docker run --rm -t -v `pwd`:/src -w /src fleetdm/fpm
+VERSION = DEV-$(shell date +%s)
+LDFLAGS = -ldflags "-X main.VERSION=$(VERSION)$(PREFIX) -extldflags \"-static\" -X main.DEMO=$(DEMO)"
+MAC_LDFLAGS = -ldflags "-X main.VERSION=$(VERSION)$(PREFIX) -X main.DEMO=$(DEMO)"
+FADDR = ":8000"
 
-FPM_COMMON= \
-				--name $(PROJECT_NAME) \
-				--description "GoReplay is an open-source network monitoring tool which can record your live traffic, and use it for shadowing, load testing, monitoring and detailed analysis." \
-				-v $(VERSION) \
-				--vendor "Leonid Bugaev" \
-				-m "<support@goreplay.org>" \
-				--url "https://goreplay.org" \
-				-s dir
+FPMCOMMON= \
+    --name goreplay \
+    --description "GoReplay is an open-source network monitoring tool which can record your live traffic, and use it for shadowing, load testing, monitoring and detailed analysis." \
+    -v $(VERSION) \
+    --vendor "Leonid Bugaev" \
+    -m "<support@goreplay.org>" \
+    --url "https://goreplay.org" \
+    -s dir \
+    -C /tmp/gor-build \
 
-release: clean release-linux-amd64 release-linux-arm64 release-mac-amd64 release-mac-arm64 release-windows
+release: release-x64 release-x86 release-mac release-windows
 
-.PHONY: vendor
 vendor:
 	go mod vendor
 
-release-bin-linux-amd64: vendor
-	docker run --platform linux/amd64 --rm -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=amd64 -i $(CONTAINER_AMD) go build -mod=vendor -o $(BIN_NAME) $(CUSTOM_TAGS) $(LDFLAGS) ./cmd/gor/
+release-bin: vendor
+	docker run --rm -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=amd64  -i $(CONTAINER) go build -mod=vendor -o $(BIN_NAME) -tags netgo $(LDFLAGS)
 
-release-bin-linux-arm64: vendor
-	docker run --platform linux/arm64 --rm -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=arm64 -i $(CONTAINER_ARM) go build -mod=vendor -o $(BIN_NAME) $(CUSTOM_TAGS) $(LDFLAGS) ./cmd/gor/
+release-bin-x64: vendor
+	docker run --rm -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=386 -i $(CONTAINER) go build -mod=vendor -o $(BIN_NAME) -tags netgo $(LDFLAGS)
 
-release-bin-mac-amd64: vendor
-	GOOS=darwin go build -mod=vendor -o $(BIN_NAME) $(CUSTOM_TAGS) $(MAC_LDFLAGS) ./cmd/gor/
-
-release-bin-mac-arm64: vendor
-	GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 go build -mod=vendor -o $(BIN_NAME) $(CUSTOM_TAGS) $(MAC_LDFLAGS)
+release-bin-mac: vendor
+	GOOS=darwin go build -mod=vendor -o $(BIN_NAME) $(MAC_LDFLAGS)
 
 release-bin-windows: vendor
-	docker run -it --rm -v `pwd`:$(SOURCE_PATH) -w $(SOURCE_PATH) -e CGO_ENABLED=1 docker.elastic.co/beats-dev/golang-crossbuild:1.19.2-main --build-cmd "make VERSION=$(VERSION) CUSTOM_BUILD_TAGS=$(CUSTOM_BUILD_TAGS) build" -p "windows/amd64" ./cmd/gor/
-	mv $(BIN_NAME) "$(BIN_NAME).exe"
+	docker run -it --rm -v `pwd`:$(SOURCE_PATH) -w $(SOURCE_PATH) -e CGO_ENABLED=1 docker.elastic.co/beats-dev/golang-crossbuild:1.16.4-main --build-cmd "make VERSION=$(VERSION) build" -p "windows/amd64"
 
-release-linux-amd64: dist release-bin-linux-amd64
-	tar -czf $(DIST_PATH)/gor_$(VERSION)_linux_amd64.tar.gz $(BIN_NAME)
-	$(DOCKER_FPM_CMD) $(FPM_COMMON) -f -t deb -a arm64 -p ./$(DIST_PATH) ./gor=/usr/local/bin
-	$(DOCKER_FPM_CMD) $(FPM_COMMON) -f -t rpm -a arm64 -p ./$(DIST_PATH) ./gor=/usr/local/bin
-	rm -rf $(BIN_NAME)
+release-x64: release-bin
+	tar -czf gor_$(VERSION)$(PREFIX)_x64.tar.gz $(BIN_NAME)
+	mkdir -p /tmp/gor-build
+	mv ./$(BIN_NAME) /tmp/gor-build/$(BIN_NAME)
+	cd /tmp/gor-build
+	rm -f goreplay_$(VERSION)_amd64.deb
+	rm -f goreplay-$(VERSION)-1.x86_64.rpm
+	fpm $(FPMCOMMON) -a amd64 -t deb ./=/usr/local/bin
+	fpm $(FPMCOMMON) -a amd64 -t rpm ./=/usr/local/bin
+	rm -rf /tmp/gor-build
 
-release-linux-arm64: dist release-bin-linux-arm64
-	tar -czf $(DIST_PATH)/gor_$(VERSION)_linux_arm64.tar.gz $(BIN_NAME)
-	$(DOCKER_FPM_CMD) $(FPM_COMMON) -f -t deb -a arm64 -p ./$(DIST_PATH) ./gor=/usr/local/bin
-	$(DOCKER_FPM_CMD) $(FPM_COMMON) -f -t rpm -a arm64 -p ./$(DIST_PATH) ./gor=/usr/local/bin
-	rm -rf $(BIN_NAME)
+release-x86: release-bin-x64
+	tar -czf gor_$(VERSION)$(PREFIX)_x86.tar.gz $(BIN_NAME)
+	rm $(BIN_NAME)
 
-release-mac-amd64: dist release-bin-mac-amd64
-	tar -czf $(DIST_PATH)/gor_$(VERSION)_darwin_amd64.tar.gz $(BIN_NAME)
-	fpm $(FPM_COMMON) -f -t osxpkg -a amd64 -p ./$(DIST_PATH) ./gor=/usr/local/bin
-	mv ./$(DIST_PATH)/$(PROJECT_NAME)-$(VERSION).pkg ./$(DIST_PATH)/$(PROJECT_NAME)-$(VERSION)-amd64.pkg
-	rm -rf $(BIN_NAME)
+release-mac: release-bin-mac
+	tar -czf gor_$(VERSION)$(PREFIX)_mac.tar.gz $(BIN_NAME)
+	mkdir -p /tmp/gor-build
+	mv ./$(BIN_NAME) /tmp/gor-build/$(BIN_NAME)
+	cd /tmp/gor-build
+	rm -f goreplay-$(VERSION).pkg
+	fpm $(FPMCOMMON) -a amd64 -t osxpkg ./=/usr/local/bin
+	rm -rf /tmp/gor-build
 
-release-mac-arm64: dist release-bin-mac-arm64
-	tar -czf $(DIST_PATH)/gor_$(VERSION)_darwin_arm64.tar.gz $(BIN_NAME)
-	fpm $(FPM_COMMON) -f -t osxpkg -a arm64 -p ./$(DIST_PATH) ./gor=/usr/local/bin
-	mv ./$(DIST_PATH)/$(PROJECT_NAME)-$(VERSION).pkg ./$(DIST_PATH)/$(PROJECT_NAME)-$(VERSION)-arm64.pkg
-	rm -rf $(BIN_NAME)
-
-release-windows: dist release-bin-windows
-	zip $(DIST_PATH)/gor-$(VERSION)_windows.zip "$(BIN_NAME).exe"
-	rm -rf "$(BIN_NAME).exe"
-
-clean:
-	rm -rf $(DIST_PATH)
+release-windows: release-bin-windows
+	mv ./gor ./gor.exe
+	zip gor-$(VERSION)$(PREFIX)_windows.zip ./gor.exe
+	rm -rf ./gor.exe
 
 build:
-	go build -mod=vendor -o $(BIN_NAME) $(CUSTOM_TAGS) $(LDFLAGS)
+	go build -mod=vendor -o $(BIN_NAME) $(LDFLAGS)
 
 install:
-	go install $(CUSTOM_TAGS) $(MAC_LDFLAGS)
+	go install $(MAC_LDFLAGS)
 
-build-env: build-amd64-env build-arm64-env
-
-build-amd64-env:
-	docker buildx build --build-arg BASE_IMAGE=golang:1.22-alpine --platform linux/amd64 -t $(CONTAINER_AMD) -f Dockerfile.dev --load .
-
-build-arm64-env:
-	docker buildx build --build-arg BASE_IMAGE=arm64v8/golang:1.22-alpine --platform linux/arm64 -t $(CONTAINER_ARM) -f Dockerfile.dev --load .
-
-build-docker:
-	docker build -t gor-dev -f Dockerfile .
+build-env:
+	docker build -t $(CONTAINER) -f Dockerfile.dev .
 
 profile:
 	go build && ./$(BIN_NAME) --output-http="http://localhost:9000" --input-dummy 0 --input-raw :9000 --input-http :9000 --memprofile=./mem.out --cpuprofile=./cpu.out --stats --output-http-stats --output-http-timeout 100ms
@@ -105,13 +88,13 @@ race:
 	$(RUN) go test ./... $(ARGS) -v -race -timeout 15s
 
 test:
-	$(RUN) go test ./. -timeout 120s $(CUSTOM_TAGS) $(LDFLAGS) $(ARGS)  -v
+	$(RUN) go test ./. -timeout 120s $(LDFLAGS) $(ARGS)  -v
 
 test_all:
-	$(RUN) go test ./... -timeout 120s $(CUSTOM_TAGS) $(LDFLAGS) $(ARGS) -v
+	$(RUN) go test ./... -timeout 120s $(LDFLAGS) $(ARGS) -v
 
 testone:
-	$(RUN) go test ./. -timeout 60s $(CUSTOM_TAGS) $(LDFLAGS) -run $(TEST) $(ARGS) -v
+	$(RUN) go test ./. -timeout 60s $(LDFLAGS) -run $(TEST) $(ARGS) -v
 
 cover:
 	$(RUN) go test $(ARGS) -race -v -timeout 15s -coverprofile=coverage.out
@@ -124,39 +107,53 @@ vet:
 	$(RUN) go vet
 
 bench:
-	$(RUN) go test $(CUSTOM_TAGS) $(LDFLAGS) -v -run NOT_EXISTING -bench $(BENCHMARK) -benchtime 5s
+	$(RUN) go test $(LDFLAGS) -v -run NOT_EXISTING -bench $(BENCHMARK) -benchtime 5s
 
 profile_test:
-	$(RUN) go test $(CUSTOM_TAGS) $(LDFLAGS) -run $(TEST) ./capture/. $(ARGS) -memprofile mem.mprof -cpuprofile cpu.out
-	$(RUN) go test $(CUSTOM_TAGS) $(LDFLAGS) -run $(TEST) ./capture/. $(ARGS) -c
+	$(RUN) go test $(LDFLAGS) -run $(TEST) ./capture/. $(ARGS) -memprofile mem.mprof -cpuprofile cpu.out
+	$(RUN) go test $(LDFLAGS) -run $(TEST) ./capture/. $(ARGS) -c
 
 # Used mainly for debugging, because docker container do not have access to parent machine ports
 run:
-	$(RUN) go run $(CUSTOM_TAGS) $(LDFLAGS) $(SOURCE) --input-dummy=0 --output-http="http://localhost:9000" --input-raw-track-response --input-raw 127.0.0.1:9000 --verbose 0 --middleware "./examples/middleware/echo.sh" --output-file requests.gor
+	$(RUN) go run $(LDFLAGS) $(SOURCE) --input-dummy=0 --output-http="http://localhost:9000" --input-raw-track-response --input-raw 127.0.0.1:9000 --verbose 0 --middleware "./examples/middleware/echo.sh" --output-file requests.gor
 
 run-2:
-	$(RUN) go run $(CUSTOM_TAGS) $(LDFLAGS) $(SOURCE) --input-raw :8000 --input-raw-bpf-filter "dst port 8000" --output-stdout --output-http "http://localhost:8000" --input-dummy=0
+	$(RUN) go run $(LDFLAGS) $(SOURCE) --input-raw :8000 --input-raw-bpf-filter "dst port 8000" --output-stdout --output-http "http://localhost:8000" --input-dummy=0
 
 run-3:
-	sudo -E go run $(CUSTOM_TAGS) $(SOURCE) --input-tcp :27001 --output-stdout
+	sudo -E go run $(SOURCE) --input-tcp :27001 --output-stdout
 
 run-arg:
-	sudo -E go run $(CUSTOM_TAGS) $(SOURCE) $(ARGS)
+	sudo -E go run $(SOURCE) $(ARGS)
 
 file-server:
-	go run $(CUSTOM_TAGS) $(SOURCE) file-server $(FADDR)
+	go run $(SOURCE) file-server $(FADDR)
 
 readpcap:
-	go run $(CUSTOM_TAGS) $(SOURCE) --input-raw $(FILE) --input-raw-track-response --input-raw-engine pcap_file --output-stdout
+	go run $(SOURCE) --input-raw $(FILE) --input-raw-track-response --input-raw-engine pcap_file --output-stdout
 
 record:
-	$(RUN) go run $(CUSTOM_TAGS) $(SOURCE) --input-dummy=0 --output-file=requests.gor --verbose --debug
+	$(RUN) go run $(SOURCE) --input-dummy=0 --output-file=requests.gor --verbose --debug
 
 replay:
-	$(RUN) go run $(CUSTOM_TAGS) $(SOURCE) --input-file=requests.bin --output-tcp=:9000 --verbose -h
+	$(RUN) go run $(SOURCE) --input-file=requests.bin --output-tcp=:9000 --verbose -h
 
 bash:
 	$(RUN) /bin/bash
 
-dist:
-	mkdir -p $(DIST_PATH)
+
+FPMCOMMON= \
+    --name gor \
+    --description "GoReplay is an open-source network monitoring tool which can record your live traffic, and use it for shadowing, load testing, monitoring and detailed analysis." \
+    -v $(VERSION) \
+    --vendor "Leonid Bugaev" \
+    -m "<support@goreplay.org>" \
+    --url "https://goreplay.org" \
+    -s dir \
+    -C /tmp/gor-build \
+
+build_packages:
+	mkdir -p /tmp/gor-build
+	go build -i -o /tmp/gor-build/$(BIN_NAME)
+	fpm $(FPMCOMMON) -a amd64 -t deb ./=/usr/local/bin
+	fpm $(FPMCOMMON) -a amd64 -t rpm ./=/usr/local/bin

README.md

@@ -1,10 +1,10 @@
-<a href="https://semgrep.dev/login?utm_source=github&utm_medium=badge&utm_campaign=growth-oss"><img src="https://img.shields.io/badge/semgrep-security-green.svg" /></a> [![GitHub release](https://img.shields.io/github/release/buger/gor.svg?maxAge=3600)](https://github.com/buger/goreplay/releases) [![codebeat](https://codebeat.co/badges/6427d589-a78e-416c-a546-d299b4089893)](https://codebeat.co/projects/github-com-buger-gor) [![Go Report Card](https://goreportcard.com/badge/github.com/buger/gor)](https://goreportcard.com/report/github.com/buger/gor) [![Join the chat at https://gitter.im/buger/gor](https://badges.gitter.im/buger/gor.svg)](https://gitter.im/buger/gor?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
+[![GitHub release](https://img.shields.io/github/release/buger/gor.svg?maxAge=3600)](https://github.com/buger/goreplay/releases) [![codebeat](https://codebeat.co/badges/6427d589-a78e-416c-a546-d299b4089893)](https://codebeat.co/projects/github-com-buger-gor) [![Go Report Card](https://goreportcard.com/badge/github.com/buger/gor)](https://goreportcard.com/report/github.com/buger/gor) [![Join the chat at https://gitter.im/buger/gor](https://badges.gitter.im/buger/gor.svg)](https://gitter.im/buger/gor?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
 
 ![Go Replay](http://i.imgur.com/ZG2ki5n.png)
 
 ## https://goreplay.org/
 
-GoReplay is an open-source network monitoring tool which can record your live traffic and use it for shadowing, load testing, monitoring and detailed analysis.
+GoReplay is an open-source network monitoring tool which can record your live traffic, and use it for shadowing, load testing, monitoring and detailed analysis.
 
 ## About
 
@@ -13,28 +13,29 @@ As your application grows, the effort required to test it also grows exponential
 GoReplay increases your confidence in code deployments, configuration and infrastructure changes.
 
 
-GoReplay offers a unique approach for shadowing. Instead of being a proxy, GoReplay listens in the background for traffic on your network interfaces, requiring no changes in your production infrastructure, other than running GoReplay daemon on the same machine as your service.
+GoReplay offers unique approach for shadowing. Instead of being a proxy, GoReplay in background listen for traffic on your network interface, requiring no changes in your production infrastructure, rather then running GoReplay daemon on the same machine as your service.
 
 ![Diagram](https://i.imgur.com/IN2xfDm.png)
 
 Check [latest documentation](http://github.com/buger/goreplay/wiki).
 
 ## Installation
-Download the latest binary from https://github.com/buger/goreplay/releases or [compile by yourself](https://github.com/buger/goreplay/wiki/Compilation).
+Download latest binary from https://github.com/buger/goreplay/releases or [compile by yourself](https://github.com/buger/goreplay/wiki/Compilation).
 
 ## Getting started
 
 The most basic setup will be `sudo ./gor --input-raw :8000 --output-stdout` which acts like tcpdump.
-If you already have a test environment, you can start replaying by running: `sudo ./gor --input-raw :8000 --output-http http://staging.env`.
+If you already have test environment you can start replaying: `sudo ./gor --input-raw :8000 --output-http http://staging.env`.
 
-See our [documentation](https://github.com/buger/goreplay/wiki/) and the [Getting Started](https://github.com/buger/goreplay/wiki/Getting-Started) page for more info. 
+See the our [documentation](https://github.com/buger/goreplay/wiki/) and [Getting started](https://github.com/buger/goreplay/wiki/Getting-Started) page for more info. 
 
 ## Newsletter
-Subscribe to our [newsletter](https://www.getdrip.com/forms/89690474/submissions/new) to stay informed about the latest features and changes to the Gor project.
+Subscribe to our [newsletter](https://www.getdrip.com/forms/89690474/submissions/new) to stay informed about the latest features and changes to Gor project.
+
 
 ## Want to Upgrade?
 
-We have created a [GoReplay PRO](https://goreplay.org/pro.html) extension which provides additional features such as support for binary protocols like Thrift or ProtocolBuffers, saving and replaying from cloud storage, TCP session replication, etc. The PRO version also includes a commercial-friendly license, dedicated support, and it also allows you to support high-quality open source development. 
+We have created a [GoReplay PRO](https://goreplay.org/pro.html) extension which provides additional features such as support for binary protocols like Thrift or ProtocolBuffers, saving and replaying from cloud storage, TCP sessions replication, etc. The PRO version also includes a commercial-friendly license, dedicated support, and it also allows you to support high-quality open source development. 
 
 
 ## Problems?

capture/af_packet.go

@@ -1,4 +1,4 @@
-//go:build !linux
+// +build !linux
 
 package capture
 

capture/af_packet_linux.go

@@ -1,4 +1,4 @@
-//go:build linux
+// +build linux
 
 package capture
 

capture/capture.go

@@ -5,9 +5,6 @@ import (
 	"errors"
 	"expvar"
 	"fmt"
-	"github.com/buger/goreplay/internal/size"
-	"github.com/buger/goreplay/internal/tcp"
-	"github.com/buger/goreplay/proto"
 	"io"
 	"log"
 	"net"
@@ -18,13 +15,13 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/buger/goreplay/proto"
+	"github.com/buger/goreplay/size"
+	"github.com/buger/goreplay/tcp"
+
 	"github.com/google/gopacket"
 	"github.com/google/gopacket/layers"
 	"github.com/google/gopacket/pcap"
-
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/rest"
 )
 
 var stats *expvar.Map
@@ -41,54 +38,40 @@ type PcapStatProvider interface {
 	Stats() (*pcap.Stats, error)
 }
 
-type PcapSetFilter interface {
-	SetBPFFilter(string) error
-}
-
 // PcapOptions options that can be set on a pcap capture handle,
 // these options take effect on inactive pcap handles
 type PcapOptions struct {
-	BufferTimeout   time.Duration   `json:"input-raw-buffer-timeout"`
-	TimestampType   string          `json:"input-raw-timestamp-type"`
-	BPFFilter       string          `json:"input-raw-bpf-filter"`
-	BufferSize      size.Size       `json:"input-raw-buffer-size"`
-	Promiscuous     bool            `json:"input-raw-promisc"`
-	Monitor         bool            `json:"input-raw-monitor"`
-	Snaplen         bool            `json:"input-raw-override-snaplen"`
-	Engine          EngineType      `json:"input-raw-engine"`
-	VXLANPort       int             `json:"input-raw-vxlan-port"`
-	VXLANVNIs       []int           `json:"input-raw-vxlan-vni"`
-	VLAN            bool            `json:"input-raw-vlan"`
-	VLANVIDs        []int           `json:"input-raw-vlan-vid"`
-	Expire          time.Duration   `json:"input-raw-expire"`
-	TrackResponse   bool            `json:"input-raw-track-response"`
-	Protocol        tcp.TCPProtocol `json:"input-raw-protocol"`
-	RealIPHeader    string          `json:"input-raw-realip-header"`
-	Stats           bool            `json:"input-raw-stats"`
-	AllowIncomplete bool            `json:"input-raw-allow-incomplete"`
-	IgnoreInterface []string        `json:"input-raw-ignore-interface"`
-	Transport       string
+	BufferTimeout time.Duration `json:"input-raw-buffer-timeout"`
+	TimestampType string        `json:"input-raw-timestamp-type"`
+	BPFFilter     string        `json:"input-raw-bpf-filter"`
+	BufferSize    size.Size     `json:"input-raw-buffer-size"`
+	Promiscuous   bool          `json:"input-raw-promisc"`
+	Monitor       bool          `json:"input-raw-monitor"`
+	Snaplen       bool          `json:"input-raw-override-snaplen"`
 }
 
 // Listener handle traffic capture, this is its representation.
 type Listener struct {
 	sync.Mutex
-
-	config PcapOptions
-
+	Transport  string       // transport layer default to tcp
 	Activate   func() error // function is used to activate the engine. it must be called before reading packets
 	Handles    map[string]packetHandle
 	Interfaces []pcap.Interface
 	loopIndex  int
 	Reading    chan bool // this channel is closed when the listener has started reading packets
-	messages   chan *tcp.Message
+	PcapOptions
+	Engine          EngineType
+	ports           []uint16 // src or/and dst ports
+	trackResponse   bool
+	expiry          time.Duration
+	allowIncomplete bool
+	messages        chan *tcp.Message
+	protocol        tcp.TCPProtocol
 
-	ports []uint16
-	host  string // pcap file name or interface (name, hardware addr, index or ip address)
+	host string // pcap file name or interface (name, hardware addr, index or ip address)
 
 	closeDone chan struct{}
 	quit      chan struct{}
-	closed    bool
 }
 
 type packetHandle struct {
@@ -105,7 +88,6 @@ const (
 	EnginePcapFile
 	EngineRawSocket
 	EngineAFPacket
-	EngineVXLAN
 )
 
 // Set is here so that EngineType can implement flag.Var
@@ -119,8 +101,6 @@ func (eng *EngineType) Set(v string) error {
 		*eng = EngineRawSocket
 	case "af_packet":
 		*eng = EngineAFPacket
-	case "vxlan":
-		*eng = EngineVXLAN
 	default:
 		return fmt.Errorf("invalid engine %s", v)
 	}
@@ -137,8 +117,6 @@ func (eng *EngineType) String() (e string) {
 		e = "raw_socket"
 	case EngineAFPacket:
 		e = "af_packet"
-	case EngineVXLAN:
-		e = "vxlan"
 	default:
 		e = ""
 	}
@@ -148,7 +126,7 @@ func (eng *EngineType) String() (e string) {
 // NewListener creates and initialize a new Listener. if transport or/and engine are invalid/unsupported
 // is "tcp" and "pcap", are assumed. l.Engine and l.Transport can help to get the values used.
 // if there is an error it will be associated with getting network interfaces
-func NewListener(host string, ports []uint16, config PcapOptions) (l *Listener, err error) {
+func NewListener(host string, ports []uint16, transport string, engine EngineType, protocol tcp.TCPProtocol, trackResponse bool, expiry time.Duration, allowIncomplete bool) (l *Listener, err error) {
 	l = &Listener{}
 
 	l.host = host
@@ -157,32 +135,34 @@ func NewListener(host string, ports []uint16, config PcapOptions) (l *Listener,
 	}
 	l.ports = ports
 
-	l.config = config
-	l.config.Transport = "tcp"
+	l.Transport = "tcp"
+	if transport != "" {
+		l.Transport = transport
+	}
 	l.Handles = make(map[string]packetHandle)
-
+	l.trackResponse = trackResponse
 	l.closeDone = make(chan struct{})
 	l.quit = make(chan struct{})
 	l.Reading = make(chan bool)
+	l.expiry = expiry
+	l.allowIncomplete = allowIncomplete
+	l.protocol = protocol
 	l.messages = make(chan *tcp.Message, 10000)
 
-	if strings.HasPrefix(l.host, "k8s://") {
-		l.config.BPFFilter = l.Filter(pcap.Interface{}, k8sIPs(l.host[6:])...)
-	}
-
-	switch config.Engine {
+	switch engine {
 	default:
+		l.Engine = EnginePcap
 		l.Activate = l.activatePcap
 	case EngineRawSocket:
+		l.Engine = EngineRawSocket
 		l.Activate = l.activateRawSocket
 	case EngineAFPacket:
+		l.Engine = EngineAFPacket
 		l.Activate = l.activateAFPacket
 	case EnginePcapFile:
+		l.Engine = EnginePcapFile
 		l.Activate = l.activatePcapFile
 		return
-	case EngineVXLAN:
-		l.Activate = l.activateVxLanSocket
-		return
 	}
 
 	err = l.setInterfaces()
@@ -192,73 +172,17 @@ func NewListener(host string, ports []uint16, config PcapOptions) (l *Listener,
 	return
 }
 
+// SetPcapOptions set pcap options for all yet to be actived pcap handles
+// setting this on already activated handles will not have any effect
+func (l *Listener) SetPcapOptions(opts PcapOptions) {
+	l.PcapOptions = opts
+}
+
 // Listen listens for packets from the handles, and call handler on every packet received
 // until the context done signal is sent or there is unrecoverable error on all handles.
 // this function must be called after activating pcap handles
 func (l *Listener) Listen(ctx context.Context) (err error) {
-	l.Lock()
-	for key, handle := range l.Handles {
-		go l.readHandle(key, handle)
-	}
-	l.Unlock()
-
-	go func() {
-		for {
-			time.Sleep(time.Second)
-
-			if l.closed {
-				return
-			}
-
-			// Check for Pod IP changes
-			if strings.HasPrefix(l.host, "k8s://") {
-				newFilter := l.Filter(pcap.Interface{}, k8sIPs(l.host[6:])...)
-				if newFilter != l.config.BPFFilter {
-					fmt.Println("k8s pods configuration changed, new filter: ", newFilter)
-					for _, h := range l.Handles {
-						if _, ok := h.handler.(PcapSetFilter); ok {
-							h.handler.(PcapSetFilter).SetBPFFilter(newFilter)
-						}
-					}
-
-					l.config.BPFFilter = newFilter
-				}
-			}
-
-			var prevInterfaces []string
-			for _, in := range l.Interfaces {
-				prevInterfaces = append(prevInterfaces, in.Name)
-			}
-			l.setInterfaces()
-
-			for _, in := range l.Interfaces {
-				var found bool
-
-				for _, prev := range prevInterfaces {
-					if in.Name == prev {
-						found = true
-					}
-				}
-
-				if !found {
-					fmt.Println("Found new interface:", in.Name)
-					l.Lock()
-					l.Activate()
-
-					for key, handle := range l.Handles {
-						if key == in.Name {
-							fmt.Println("Activating capture on:", in.Name)
-							go l.readHandle(key, handle)
-							break
-						}
-					}
-					l.Unlock()
-				}
-			}
-		}
-	}()
-
-	close(l.Reading)
+	l.read()
 	done := ctx.Done()
 	select {
 	case <-done:
@@ -267,8 +191,6 @@ func (l *Listener) Listen(ctx context.Context) (err error) {
 		err = ctx.Err()
 	case <-l.closeDone: // all handles closed voluntarily
 	}
-
-	l.closed = true
 	return
 }
 
@@ -284,99 +206,28 @@ func (l *Listener) ListenBackground(ctx context.Context) chan error {
 	return err
 }
 
-// Allowed format:
-//
-//	[namespace/]pod/[pod_name]
-//	[namespace/]deployment/[deployment_name]
-//	[namespace/]daemonset/[daemonset_name]
-//	[namespace/]labelSelector/[selector]
-//	[namespace/]fieldSelector/[selector]
-func k8sIPs(addr string) []string {
-	config, err := rest.InClusterConfig()
-	if err != nil {
-		panic(err.Error())
-	}
-
-	// creates the clientset
-	clientset, err := kubernetes.NewForConfig(config)
-	if err != nil {
-		panic(err.Error())
-	}
-
-	sections := strings.Split(addr, "/")
-
-	if len(sections) < 2 {
-		panic("Not supported k8s scheme. Allowed values: [namespace/]pod/[pod_name], [namespace/]deployment/[deployment_name], [namespace/]daemonset/[daemonset_name], [namespace/]label/[label-name]/[label-value]")
-	}
-
-	// If no namespace passed, assume it is ALL
-	switch sections[0] {
-	case "pod", "deployment", "daemonset", "labelSelector", "fieldSelector":
-		sections = append([]string{""}, sections...)
-	}
-
-	namespace, selectorType, selectorValue := sections[0], sections[1], sections[2]
-
-	labelSelector := ""
-	fieldSelector := ""
-
-	switch selectorType {
-	case "pod":
-		fieldSelector = "metadata.name=" + selectorValue
-	case "deployment":
-		labelSelector = "app=" + selectorValue
-	case "daemonset":
-		labelSelector = "pod-template-generation=1,name=" + selectorValue
-	case "labelSelector":
-		labelSelector = selectorValue
-	case "fieldSelector":
-		fieldSelector = selectorValue
-	}
-
-	pods, err := clientset.CoreV1().Pods(namespace).List(context.TODO(), metav1.ListOptions{LabelSelector: labelSelector, FieldSelector: fieldSelector})
-	if err != nil {
-		panic(err.Error())
-	}
-
-	var podIPs []string
-	for _, pod := range pods.Items {
-		for _, podIP := range pod.Status.PodIPs {
-			podIPs = append(podIPs, podIP.IP)
-		}
-	}
-	return podIPs
-}
-
 // Filter returns automatic filter applied by goreplay
 // to a pcap handle of a specific interface
-func (l *Listener) Filter(ifi pcap.Interface, hosts ...string) (filter string) {
+func (l *Listener) Filter(ifi pcap.Interface) (filter string) {
 	// https://www.tcpdump.org/manpages/pcap-filter.7.html
 
-	if len(hosts) == 0 {
-		// If k8s have not found any IPs
-		if strings.HasPrefix(l.host, "k8s://") {
-			hosts = []string{}
-		} else {
-			hosts = []string{l.host}
-
-			if listenAll(l.host) || isDevice(l.host, ifi) {
-				hosts = interfaceAddresses(ifi)
-			}
-		}
+	hosts := []string{l.host}
+	if listenAll(l.host) || isDevice(l.host, ifi) {
+		hosts = interfaceAddresses(ifi)
 	}
 
-	filter = portsFilter(l.config.Transport, "dst", l.ports)
+	filter = portsFilter(l.Transport, "dst", l.ports)
 
-	if len(hosts) != 0 && !l.config.Promiscuous {
+	if len(hosts) != 0 && !l.Promiscuous {
 		filter = fmt.Sprintf("((%s) and (%s))", filter, hostsFilter("dst", hosts))
 	} else {
 		filter = fmt.Sprintf("(%s)", filter)
 	}
 
-	if l.config.TrackResponse {
-		responseFilter := portsFilter(l.config.Transport, "src", l.ports)
+	if l.trackResponse {
+		responseFilter := portsFilter(l.Transport, "src", l.ports)
 
-		if len(hosts) != 0 && !l.config.Promiscuous {
+		if len(hosts) != 0 && !l.Promiscuous {
 			responseFilter = fmt.Sprintf("((%s) and (%s))", responseFilter, hostsFilter("src", hosts))
 		} else {
 			responseFilter = fmt.Sprintf("(%s)", responseFilter)
@@ -385,16 +236,6 @@ func (l *Listener) Filter(ifi pcap.Interface, hosts ...string) (filter string) {
 		filter = fmt.Sprintf("%s or %s", filter, responseFilter)
 	}
 
-	if l.config.VLAN {
-		if len(l.config.VLANVIDs) > 0 {
-			for _, vi := range l.config.VLANVIDs {
-				filter = fmt.Sprintf("vlan %d and ", vi) + filter
-			}
-		} else {
-			filter = "vlan and " + filter
-		}
-	}
-
 	return
 }
 
@@ -408,29 +249,29 @@ func (l *Listener) PcapHandle(ifi pcap.Interface) (handle *pcap.Handle, err erro
 	}
 	defer inactive.CleanUp()
 
-	if l.config.TimestampType != "" && l.config.TimestampType != "go" {
+	if l.TimestampType != "" && l.TimestampType != "go" {
 		var ts pcap.TimestampSource
-		ts, err = pcap.TimestampSourceFromString(l.config.TimestampType)
+		ts, err = pcap.TimestampSourceFromString(l.TimestampType)
 		fmt.Println("Setting custom Timestamp Source. Supported values: `go`, ", inactive.SupportedTimestamps())
 		err = inactive.SetTimestampSource(ts)
 		if err != nil {
 			return nil, fmt.Errorf("%q: supported timestamps: %q, interface: %q", err, inactive.SupportedTimestamps(), ifi.Name)
 		}
 	}
-	if l.config.Promiscuous {
-		if err = inactive.SetPromisc(l.config.Promiscuous); err != nil {
+	if l.Promiscuous {
+		if err = inactive.SetPromisc(l.Promiscuous); err != nil {
 			return nil, fmt.Errorf("promiscuous mode error: %q, interface: %q", err, ifi.Name)
 		}
 	}
-	if l.config.Monitor {
-		if err = inactive.SetRFMon(l.config.Monitor); err != nil && !errors.Is(err, pcap.CannotSetRFMon) {
+	if l.Monitor {
+		if err = inactive.SetRFMon(l.Monitor); err != nil && !errors.Is(err, pcap.CannotSetRFMon) {
 			return nil, fmt.Errorf("monitor mode error: %q, interface: %q", err, ifi.Name)
 		}
 	}
 
 	var snap int
 
-	if !l.config.Snaplen {
+	if !l.Snaplen {
 		infs, _ := net.Interfaces()
 		for _, i := range infs {
 			if i.Name == ifi.Name {
@@ -447,16 +288,16 @@ func (l *Listener) PcapHandle(ifi pcap.Interface) (handle *pcap.Handle, err erro
 	if err != nil {
 		return nil, fmt.Errorf("snapshot length error: %q, interface: %q", err, ifi.Name)
 	}
-	if l.config.BufferSize > 0 {
-		err = inactive.SetBufferSize(int(l.config.BufferSize))
+	if l.BufferSize > 0 {
+		err = inactive.SetBufferSize(int(l.BufferSize))
 		if err != nil {
 			return nil, fmt.Errorf("handle buffer size error: %q, interface: %q", err, ifi.Name)
 		}
 	}
-	if l.config.BufferTimeout == 0 {
-		l.config.BufferTimeout = 2000 * time.Millisecond
+	if l.BufferTimeout == 0 {
+		l.BufferTimeout = 2000 * time.Millisecond
 	}
-	err = inactive.SetTimeout(l.config.BufferTimeout)
+	err = inactive.SetTimeout(l.BufferTimeout)
 	if err != nil {
 		return nil, fmt.Errorf("handle buffer timeout error: %q, interface: %q", err, ifi.Name)
 	}
@@ -465,7 +306,7 @@ func (l *Listener) PcapHandle(ifi pcap.Interface) (handle *pcap.Handle, err erro
 		return nil, fmt.Errorf("PCAP Activate device error: %q, interface: %q", err, ifi.Name)
 	}
 
-	bpfFilter := l.config.BPFFilter
+	bpfFilter := l.BPFFilter
 	if bpfFilter == "" {
 		bpfFilter = l.Filter(ifi)
 	}
@@ -484,16 +325,16 @@ func (l *Listener) SocketHandle(ifi pcap.Interface) (handle Socket, err error) {
 	if err != nil {
 		return nil, fmt.Errorf("sock raw error: %q, interface: %q", err, ifi.Name)
 	}
-	if err = handle.SetPromiscuous(l.config.Promiscuous || l.config.Monitor); err != nil {
+	if err = handle.SetPromiscuous(l.Promiscuous || l.Monitor); err != nil {
 		return nil, fmt.Errorf("promiscuous mode error: %q, interface: %q", err, ifi.Name)
 	}
-	if l.config.BPFFilter == "" {
-		l.config.BPFFilter = l.Filter(ifi)
+	if l.BPFFilter == "" {
+		l.BPFFilter = l.Filter(ifi)
 	}
-	fmt.Println("BPF Filter: ", l.config.BPFFilter)
-	if err = handle.SetBPFFilter(l.config.BPFFilter); err != nil {
+	fmt.Println("BPF Filter: ", l.BPFFilter)
+	if err = handle.SetBPFFilter(l.BPFFilter); err != nil {
 		handle.Close()
-		return nil, fmt.Errorf("BPF filter error: %q%s, interface: %q", err, l.config.BPFFilter, ifi.Name)
+		return nil, fmt.Errorf("BPF filter error: %q%s, interface: %q", err, l.BPFFilter, ifi.Name)
 	}
 	handle.SetLoopbackIndex(int32(l.loopIndex))
 	return
@@ -517,82 +358,88 @@ func http1EndHint(m *tcp.Message) bool {
 		return false
 	}
 
-	req, res := http1StartHint(m.Packets()[0])
-	return proto.HasFullPayload(m, m.PacketData()...) && (req || res)
+	return proto.HasFullPayload(m, m.PacketData()...)
 }
 
-func (l *Listener) readHandle(key string, hndl packetHandle) {
-	runtime.LockOSThread()
+func (l *Listener) read() {
+	l.Lock()
+	defer l.Unlock()
+	for key, handle := range l.Handles {
+		go func(key string, hndl packetHandle) {
+			runtime.LockOSThread()
 
-	defer l.closeHandles(key)
-	linkSize := 14
-	linkType := int(layers.LinkTypeEthernet)
-	if _, ok := hndl.handler.(*pcap.Handle); ok {
-		linkType = int(hndl.handler.(*pcap.Handle).LinkType())
-		linkSize, ok = pcapLinkTypeLength(linkType, l.config.VLAN)
-		if !ok {
-			if os.Getenv("GORDEBUG") != "0" {
-				log.Printf("can not identify link type of an interface '%s'\n", key)
-			}
-			return // can't find the linktype size
-		}
-	}
-
-	messageParser := tcp.NewMessageParser(l.messages, l.ports, hndl.ips, l.config.Expire, l.config.AllowIncomplete)
-
-	if l.config.Protocol == tcp.ProtocolHTTP {
-		messageParser.Start = http1StartHint
-		messageParser.End = http1EndHint
-	}
-
-	timer := time.NewTicker(1 * time.Second)
-
-	for {
-		select {
-		case <-l.quit:
-			return
-		case <-timer.C:
-			if h, ok := hndl.handler.(PcapStatProvider); ok {
-				s, err := h.Stats()
-				if err == nil {
-					stats.Add("packets_received", int64(s.PacketsReceived))
-					stats.Add("packets_dropped", int64(s.PacketsDropped))
-					stats.Add("packets_if_dropped", int64(s.PacketsIfDropped))
+			defer l.closeHandles(key)
+			linkSize := 14
+			linkType := int(layers.LinkTypeEthernet)
+			if _, ok := hndl.handler.(*pcap.Handle); ok {
+				linkType = int(hndl.handler.(*pcap.Handle).LinkType())
+				linkSize, ok = pcapLinkTypeLength(linkType)
+				if !ok {
+					if os.Getenv("GORDEBUG") != "0" {
+						log.Printf("can not identify link type of an interface '%s'\n", key)
+					}
+					return // can't find the linktype size
 				}
 			}
-		default:
-			data, ci, err := hndl.handler.ReadPacketData()
-			if err == nil {
-				if l.config.TimestampType == "go" {
-					ci.Timestamp = time.Now()
+
+			messageParser := tcp.NewMessageParser(l.messages, l.ports, hndl.ips, l.expiry, l.allowIncomplete)
+
+			if l.protocol == tcp.ProtocolHTTP {
+				messageParser.Start = http1StartHint
+				messageParser.End = http1EndHint
+			}
+
+			timer := time.NewTicker(1 * time.Second)
+
+			for {
+				select {
+				case <-l.quit:
+					return
+				case <-timer.C:
+					if h, ok := hndl.handler.(PcapStatProvider); ok {
+						s, err := h.Stats()
+						if err == nil {
+							stats.Add("packets_received", int64(s.PacketsReceived))
+							stats.Add("packets_dropped", int64(s.PacketsDropped))
+							stats.Add("packets_if_dropped", int64(s.PacketsIfDropped))
+						}
+					}
+				default:
+					data, ci, err := hndl.handler.ReadPacketData()
+					if err == nil {
+						if l.TimestampType == "go" {
+							ci.Timestamp = time.Now()
+						}
+
+						messageParser.PacketHandler(&tcp.PcapPacket{
+							Data:     data,
+							LType:    linkType,
+							LTypeLen: linkSize,
+							Ci:       &ci,
+						})
+						continue
+					}
+					if enext, ok := err.(pcap.NextError); ok && enext == pcap.NextErrorTimeoutExpired {
+						continue
+					}
+					if eno, ok := err.(syscall.Errno); ok && eno.Temporary() {
+						continue
+					}
+					if enet, ok := err.(*net.OpError); ok && (enet.Temporary() || enet.Timeout()) {
+						continue
+					}
+					if err == io.EOF || err == io.ErrClosedPipe {
+						log.Printf("stopped reading from %s interface with error %s\n", key, err)
+						return
+					}
+
+					log.Printf("stopped reading from %s interface with error %s\n", key, err)
+					return
 				}
-
-				messageParser.PacketHandler(&tcp.PcapPacket{
-					Data:     data,
-					LType:    linkType,
-					LTypeLen: linkSize,
-					Ci:       &ci,
-				})
-				continue
 			}
-			if enext, ok := err.(pcap.NextError); ok && enext == pcap.NextErrorTimeoutExpired {
-				continue
-			}
-			if eno, ok := err.(syscall.Errno); ok && eno.Temporary() {
-				continue
-			}
-			if enet, ok := err.(*net.OpError); ok && (enet.Temporary() || enet.Timeout()) {
-				continue
-			}
-			if err == io.EOF || err == io.ErrClosedPipe {
-				log.Printf("stopped reading from %s interface with error %s\n", key, err)
-				return
-			}
-
-			log.Printf("stopped reading from %s interface with error %s\n", key, err)
-			return
-		}
+		}(key, handle)
 	}
+	close(l.Reading)
 }
 
 func (l *Listener) Messages() chan *tcp.Message {
@@ -618,10 +465,6 @@ func (l *Listener) activatePcap() error {
 	var e error
 	var msg string
 	for _, ifi := range l.Interfaces {
-		if _, found := l.Handles[ifi.Name]; found {
-			continue
-		}
-
 		var handle *pcap.Handle
 		handle, e = l.PcapHandle(ifi)
 		if e != nil {
@@ -639,18 +482,6 @@ func (l *Listener) activatePcap() error {
 	return nil
 }
 
-func (l *Listener) activateVxLanSocket() error {
-	handler, err := newVXLANHandler(l.config.VXLANPort, l.config.VXLANVNIs)
-	if err != nil {
-		return err
-	}
-	l.Handles["vxlan"] = packetHandle{
-		handler: handler,
-	}
-
-	return nil
-}
-
 func (l *Listener) activateRawSocket() error {
 	if runtime.GOOS != "linux" {
 		return fmt.Errorf("sock_raw is not stabilized on OS other than linux")
@@ -658,10 +489,6 @@ func (l *Listener) activateRawSocket() error {
 	var msg string
 	var e error
 	for _, ifi := range l.Interfaces {
-		if _, found := l.Handles[ifi.Name]; found {
-			continue
-		}
-
 		var handle Socket
 		handle, e = l.SocketHandle(ifi)
 		if e != nil {
@@ -688,15 +515,15 @@ func (l *Listener) activatePcapFile() (err error) {
 
 	tmp := l.host
 	l.host = ""
-	l.config.BPFFilter = l.Filter(pcap.Interface{})
+	l.BPFFilter = l.Filter(pcap.Interface{})
 	l.host = tmp
 
-	if e = handle.SetBPFFilter(l.config.BPFFilter); e != nil {
+	if e = handle.SetBPFFilter(l.BPFFilter); e != nil {
 		handle.Close()
-		return fmt.Errorf("BPF filter error: %q, filter: %s", e, l.config.BPFFilter)
+		return fmt.Errorf("BPF filter error: %q, filter: %s", e, l.BPFFilter)
 	}
 
-	fmt.Println("BPF Filter:", l.config.BPFFilter)
+	fmt.Println("BPF Filter:", l.BPFFilter)
 
 	l.Handles["pcap_file"] = packetHandle{
 		handler: handle,
@@ -712,10 +539,6 @@ func (l *Listener) activateAFPacket() error {
 
 	var msg string
 	for _, ifi := range l.Interfaces {
-		if _, found := l.Handles[ifi.Name]; found {
-			continue
-		}
-
 		handle, err := newAfpacketHandle(ifi.Name, szFrame, szBlock, numBlocks, false, pcap.BlockForever)
 
 		if err != nil {
@@ -723,11 +546,11 @@ func (l *Listener) activateAFPacket() error {
 			continue
 		}
 
-		if l.config.BPFFilter == "" {
-			l.config.BPFFilter = l.Filter(ifi)
+		if l.BPFFilter == "" {
+			l.BPFFilter = l.Filter(ifi)
 		}
-		fmt.Println("Interface:", ifi.Name, ". BPF Filter:", l.config.BPFFilter)
-		handle.SetBPFFilter(l.config.BPFFilter, 64<<10)
+		fmt.Println("Interface:", ifi.Name, ". BPF Filter:", l.BPFFilter)
+		handle.SetBPFFilter(l.BPFFilter, 64<<10)
 
 		l.Handles[ifi.Name] = packetHandle{
 			handler: handle,
@@ -746,31 +569,11 @@ func (l *Listener) setInterfaces() (err error) {
 	var pifis []pcap.Interface
 	pifis, err = pcap.FindAllDevs()
 	ifis, _ := net.Interfaces()
-	l.Interfaces = []pcap.Interface{}
-
 	if err != nil {
 		return
 	}
 
 	for _, pi := range pifis {
-		ignore := false
-		for _, ig := range l.config.IgnoreInterface {
-			if pi.Name == ig {
-				ignore = true
-				break
-			}
-		}
-
-		if ignore {
-			continue
-		}
-
-		if strings.HasPrefix(l.host, "k8s://") {
-			if !strings.HasPrefix(pi.Name, "veth") {
-				continue
-			}
-		}
-
 		if isDevice(l.host, pi) {
 			l.Interfaces = []pcap.Interface{pi}
 			return
@@ -823,12 +626,6 @@ func isDevice(addr string, ifi pcap.Interface) bool {
 		return true
 	}
 
-	if strings.HasSuffix(addr, "*") {
-		if strings.HasPrefix(ifi.Name, addr[:len(addr)-1]) {
-			return true
-		}
-	}
-
 	for _, _addr := range ifi.Addresses {
 		if _addr.IP.String() == addr {
 			return true
@@ -883,14 +680,10 @@ func hostsFilter(direction string, hosts []string) string {
 	return strings.Join(hostsFilters, " or ")
 }
 
-func pcapLinkTypeLength(lType int, vlan bool) (int, bool) {
+func pcapLinkTypeLength(lType int) (int, bool) {
 	switch layers.LinkType(lType) {
 	case layers.LinkTypeEthernet:
-		if vlan {
-			return 18, true
-		} else {
-			return 14, true
-		}
+		return 14, true
 	case layers.LinkTypeNull, layers.LinkTypeLoop:
 		return 4, true
 	case layers.LinkTypeRaw, 12, 14:

capture/doc.go

@@ -9,34 +9,27 @@ example:
 
 // for the transport should be "tcp"
 listener, err := capture.NewListener(host, port, transport, engine, trackResponse)
-
-	if err != nil {
-		// handle error
-	}
-
+if err != nil {
+	// handle error
+}
 listener.SetPcapOptions(opts)
 err = listner.Activate()
+if err != nil {
+	// handle it
+}
 
-	if err != nil {
-		// handle it
-	}
-
-	if err := listener.Listen(context.Background(), handler); err != nil {
-		 // handle error
-	}
-
+if err := listener.Listen(context.Background(), handler); err != nil {
+	 // handle error
+}
 // or
 errCh := listener.ListenBackground(context.Background(), handler) // runs in the background
 select {
 case err := <- errCh:
-
 	// handle error
-
 case <-quit:
-
 	//
-
 case <- l.Reading: // if we have started reading
 }
+
 */
 package capture // import github.com/buger/goreplay/capture

capture/dump.go

@@ -35,18 +35,18 @@ const versionMinor = 4
 // an append), you must call WriteFileHeader before WritePacket.  Packet
 // timestamps are written with nanosecond precision.
 //
-//	// Write a new file:
-//	f, _ := os.Create("/tmp/file.pcap")
-//	w := pcapgo.NewWriterNanos(f)
-//	w.WriteFileHeader(65536, layers.LinkTypeEthernet)  // new file, must do this.
-//	w.WritePacket(gopacket.CaptureInfo{...}, data1)
-//	f.Close()
-//	// Append to existing file (must have same snaplen and linktype)
-//	f2, _ := os.OpenFile("/tmp/fileNano.pcap", os.O_APPEND, 0700)
-//	w2 := pcapgo.NewWriter(f2)
-//	// no need for file header, it's already written.
-//	w2.WritePacket(gopacket.CaptureInfo{...}, data2)
-//	f2.Close()
+//  // Write a new file:
+//  f, _ := os.Create("/tmp/file.pcap")
+//  w := pcapgo.NewWriterNanos(f)
+//  w.WriteFileHeader(65536, layers.LinkTypeEthernet)  // new file, must do this.
+//  w.WritePacket(gopacket.CaptureInfo{...}, data1)
+//  f.Close()
+//  // Append to existing file (must have same snaplen and linktype)
+//  f2, _ := os.OpenFile("/tmp/fileNano.pcap", os.O_APPEND, 0700)
+//  w2 := pcapgo.NewWriter(f2)
+//  // no need for file header, it's already written.
+//  w2.WritePacket(gopacket.CaptureInfo{...}, data2)
+//  f2.Close()
 func NewWriterNanos(w io.Writer) *Writer {
 	return &Writer{w: w, tsScaler: nanosPerNano}
 }
@@ -56,18 +56,18 @@ func NewWriterNanos(w io.Writer) *Writer {
 // an append), you must call WriteFileHeader before WritePacket.
 // Packet timestamps are written with microsecond precision.
 //
-//	// Write a new file:
-//	f, _ := os.Create("/tmp/file.pcap")
-//	w := pcapgo.NewWriter(f)
-//	w.WriteFileHeader(65536, layers.LinkTypeEthernet)  // new file, must do this.
-//	w.WritePacket(gopacket.CaptureInfo{...}, data1)
-//	f.Close()
-//	// Append to existing file (must have same snaplen and linktype)
-//	f2, _ := os.OpenFile("/tmp/file.pcap", os.O_APPEND, 0700)
-//	w2 := pcapgo.NewWriter(f2)
-//	// no need for file header, it's already written.
-//	w2.WritePacket(gopacket.CaptureInfo{...}, data2)
-//	f2.Close()
+//  // Write a new file:
+//  f, _ := os.Create("/tmp/file.pcap")
+//  w := pcapgo.NewWriter(f)
+//  w.WriteFileHeader(65536, layers.LinkTypeEthernet)  // new file, must do this.
+//  w.WritePacket(gopacket.CaptureInfo{...}, data1)
+//  f.Close()
+//  // Append to existing file (must have same snaplen and linktype)
+//  f2, _ := os.OpenFile("/tmp/file.pcap", os.O_APPEND, 0700)
+//  w2 := pcapgo.NewWriter(f2)
+//  // no need for file header, it's already written.
+//  w2.WritePacket(gopacket.CaptureInfo{...}, data2)
+//  f2.Close()
 func NewWriter(w io.Writer) *Writer {
 	return &Writer{w: w, tsScaler: nanosPerMicro}
 }

capture/sock_linux.go

@@ -1,4 +1,4 @@
-//go:build linux && !arm64
+// +build linux
 
 package capture
 

capture/sock_others.go

@@ -1,4 +1,4 @@
-//go:build !linux || arm64 || darwin
+// +build !linux
 
 package capture
 

ce.go

@@ -1,17 +0,0 @@
-//go:build !pro
-
-package goreplay
-
-import (
-	"fmt"
-)
-
-// PRO this value indicates if goreplay is running in PRO mode.
-var PRO = false
-
-func SettingsHook(settings *AppSettings) {
-	if settings.RecognizeTCPSessions {
-		settings.RecognizeTCPSessions = false
-		fmt.Println("[ERROR] TCP session recognition is not supported in the open-source version of GoReplay")
-	}
-}

docs/Capturing-and-replaying-traffic.md

@@ -37,11 +37,6 @@ sudo gor --input-raw :80 --input-raw-engine "raw_socket" --output-http "http://s
 
 You can read more about [[Replaying HTTP traffic]].
 
-You can use VXLAN or traffic mirroring from AWS to capture the traffic. The 4789 UDP port will be opened and that works as you are launched GoReplay on the source machine.
-
-```
-gor --input-raw :80 --input-raw-engine vxlan -output-stdout
-```
 
 ### Tracking original IP addresses
 You can use `--input-raw-realip-header` option to specify header name: If not blank, injects header with given name and real IP value to the request payload. Usually, this header should be named: `X-Real-IP`, but you can specify any name.

elasticsearch.go

@@ -1,13 +1,14 @@
-package goreplay
+package main
 
 import (
 	"encoding/json"
-	"github.com/buger/goreplay/proto"
 	"log"
 	"net/url"
 	"strings"
 	"time"
 
+	"github.com/buger/goreplay/proto"
+
 	elastigo "github.com/mattbaird/elastigo/lib"
 )
 

elasticsearch_test.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"testing"

emitter.go

@@ -1,14 +1,14 @@
-package goreplay
+package main
 
 import (
 	"fmt"
-	"github.com/buger/goreplay/internal/byteutils"
 	"hash/fnv"
 	"io"
 	"log"
 	"sync"
+	"time"
 
-	"github.com/coocood/freecache"
+	"github.com/buger/goreplay/byteutils"
 )
 
 // Emitter represents an abject to manage plugins communication
@@ -76,7 +76,9 @@ func (e *Emitter) Close() {
 func CopyMulty(src PluginReader, writers ...PluginWriter) error {
 	wIndex := 0
 	modifier := NewHTTPModifier(&Settings.ModifierConfig)
-	filteredRequests := freecache.NewCache(200 * 1024 * 1024) // 200M
+	filteredRequests := make(map[string]int64)
+	filteredRequestsLastCleanTime := time.Now().UnixNano()
+	filteredCount := 0
 
 	for {
 		msg, err := src.PluginRead()
@@ -95,7 +97,7 @@ func CopyMulty(src PluginReader, writers ...PluginWriter) error {
 				Debug(2, fmt.Sprintf("[EMITTER] Found malformed record %q from %q", msg.Meta, src))
 				continue
 			}
-			requestID := meta[1]
+			requestID := byteutils.SliceToString(meta[1])
 			// start a subroutine only when necessary
 			if Settings.Verbose >= 3 {
 				Debug(3, "[EMITTER] input: ", byteutils.SliceToString(msg.Meta[:len(msg.Meta)-1]), " from: ", src)
@@ -106,15 +108,16 @@ func CopyMulty(src PluginReader, writers ...PluginWriter) error {
 					msg.Data = modifier.Rewrite(msg.Data)
 					// If modifier tells to skip request
 					if len(msg.Data) == 0 {
-						filteredRequests.Set(requestID, []byte{}, 60) //
+						filteredRequests[requestID] = time.Now().UnixNano()
+						filteredCount++
 						continue
 					}
 					Debug(3, "[EMITTER] Rewritten input:", requestID, "from:", src)
 
 				} else {
-					_, err := filteredRequests.Get(requestID)
-					if err == nil {
-						filteredRequests.Del(requestID)
+					if _, ok := filteredRequests[requestID]; ok {
+						delete(filteredRequests, requestID)
+						filteredCount--
 						continue
 					}
 				}
@@ -155,5 +158,20 @@ func CopyMulty(src PluginReader, writers ...PluginWriter) error {
 				}
 			}
 		}
+
+		// Run GC on each 1000 request
+		if filteredCount > 0 && filteredCount%1000 == 0 {
+			// Clean up filtered requests for which we didn't get a response to filter
+			now := time.Now().UnixNano()
+			if now-filteredRequestsLastCleanTime > int64(60*time.Second) {
+				for k, v := range filteredRequests {
+					if now-v > int64(60*time.Second) {
+						delete(filteredRequests, k)
+						filteredCount--
+					}
+				}
+				filteredRequestsLastCleanTime = time.Now().UnixNano()
+			}
+		}
 	}
 }

emitter_test.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"fmt"

examples/middleware/echo.sh

@@ -8,7 +8,7 @@
 # 
 
 function log {
-    if [[ -n "$GOR_TEST" ]]; then # if we are not testing
+    if [[ ! -v GOR_TEST ]]; then # if we are not testing
     # Logging to stderr, because stdout/stdin used for data transfer
     >&2 echo "[DEBUG][ECHO] $1"
     fi

examples/middleware/token_modifier.go

@@ -24,8 +24,9 @@ import (
 	"bytes"
 	"encoding/hex"
 	"fmt"
-	"github.com/buger/goreplay/proto"
 	"os"
+
+	"github.com/buger/goreplay/proto"
 )
 
 // requestID -> originalToken

go.mod

@@ -1,80 +1,20 @@
 module github.com/buger/goreplay
 
-go 1.21
+go 1.15
 
 require (
-	github.com/Shopify/sarama v1.38.1
-	github.com/aws/aws-sdk-go v1.44.262
-	github.com/coocood/freecache v1.2.3
-	github.com/google/gopacket v1.1.20-0.20210429153827-3eaba0894325
-	github.com/gorilla/websocket v1.5.0
-	github.com/klauspost/compress v1.16.5 // indirect
-	github.com/mattbaird/elastigo v0.0.0-20170123220020-2fe47fd29e4b
-	github.com/stretchr/testify v1.8.2
-	github.com/xdg-go/scram v1.1.2
-	golang.org/x/net v0.34.0
-	golang.org/x/sys v0.29.0
-	k8s.io/apimachinery v0.27.1
-	k8s.io/client-go v0.27.1
-)
-
-require (
-	github.com/araddon/gou v0.0.0-20211019181548-e7d08105776c // indirect
+	github.com/Shopify/sarama v1.26.4
+	github.com/araddon/gou v0.0.0-20190110011759-c797efecbb61 // indirect
+	github.com/aws/aws-sdk-go v1.33.2
 	github.com/bitly/go-hostpool v0.1.0 // indirect
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/eapache/go-resiliency v1.3.0 // indirect
-	github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 // indirect
-	github.com/eapache/queue v1.1.0 // indirect
-	github.com/emicklei/go-restful/v3 v3.10.2 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/gnostic v0.6.9 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-uuid v1.0.3 // indirect
-	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
-	github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
-	github.com/jcmturner/gofork v1.7.6 // indirect
-	github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
-	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/pierrec/lz4/v4 v4.1.17 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
-	github.com/smartystreets/goconvey v1.7.2 // indirect
-	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	github.com/xdg-go/stringprep v1.0.4 // indirect
-	golang.org/x/crypto v0.32.0 // indirect
-	golang.org/x/oauth2 v0.8.0 // indirect
-	golang.org/x/term v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.27.1 // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
-	k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	github.com/google/gopacket v1.1.20-0.20210429153827-3eaba0894325
+	github.com/klauspost/compress v1.10.10 // indirect
+	github.com/mattbaird/elastigo v0.0.0-20170123220020-2fe47fd29e4b
+	github.com/pierrec/lz4 v2.5.2+incompatible // indirect
+	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
+	github.com/smartystreets/goconvey v1.6.4 // indirect
+	github.com/stretchr/testify v1.5.1
+	golang.org/x/net v0.0.0-20200707034311-ab3426394381
+	golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd
 )

go.sum

@@ -1,384 +1,121 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/Shopify/sarama v1.38.1 h1:lqqPUPQZ7zPqYlWpTh+LQ9bhYNu2xJL6k1SJN4WVe2A=
-github.com/Shopify/sarama v1.38.1/go.mod h1:iwv9a67Ha8VNa+TifujYoWGxWnu2kNVAQdSdZ4X2o5g=
-github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc=
-github.com/Shopify/toxiproxy/v2 v2.5.0/go.mod h1:yhM2epWtAmel9CB8r2+L+PCmhH6yH2pITaPAo7jxJl0=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/araddon/gou v0.0.0-20211019181548-e7d08105776c h1:XUqw//RExYoxW4Eie8MuKp8sEDAZI1gMHX/daUFgZww=
-github.com/araddon/gou v0.0.0-20211019181548-e7d08105776c/go.mod h1:ikc1XA58M+Rx7SEbf0bLJCfBkwayZ8T5jBo5FXK8Uz8=
-github.com/aws/aws-sdk-go v1.44.262 h1:gyXpcJptWoNkK+DiAiaBltlreoWKQXjAIh6FRh60F+I=
-github.com/aws/aws-sdk-go v1.44.262/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/Shopify/sarama v1.26.4 h1:+17TxUq/PJEAfZAll0T7XJjSgQWCpaQSoki/x5yN8o8=
+github.com/Shopify/sarama v1.26.4/go.mod h1:NbSGBSSndYaIhRcBtY9V0U7AyH+x71bG668AuWys/yU=
+github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc=
+github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
+github.com/araddon/gou v0.0.0-20190110011759-c797efecbb61 h1:Xz25cuW4REGC5W5UtpMU3QItMIImag615HiQcRbxqKQ=
+github.com/araddon/gou v0.0.0-20190110011759-c797efecbb61/go.mod h1:ikc1XA58M+Rx7SEbf0bLJCfBkwayZ8T5jBo5FXK8Uz8=
+github.com/aws/aws-sdk-go v1.33.2 h1:8TVrnPnSD7I+AmDp66xBUvS3K0J+jH09YXdrkJ34ey0=
+github.com/aws/aws-sdk-go v1.33.2/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
 github.com/bitly/go-hostpool v0.1.0 h1:XKmsF6k5el6xHG3WPJ8U0Ku/ye7njX7W81Ng7O2ioR0=
 github.com/bitly/go-hostpool v0.1.0/go.mod h1:4gOCgp6+NZnVqlKyZ/iBZFTAJKembaVENUpMkpg42fw=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
-github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/coocood/freecache v1.2.3 h1:lcBwpZrwBZRZyLk/8EMyQVXRiFl663cCuMOrjCALeto=
-github.com/coocood/freecache v1.2.3/go.mod h1:RBUWa/Cy+OHdfTGFEhEuE1pMCMX51Ncizj7rthiQ3vk=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/eapache/go-resiliency v1.3.0 h1:RRL0nge+cWGlxXbUzJ7yMcq6w2XBEr19dCN6HECGaT0=
-github.com/eapache/go-resiliency v1.3.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho=
-github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 h1:8yY/I9ndfrgrXUbOGObLHKBR4Fl3nZXwM2c7OYTT8hM=
-github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0=
+github.com/eapache/go-resiliency v1.2.0 h1:v7g92e/KSN71Rq7vSThKaWIq68fL4YHvWyiUKorFR1Q=
+github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
+github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw=
+github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
 github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
-github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE=
-github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
-github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
-github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
-github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
-github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
-github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
-github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
-github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0=
-github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/frankban/quicktest v1.7.2 h1:2QxQoC1TS09S7fhCPsrvqYdvP1H5M1P1ih5ABm3BTYk=
+github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
+github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
-github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gopacket v1.1.20-0.20210429153827-3eaba0894325 h1:YmIcZ5Var3BAQ64AW98Iiys5Ih4fiU0xK41+8isC5Ec=
 github.com/google/gopacket v1.1.20-0.20210429153827-3eaba0894325/go.mod h1:riddUzxTSBpJXk3qBHtYr4qOhFhT6k/1c0E3qkQjQpA=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
-github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
-github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
-github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
-github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
-github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8=
-github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
-github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo=
-github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=
-github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg=
-github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo=
-github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o=
-github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
-github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8=
-github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs=
-github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY=
-github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
-github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/jcmturner/gofork v1.0.0 h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8=
+github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
+github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc=
+github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI=
-github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/compress v1.9.8/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/compress v1.10.10 h1:a/y8CglcM7gLGYmlbP/stPE5sR3hbhFRUjCBfd/0B3I=
+github.com/klauspost/compress v1.10.10/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattbaird/elastigo v0.0.0-20170123220020-2fe47fd29e4b h1:v29yPGHhOqw7VHEnTeQFAth3SsBrmwc8JfuhNY0G34k=
 github.com/mattbaird/elastigo v0.0.0-20170123220020-2fe47fd29e4b/go.mod h1:5MWrJXKRQyhQdUCF+vu6U5c4nQpg70vW3eHaU0/AYbU=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk=
-github.com/onsi/ginkgo/v2 v2.9.1/go.mod h1:FEcmzVcCHl+4o9bQZVab+4dC9+j+91t2FHSzmGAPfuo=
-github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E=
-github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ=
-github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc=
-github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pierrec/lz4 v2.4.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI=
+github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
-github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
-github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs=
-github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
-github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg=
-github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
+github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo5oJ0jf870itWm3D0Sjh7+Za9gazKc5LQ=
+github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
-github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
-github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
-github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
-github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4=
-github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
-github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
-github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
-github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
-github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
+github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
-golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
-gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/jcmturner/aescts.v1 v1.0.1 h1:cVVZBK2b1zY26haWB4vbBiZrfFQnfbTVrE3xZq6hrEw=
+gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo=
+gopkg.in/jcmturner/dnsutils.v1 v1.0.1 h1:cIuC1OLRGZrld+16ZJvvZxVJeKPsvd5eUIvxfoN5hSM=
+gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q=
+gopkg.in/jcmturner/goidentity.v3 v3.0.0 h1:1duIyWiTaYvVx3YX2CYtpJbUFd7/UuPYCfgXtQ3VTbI=
+gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4=
+gopkg.in/jcmturner/gokrb5.v7 v7.5.0 h1:a9tsXlIDD9SKxotJMK3niV7rPZAJeX2aD/0yg3qlIrg=
+gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM=
+gopkg.in/jcmturner/rpc.v1 v1.1.0 h1:QHIUxTX1ISuAv9dD2wJ9HWQVuWDX/Zc0PfeC2tjc4rU=
+gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/api v0.27.1 h1:Z6zUGQ1Vd10tJ+gHcNNNgkV5emCyW+v2XTmn+CLjSd0=
-k8s.io/api v0.27.1/go.mod h1:z5g/BpAiD+f6AArpqNjkY+cji8ueZDU/WV1jcj5Jk4E=
-k8s.io/apimachinery v0.27.1 h1:EGuZiLI95UQQcClhanryclaQE6xjg1Bts6/L3cD7zyc=
-k8s.io/apimachinery v0.27.1/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM=
-k8s.io/client-go v0.27.1 h1:oXsfhW/qncM1wDmWBIuDzRHNS2tLhK3BZv512Nc59W8=
-k8s.io/client-go v0.27.1/go.mod h1:f8LHMUkVb3b9N8bWturc+EDtVVVwZ7ueTVquFAJb2vA=
-k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
-k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=
-k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
-k8s.io/utils v0.0.0-20230505201702-9f6742963106 h1:EObNQ3TW2D+WptiYXlApGNLVy0zm/JIBVY9i+M4wpAU=
-k8s.io/utils v0.0.0-20230505201702-9f6742963106/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
-sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
-sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

gor.go

@@ -6,7 +6,6 @@ import (
 	"expvar"
 	"flag"
 	"fmt"
-	"github.com/buger/goreplay"
 	"log"
 	"net/http"
 	"net/http/httputil"
@@ -72,23 +71,23 @@ func main() {
 	}
 
 	args := os.Args[1:]
-	var plugins *goreplay.InOutPlugins
+	var plugins *InOutPlugins
 	if len(args) > 0 && args[0] == "file-server" {
 		if len(args) != 2 {
 			log.Fatal("You should specify port and IP (optional) for the file server. Example: `gor file-server :80`")
 		}
 		dir, _ := os.Getwd()
 
-		goreplay.Debug(0, "Started example file server for current directory on address ", args[1])
+		Debug(0, "Started example file server for current directory on address ", args[1])
 
 		log.Fatal(http.ListenAndServe(args[1], loggingMiddleware(args[1], http.FileServer(http.Dir(dir)))))
 	} else {
 		flag.Parse()
-		goreplay.CheckSettings()
-		plugins = goreplay.NewPlugins()
+		checkSettings()
+		plugins = NewPlugins()
 	}
 
-	log.Printf("[PPID %d and PID %d] Version:%s\n", os.Getppid(), os.Getpid(), goreplay.VERSION)
+	log.Printf("[PPID %d and PID %d] Version:%s\n", os.Getppid(), os.Getpid(), VERSION)
 
 	if len(plugins.Inputs) == 0 || len(plugins.Outputs) == 0 {
 		log.Fatal("Required at least 1 input and 1 output")
@@ -102,20 +101,20 @@ func main() {
 		profileCPU(*cpuprofile)
 	}
 
-	if goreplay.Settings.Pprof != "" {
+	if Settings.Pprof != "" {
 		go func() {
-			log.Println(http.ListenAndServe(goreplay.Settings.Pprof, nil))
+			log.Println(http.ListenAndServe(Settings.Pprof, nil))
 		}()
 	}
 
 	closeCh := make(chan int)
-	emitter := goreplay.NewEmitter()
-	go emitter.Start(plugins, goreplay.Settings.Middleware)
-	if goreplay.Settings.ExitAfter > 0 {
-		log.Printf("Running gor for a duration of %s\n", goreplay.Settings.ExitAfter)
+	emitter := NewEmitter()
+	go emitter.Start(plugins, Settings.Middleware)
+	if Settings.ExitAfter > 0 {
+		log.Printf("Running gor for a duration of %s\n", Settings.ExitAfter)
 
-		time.AfterFunc(goreplay.Settings.ExitAfter, func() {
-			log.Printf("gor run timeout %s\n", goreplay.Settings.ExitAfter)
+		time.AfterFunc(Settings.ExitAfter, func() {
+			log.Printf("gor run timeout %s\n", Settings.ExitAfter)
 			close(closeCh)
 		})
 	}

gor_stat.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"runtime"

http_modifier.go

@@ -1,11 +1,12 @@
-package goreplay
+package main
 
 import (
 	"bytes"
 	"encoding/base64"
-	"github.com/buger/goreplay/proto"
 	"hash/fnv"
 	"strings"
+
+	"github.com/buger/goreplay/proto"
 )
 
 type HTTPModifier struct {

http_modifier_settings.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"errors"
@@ -24,7 +24,9 @@ type HTTPModifierConfig struct {
 	Methods                HTTPMethods                `json:"http-allow-method"`
 }
 
+//
 // Handling of --http-allow-header, --http-disallow-header options
+//
 type headerFilter struct {
 	name   []byte
 	regexp *regexp.Regexp
@@ -54,7 +56,9 @@ func (h *HTTPHeaderFilters) Set(value string) error {
 	return nil
 }
 
+//
 // Handling of --http-basic-auth-filter option
+//
 type basicAuthFilter struct {
 	regexp *regexp.Regexp
 }
@@ -78,7 +82,9 @@ func (h *HTTPHeaderBasicAuthFilters) Set(value string) error {
 	return nil
 }
 
+//
 // Handling of --http-allow-header-hash and --http-allow-param-hash options
+//
 type hashFilter struct {
 	name    []byte
 	percent uint32
@@ -123,7 +129,9 @@ func (h *HTTPHashFilters) Set(value string) error {
 	return nil
 }
 
+//
 // Handling of --http-set-header option
+//
 type httpHeader struct {
 	Name  string
 	Value string
@@ -152,7 +160,9 @@ func (h *HTTPHeaders) Set(value string) error {
 	return nil
 }
 
+//
 // Handling of --http-set-param option
+//
 type httpParam struct {
 	Name  []byte
 	Value []byte
@@ -198,7 +208,9 @@ func (h *HTTPMethods) Set(value string) error {
 	return nil
 }
 
+//
 // Handling of --http-rewrite-url option
+//
 type urlRewrite struct {
 	src    *regexp.Regexp
 	target []byte
@@ -225,7 +237,9 @@ func (r *URLRewriteMap) Set(value string) error {
 	return nil
 }
 
+//
 // Handling of --http-rewrite-header option
+//
 type headerRewrite struct {
 	header []byte
 	src    *regexp.Regexp
@@ -261,7 +275,9 @@ func (r *HeaderRewriteMap) Set(value string) error {
 	return nil
 }
 
+//
 // Handling of --http-allow-url option
+//
 type urlRegexp struct {
 	regexp *regexp.Regexp
 }

http_modifier_settings_test.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"testing"

http_modifier_test.go

@@ -1,9 +1,10 @@
-package goreplay
+package main
 
 import (
 	"bytes"
-	"github.com/buger/goreplay/proto"
 	"testing"
+
+	"github.com/buger/goreplay/proto"
 )
 
 func TestHTTPModifierWithoutConfig(t *testing.T) {

http_prettifier.go

@@ -1,13 +1,14 @@
-package goreplay
+package main
 
 import (
 	"bytes"
 	"compress/gzip"
 	"fmt"
-	"github.com/buger/goreplay/proto"
 	"io/ioutil"
 	"net/http/httputil"
 	"strconv"
+
+	"github.com/buger/goreplay/proto"
 )
 
 func prettifyHTTP(p []byte) []byte {

http_prettifier_test.go

@@ -1,11 +1,12 @@
-package goreplay
+package main
 
 import (
 	"bytes"
 	"compress/gzip"
-	"github.com/buger/goreplay/proto"
 	"strconv"
 	"testing"
+
+	"github.com/buger/goreplay/proto"
 )
 
 func TestHTTPPrettifierGzip(t *testing.T) {

input_dummy.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"time"
@@ -36,13 +36,16 @@ func (i *DummyInput) PluginRead() (*Message, error) {
 func (i *DummyInput) emit() {
 	ticker := time.NewTicker(time.Second)
 
-	for range ticker.C {
-		uuid := uuid()
-		reqh := payloadHeader(RequestPayload, uuid, time.Now().UnixNano(), -1)
-		i.data <- append(reqh, []byte("GET / HTTP/1.1\r\nHost: www.w3.org\r\nUser-Agent: Go 1.1 package http\r\nAccept-Encoding: gzip\r\n\r\n")...)
+	for {
+		select {
+		case <-ticker.C:
+			uuid := uuid()
+			reqh := payloadHeader(RequestPayload, uuid, time.Now().UnixNano(), -1)
+			i.data <- append(reqh, []byte("GET / HTTP/1.1\r\nHost: www.w3.org\r\nUser-Agent: Go 1.1 package http\r\nAccept-Encoding: gzip\r\n\r\n")...)
 
-		resh := payloadHeader(ResponsePayload, uuid, time.Now().UnixNano()+1, 1)
-		i.data <- append(resh, []byte("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n")...)
+			resh := payloadHeader(ResponsePayload, uuid, time.Now().UnixNano()+1, 1)
+			i.data <- append(resh, []byte("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n")...)
+		}
 	}
 }
 

input_file.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"bufio"
@@ -238,16 +238,6 @@ func NewFileInput(path string, loop bool, readDepth int, maxWait time.Duration,
 	return
 }
 
-func parseS3Url(path string) (bucket, key string) {
-	path = path[5:] // stripping `s3://`
-	sep := strings.IndexByte(path, '/')
-
-	bucket = path[:sep]
-	key = path[sep+1:]
-
-	return bucket, key
-}
-
 func (i *FileInput) init() (err error) {
 	defer i.mu.Unlock()
 	i.mu.Lock()
@@ -267,7 +257,7 @@ func (i *FileInput) init() (err error) {
 
 		resp, err := svc.ListObjects(params)
 		if err != nil {
-			Debug(2, "[INPUT-FILE] Error while retrieving list of files from S3", i.path, err)
+			Debug(0, "[INPUT-FILE] Error while retreiving list of files from S3", i.path, err)
 			return err
 		}
 
@@ -275,13 +265,13 @@ func (i *FileInput) init() (err error) {
 			matches = append(matches, "s3://"+bucket+"/"+(*c.Key))
 		}
 	} else if matches, err = filepath.Glob(i.path); err != nil {
-		Debug(2, "[INPUT-FILE] Wrong file pattern", i.path, err)
+		Debug(0, "[INPUT-FILE] Wrong file pattern", i.path, err)
 		return
 	}
 
 	if len(matches) == 0 {
-		Debug(2, "[INPUT-FILE] No files match pattern: ", i.path)
-		return errors.New("no matching files")
+		Debug(0, "[INPUT-FILE] No files match pattern: ", i.path)
+		return errors.New("No matching files")
 	}
 
 	i.readers = make([]*fileInputReader, len(matches))
@@ -420,7 +410,7 @@ func (i *FileInput) emit() {
 	i.stats.Set("max_wait", time.Duration(maxWait))
 	i.stats.Set("min_wait", time.Duration(minWait))
 
-	Debug(2, fmt.Sprintf("[INPUT-FILE] FileInput: end of file '%s'\n", i.path))
+	Debug(0, fmt.Sprintf("[INPUT-FILE] FileInput: end of file '%s'\n", i.path))
 
 	if i.dryRun {
 		fmt.Printf("Records found: %v\nFiles processed: %v\nBytes processed: %v\nMax wait: %v\nMin wait: %v\nFirst wait: %v\nIt will take `%v` to replay at current speed.\nFound %v records with out of order timestamp\n",

input_file_test.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"bytes"

input_http.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"log"

input_http_test.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"bytes"

input_kafka.go

@@ -1,11 +1,9 @@
-package goreplay
+package main
 
 import (
 	"encoding/json"
 	"log"
-	"strconv"
 	"strings"
-	"time"
 
 	"github.com/Shopify/sarama"
 	"github.com/Shopify/sarama/mocks"
@@ -14,25 +12,15 @@ import (
 // KafkaInput is used for receiving Kafka messages and
 // transforming them into HTTP payloads.
 type KafkaInput struct {
-	config      *InputKafkaConfig
-	consumers   []sarama.PartitionConsumer
-	messages    chan *sarama.ConsumerMessage
-	speedFactor float64
-	quit        chan struct{}
-	kafkaTimer  *kafkaTimer
-}
-
-func getOffsetOfPartitions(offsetCfg string) int64 {
-	offset, err := strconv.ParseInt(offsetCfg, 10, 64)
-	if err != nil || offset < -2 {
-		log.Fatalln("Failed to parse offset: "+offsetCfg, err)
-	}
-	return offset
+	config    *InputKafkaConfig
+	consumers []sarama.PartitionConsumer
+	messages  chan *sarama.ConsumerMessage
+	quit      chan struct{}
 }
 
 // NewKafkaInput creates instance of kafka consumer client with TLS config
-func NewKafkaInput(offsetCfg string, config *InputKafkaConfig, tlsConfig *KafkaTLSConfig) *KafkaInput {
-	c := NewKafkaConfig(&config.SASLConfig, tlsConfig)
+func NewKafkaInput(address string, config *InputKafkaConfig, tlsConfig *KafkaTLSConfig) *KafkaInput {
+	c := NewKafkaConfig(tlsConfig)
 
 	var con sarama.Consumer
 
@@ -53,17 +41,14 @@ func NewKafkaInput(offsetCfg string, config *InputKafkaConfig, tlsConfig *KafkaT
 	}
 
 	i := &KafkaInput{
-		config:      config,
-		consumers:   make([]sarama.PartitionConsumer, len(partitions)),
-		messages:    make(chan *sarama.ConsumerMessage, 256),
-		speedFactor: 1,
-		quit:        make(chan struct{}),
-		kafkaTimer:  new(kafkaTimer),
+		config:    config,
+		consumers: make([]sarama.PartitionConsumer, len(partitions)),
+		messages:  make(chan *sarama.ConsumerMessage, 256),
+		quit:      make(chan struct{}),
 	}
-	i.config.Offset = offsetCfg
 
 	for index, partition := range partitions {
-		consumer, err := con.ConsumePartition(config.Topic, partition, getOffsetOfPartitions(offsetCfg))
+		consumer, err := con.ConsumePartition(config.Topic, partition, sarama.OffsetNewest)
 		if err != nil {
 			log.Fatalln("Failed to start Sarama(Kafka) partition consumer:", err)
 		}
@@ -101,15 +86,12 @@ func (i *KafkaInput) PluginRead() (*Message, error) {
 	case message = <-i.messages:
 	}
 
-	inputTs := ""
-
 	msg.Data = message.Value
 	if i.config.UseJSON {
 
 		var kafkaMessage KafkaMessage
 		json.Unmarshal(message.Value, &kafkaMessage)
 
-		inputTs = kafkaMessage.ReqTs
 		var err error
 		msg.Data, err = kafkaMessage.Dump()
 		if err != nil {
@@ -121,11 +103,8 @@ func (i *KafkaInput) PluginRead() (*Message, error) {
 	// does it have meta
 	if isOriginPayload(msg.Data) {
 		msg.Meta, msg.Data = payloadMetaWithBody(msg.Data)
-		inputTs = string(payloadMeta(msg.Meta)[2])
 	}
 
-	i.timeWait(inputTs)
-
 	return &msg, nil
 
 }
@@ -139,45 +118,3 @@ func (i *KafkaInput) Close() error {
 	close(i.quit)
 	return nil
 }
-
-func (i *KafkaInput) timeWait(curInputTs string) {
-	if i.config.Offset == "-1" || curInputTs == "" {
-		return
-	}
-
-	// implement for Kafka input showdown or speedup emitting
-	timer := i.kafkaTimer
-	curTs := time.Now().UnixNano()
-
-	curInput, err := strconv.ParseInt(curInputTs, 10, 64)
-
-	if timer.latestInputTs == 0 || timer.latestOutputTs == 0 {
-		timer.latestInputTs = curInput
-		timer.latestOutputTs = curTs
-		return
-	}
-
-	if err != nil {
-		log.Fatalln("Fatal to parse timestamp err: ", err)
-	}
-
-	diffTs := curInput - timer.latestInputTs
-	pastTs := curTs - timer.latestOutputTs
-
-	diff := diffTs - pastTs
-	if i.speedFactor != 1 {
-		diff = int64(float64(diff) / i.speedFactor)
-	}
-
-	if diff > 0 {
-		time.Sleep(time.Duration(diff))
-	}
-
-	timer.latestInputTs = curInput
-	timer.latestOutputTs = curTs
-}
-
-type kafkaTimer struct {
-	latestInputTs  int64
-	latestOutputTs int64
-}

input_kafka_test.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"testing"
@@ -16,7 +16,7 @@ func TestInputKafkaRAW(t *testing.T) {
 		map[string][]int32{"test": {0}},
 	)
 
-	input := NewKafkaInput("-1", &InputKafkaConfig{
+	input := NewKafkaInput("", &InputKafkaConfig{
 		consumer: consumer,
 		Topic:    "test",
 		UseJSON:  false,
@@ -42,7 +42,7 @@ func TestInputKafkaJSON(t *testing.T) {
 		map[string][]int32{"test": {0}},
 	)
 
-	input := NewKafkaInput("-1", &InputKafkaConfig{
+	input := NewKafkaInput("", &InputKafkaConfig{
 		consumer: consumer,
 		Topic:    "test",
 		UseJSON:  true,

input_raw.go

@@ -1,60 +1,57 @@
-package goreplay
+package main
 
 import (
 	"context"
 	"fmt"
-	"github.com/buger/goreplay/internal/capture"
-	"github.com/buger/goreplay/internal/tcp"
-	"github.com/buger/goreplay/proto"
 	"log"
 	"net"
 	"strconv"
 	"strings"
 	"sync"
+	"time"
+
+	"github.com/buger/goreplay/capture"
+	"github.com/buger/goreplay/proto"
+	"github.com/buger/goreplay/size"
+	"github.com/buger/goreplay/tcp"
 )
 
 // RAWInputConfig represents configuration that can be applied on raw input
-type RAWInputConfig = capture.PcapOptions
+type RAWInputConfig struct {
+	capture.PcapOptions
+	Expire          time.Duration      `json:"input-raw-expire"`
+	CopyBufferSize  size.Size          `json:"copy-buffer-size"`
+	Engine          capture.EngineType `json:"input-raw-engine"`
+	TrackResponse   bool               `json:"input-raw-track-response"`
+	Protocol        tcp.TCPProtocol    `json:"input-raw-protocol"`
+	RealIPHeader    string             `json:"input-raw-realip-header"`
+	Stats           bool               `json:"input-raw-stats"`
+	AllowIncomplete bool               `json:"input-raw-allow-incomplete"`
+	quit            chan bool          // Channel used only to indicate goroutine should shutdown
+	host            string
+	ports           []uint16
+}
 
 // RAWInput used for intercepting traffic for given address
 type RAWInput struct {
 	sync.Mutex
-	config         RAWInputConfig
+	RAWInputConfig
 	messageStats   []tcp.Stats
 	listener       *capture.Listener
 	messageParser  *tcp.MessageParser
 	cancelListener context.CancelFunc
 	closed         bool
-
-	quit  chan bool // Channel used only to indicate goroutine should shutdown
-	host  string
-	ports []uint16
 }
 
 // NewRAWInput constructor for RAWInput. Accepts raw input config as arguments.
 func NewRAWInput(address string, config RAWInputConfig) (i *RAWInput) {
 	i = new(RAWInput)
-	i.config = config
+	i.RAWInputConfig = config
 	i.quit = make(chan bool)
 
 	host, _ports, err := net.SplitHostPort(address)
 	if err != nil {
-		// If we are reading pcap file, no port needed
-		if strings.HasSuffix(address, "pcap") {
-			host = address
-			_ports = "0"
-			err = nil
-		} else if strings.HasPrefix(address, "k8s://") {
-			portIndex := strings.LastIndex(address, ":")
-			host = address[:portIndex]
-			_ports = address[portIndex+1:]
-		} else {
-			log.Fatalf("input-raw: error while parsing address: %s", err)
-		}
-	}
-
-	if strings.HasSuffix(host, "pcap") {
-		i.config.Engine = capture.EnginePcapFile
+		log.Fatalf("input-raw: error while parsing address: %s", err)
 	}
 
 	var ports []uint16
@@ -93,8 +90,8 @@ func (i *RAWInput) PluginRead() (*Message, error) {
 	var msgType byte = ResponsePayload
 	if msgTCP.Direction == tcp.DirIncoming {
 		msgType = RequestPayload
-		if i.config.RealIPHeader != "" {
-			msg.Data = proto.SetHeader(msg.Data, []byte(i.config.RealIPHeader), []byte(msgTCP.SrcAddr))
+		if i.RealIPHeader != "" {
+			msg.Data = proto.SetHeader(msg.Data, []byte(i.RealIPHeader), []byte(msgTCP.SrcAddr))
 		}
 	}
 	msg.Meta = payloadHeader(msgType, msgTCP.UUID(), msgTCP.Start.UnixNano(), msgTCP.End.UnixNano()-msgTCP.Start.UnixNano())
@@ -107,7 +104,7 @@ func (i *RAWInput) PluginRead() (*Message, error) {
 	if msgTCP.TimedOut {
 		Debug(2, "[INPUT-RAW] message timeout reached, increase input-raw-expire")
 	}
-	if i.config.Stats {
+	if i.Stats {
 		stat := msgTCP.Stats
 		go i.addStats(stat)
 	}
@@ -117,11 +114,11 @@ func (i *RAWInput) PluginRead() (*Message, error) {
 
 func (i *RAWInput) listen(address string) {
 	var err error
-	i.listener, err = capture.NewListener(i.host, i.ports, i.config)
+	i.listener, err = capture.NewListener(i.host, i.ports, "", i.Engine, i.Protocol, i.TrackResponse, i.Expire, i.AllowIncomplete)
 	if err != nil {
 		log.Fatal(err)
 	}
-
+	i.listener.SetPcapOptions(i.PcapOptions)
 	err = i.listener.Activate()
 	if err != nil {
 		log.Fatal(err)

input_raw_test.go

@@ -1,10 +1,7 @@
-package goreplay
+package main
 
 import (
 	"bytes"
-	"github.com/buger/goreplay/internal/capture"
-	"github.com/buger/goreplay/internal/tcp"
-	"github.com/buger/goreplay/proto"
 	"io/ioutil"
 	"net"
 	"net/http"
@@ -16,6 +13,10 @@ import (
 	"sync/atomic"
 	"testing"
 	"time"
+
+	"github.com/buger/goreplay/capture"
+	"github.com/buger/goreplay/proto"
+	"github.com/buger/goreplay/tcp"
 )
 
 const testRawExpire = time.Millisecond * 200
@@ -121,11 +122,10 @@ func TestRAWInputNoKeepAlive(t *testing.T) {
 	output := NewTestOutput(func(msg *Message) {
 		if msg.Meta[0] == '1' {
 			atomic.AddInt64(&reqCounter, 1)
-			wg.Done()
 		} else {
 			atomic.AddInt64(&respCounter, 1)
-			wg.Done()
 		}
+		wg.Done()
 	})
 
 	plugins := &InOutPlugins{

input_tcp.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"bufio"

input_tcp_test.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"bytes"

internal/capture/capture_test.go

@@ -1,22 +0,0 @@
-package capture
-
-import (
-	"testing"
-)
-
-func TestSetInterfaces(t *testing.T) {
-	listener := &Listener{
-		loopIndex: 99999,
-	}
-	listener.setInterfaces()
-
-	for _, nic := range listener.Interfaces {
-		if (len(nic.Addresses)) == 0 {
-			t.Errorf("nic %s was captured with 0 addresses", nic.Name)
-		}
-	}
-
-	if listener.loopIndex == 99999 {
-		t.Errorf("loopback nic index was not found")
-	}
-}

internal/capture/vxlan.go

@@ -1,100 +0,0 @@
-package capture
-
-import (
-	"errors"
-	"fmt"
-	"github.com/google/gopacket"
-	"github.com/google/gopacket/layers"
-	"net"
-	"time"
-)
-
-const VxLanPacketSize = 1526 //vxlan 8 B + ethernet II 1518 B
-
-type vxlanHandle struct {
-	connection    *net.UDPConn
-	packetChannel chan gopacket.Packet
-	vnis          []int
-}
-
-func newVXLANHandler(port int, vnis []int) (*vxlanHandle, error) {
-	if port == 0 {
-		port = 4789
-	}
-
-	addr := net.UDPAddr{
-		Port: port,
-		IP:   net.ParseIP("0.0.0.0"),
-	}
-
-	vxlanHandle := &vxlanHandle{}
-	con, err := net.ListenUDP("udp", &addr)
-	if err != nil {
-		return nil, fmt.Errorf(err.Error())
-	}
-	vxlanHandle.connection = con
-	vxlanHandle.packetChannel = make(chan gopacket.Packet, 1000)
-	vxlanHandle.vnis = vnis
-	go vxlanHandle.reader()
-
-	return vxlanHandle, nil
-}
-
-func (v *vxlanHandle) reader() {
-	for {
-		inputBytes := make([]byte, VxLanPacketSize)
-		length, _, err := v.connection.ReadFromUDP(inputBytes)
-		if err != nil {
-			if errors.Is(err, net.ErrClosed) {
-				return
-			}
-			continue
-		}
-		packet := gopacket.NewPacket(inputBytes[:length], layers.LayerTypeVXLAN, gopacket.NoCopy)
-		ci := packet.Metadata()
-		ci.Timestamp = time.Now()
-		ci.CaptureLength = length
-		ci.Length = length
-
-		if len(v.vnis) > 0 && !v.vniIsAllowed(packet) {
-			continue
-		}
-
-		v.packetChannel <- packet
-	}
-}
-
-func (v *vxlanHandle) vniIsAllowed(packet gopacket.Packet) bool {
-	defaultState := false
-	if layer := packet.Layer(layers.LayerTypeVXLAN); layer != nil {
-		vxlan, _ := layer.(*layers.VXLAN)
-		for _, vn := range v.vnis {
-			if vn > 0 && int(vxlan.VNI) == vn {
-				return true
-			}
-
-			if vn < 0 {
-				if int(vxlan.VNI) == -vn {
-					return false
-				}
-				defaultState = true
-			}
-		}
-	}
-	return defaultState
-}
-
-func (v *vxlanHandle) ReadPacketData() ([]byte, gopacket.CaptureInfo, error) {
-	packet := <-v.packetChannel
-	layer := packet.Layer(layers.LayerTypeVXLAN)
-	bytes := layer.LayerPayload()
-
-	return bytes, packet.Metadata().CaptureInfo, nil
-}
-
-func (v *vxlanHandle) Close() error {
-	if v.connection != nil {
-		return v.connection.Close()
-	}
-	return nil
-}

k8s/README.md

@@ -1,172 +0,0 @@
-# Native k8s integration
-
-After following steps below, you will be able to capture traffic inside k8s like this:
-
-```
-gor --input-raw k8s://namespace/deployment/app:80 --output-http http://replay.com
-```
-
-GoReplay will running as a daemonset (e.g. on each phisical k8s node. 
-It will also require giving required permission to have read access to K8s APIs, so it can dynamically filter traffic for a specific pods.
-
-Supported format for filtering required pods:
-
-```
-k8s://[namespace/]pod/[pod_name] - k8s://default/pod/nginx-7848d4b86f-5nxz8
-k8s://[namespace/]deployment/[deployment_name] - k8s://default/deployment/nginx
-k8s://[namespace/]daemonset/[daemonset_name] - k8s://default/daemonset/nginx
-k8s://[namespace/]labelSelector/[selector] - k8s://default/labelSelector/app=nginx
-k8s://[namespace/]fieldSelector/[selector] - k8s://default/fieldSelector/metadata.name=nginx-7848d4b86f-5nxz8
-```
-`namespace` is optional, omit to use all namespaces: `k8s://labelSelector/app=replay`
-
-## 1. Create a namespace
-`kubectl create namespace goreplay`
-
-## 2. Create the Kubernetes service account in the namespace:
-
-`kubectl create serviceaccount goreplay --namespace goreplay`
-
-## 3. Create Cluster Role which gives read-only access to the pods:
-`kubectl -n goreplay -f clusterrole.yaml apply`
-
-```yaml
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: pod-reader
-rules:
-- apiGroups: [""]
-  resources: ["pods"]
-  verbs: ["get", "watch", "list"]
-- apiGroups: [""]
-  resources: ["deployments"]
-  verbs: ["get", "watch", "list"]
-- apiGroups: [""]
-  resources: ["daemonset"]
-  verbs: ["get", "watch", "list"]
-```
-
-## 4. Attach role to goreplay service account
-`kubectl -n goreplay -f rolebinding.yaml apply`
-
-```yaml
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: goreplay-reader-binding
-subjects:
-- kind: ServiceAccount
-  name: goreplay
-  namespace: goreplay
-roleRef:
-  kind: ClusterRole
-  name: pod-reader
-  apiGroup: ""
-```
-
-## 5. Start goreplay daemonset
-
-`kubectl -n goreplay -f goreplay.yaml apply`
-
-In arguments, specify which service you want to capture. 
-Following format supported:
-
-
-```yaml
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: goreplay-daemon
-spec:
-  selector:
-    matchLabels:
-      app: goreplay
-  template:
-    metadata:
-      labels:
-        app: goreplay
-    spec:
-      hostNetwork: true
-      serviceAccountName: goreplay
-      containers:
-      - name: goreplay
-        image: buger/goreplay:2.0.0-rc4
-        args:
-          - "--input-raw"
-          - "k8s://deployments/nginx:80"
-          - "--output-stdout"
-```
-
-## 6. Create a simple http service (Optionally)
-
-`kubectl -n default -f nginx.yaml apply`
-
-```yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-  labels:
-    app: nginx
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: nginx
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx
-        ports:
-        - containerPort: 80
-   
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: ngnix-service
-spec:
-  selector:
-    app: nginx
-  type: NodePort
-  ports:
-  - protocol: TCP
-    port: 80
-    targetPort: 80
-
-```
-
-
-## 7. Verify installation, and debugging tips
-
-Find url for your service using `kubectl get svc` or `minikube service --url ngnix-service -n http`, and make a call to it.
-
-Get GoReplay logs, and check if it capture traffic of your service.
-`kubectl logs -n goreplay -l app=goreplay --all-containers`
-
-Describe daemonset:
-`kubectl describe daemonset goreplay-daemon -n goreplay`
-
-Get GoReplay pod list:
-`kubectl get pods -n goreplay -l app=goreplay`
-
-Get logs for specific pod (take data from previous step):
-`kubectl logs goreplay-daemon-<replace> -n goreplay`
-
-Get related k8s events:
-`kubectl get events -n goreplay --field-selector involvedObject.name=goreplay-daemon-<replace>`
-
-## 8. Debuggin telemetry
-
-We provde a special script which will get all require logs, and help you find installation errors. 
-
-`curl -s https://raw.githubusercontent.com/buger/goreplay/refs/heads/master/k8s/collect_goreplay_telemetry.sh | bash`
-
-If you are using microk8s or similar, you can also specific prefix for your kubectl command like this:
-
-`curl -s https://raw.githubusercontent.com/buger/goreplay/refs/heads/master/k8s/collect_goreplay_telemetry.sh | bash -s -- "microk8s kubectl"`

k8s/clusterrole.yaml

@@ -1,14 +0,0 @@
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: pod-reader
-rules:
-- apiGroups: [""]
-  resources: ["pods"]
-  verbs: ["get", "watch", "list"]
-- apiGroups: ["apps"]
-  resources: ["deployments"]
-  verbs: ["get", "watch", "list"]
-- apiGroups: ["apps"]
-  resources: ["daemonsets"]
-  verbs: ["get", "watch", "list"]

k8s/collect_goreplay_telemetry.sh

@@ -1,123 +0,0 @@
-#!/usr/bin/env bash
-#
-# collect_goreplay_telemetry.sh
-#
-# Gathers telemetry from a GoReplay DaemonSet in the 'goreplay' namespace.
-# Works on macOS and Linux, assuming 'kubectl' (or compatible) is installed.
-#
-# Usage examples:
-#   ./collect_goreplay_telemetry.sh
-#   ./collect_goreplay_telemetry.sh "microk8s kubectl"
-
-set -euo pipefail
-
-########################################
-# Determine kubectl command
-########################################
-if [[ $# -gt 0 ]]; then
-  # If an argument was provided, use that as the kubectl command
-  KUBECTL="$*"
-else
-  # Default to 'kubectl'
-  KUBECTL="kubectl"
-fi
-
-########################################
-# Check that the base command exists
-########################################
-# For "microk8s kubectl", we only check "microk8s" in PATH. For "oc" we check "oc".
-BASE_CMD="${KUBECTL%% *}"  # everything before the first space
-if ! command -v "${BASE_CMD}" >/dev/null 2>&1; then
-  echo "ERROR: '${BASE_CMD}' not found in PATH. Please install or configure it first."
-  exit 1
-fi
-
-echo "Using kubectl command: $KUBECTL"
-echo
-
-########################################
-# Helper function to print and run commands
-########################################
-run_cmd() {
-  echo "Command: $*"
-  eval "$*"
-}
-
-########################################
-# 1. Print logs from ALL GoReplay pods
-########################################
-echo "=================================================="
-echo "1. Gathering logs from all goreplay pods (all containers)..."
-echo "=================================================="
-run_cmd "$KUBECTL logs -n goreplay -l app=goreplay --all-containers" || {
-  echo "WARNING: Failed to get logs from pods with label app=goreplay"
-}
-
-########################################
-# 2. Describe the GoReplay DaemonSet
-########################################
-echo
-echo "=================================================="
-echo "2. Describing DaemonSet goreplay-daemon..."
-echo "=================================================="
-run_cmd "$KUBECTL describe daemonset goreplay-daemon -n goreplay" || {
-  echo "WARNING: Failed to describe daemonset goreplay-daemon"
-}
-
-########################################
-# 3. Get list of GoReplay pods (full output)
-########################################
-echo
-echo "=================================================="
-echo "3. Listing goreplay pods (full output)..."
-echo "=================================================="
-
-# Print full output (no -o name here):
-run_cmd "$KUBECTL get pods -n goreplay -l app=goreplay"
-
-# Then retrieve just the names for further processing:
-echo
-echo "Getting goreplay pod names for telemetry collection..."
-pods=$($KUBECTL get pods -n goreplay -l app=goreplay -o name 2>/dev/null) || {
-  echo "ERROR: Failed to list pods with label app=goreplay"
-  exit 1
-}
-echo "Found pods:"
-echo "$pods"
-echo
-
-########################################
-# 4. For each pod, gather logs, describe, and get events
-########################################
-for pod in $pods; do
-  # pod looks like "pod/goreplay-daemon-xyz"
-  pod_name="${pod##*/}"  # remove "pod/" prefix
-
-  echo "=================================================="
-  echo "LOGS for pod: ${pod_name}"
-  echo "=================================================="
-  run_cmd "$KUBECTL logs ${pod_name} -n goreplay" || {
-    echo "WARNING: Failed to get logs for pod ${pod_name}"
-  }
-
-  echo
-  echo "--------------------------------------------------"
-  echo "DESCRIBE for pod: ${pod_name}"
-  echo "--------------------------------------------------"
-  run_cmd "$KUBECTL describe pod -n goreplay ${pod_name}" || {
-    echo "WARNING: Failed to describe pod ${pod_name}"
-  }
-
-  echo
-  echo "--------------------------------------------------"
-  echo "EVENTS for pod: ${pod_name}"
-  echo "--------------------------------------------------"
-  run_cmd "$KUBECTL get events -n goreplay --field-selector involvedObject.name=${pod_name}" || {
-    echo "WARNING: Failed to get events for pod ${pod_name}"
-  }
-  echo
-done
-
-echo "=================================================="
-echo "Telemetry collection complete."
-echo "=================================================="

k8s/goreplay.yaml

@@ -1,22 +0,0 @@
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: goreplay-daemon
-spec:
-  selector:
-    matchLabels:
-      app: goreplay
-  template:
-    metadata:
-      labels:
-        app: goreplay
-    spec:
-      hostNetwork: true
-      serviceAccountName: goreplay
-      containers:
-      - name: goreplay
-        image: buger/gor:v2.0.0-rc4
-        args:
-        - "--input-raw k8s://deployments/nginx:80"
-        - "--output-stdout"
-        - "--verbose"

k8s/nginx.yaml

@@ -1,36 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx
-  labels:
-    app: nginx
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: nginx
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx
-        ports:
-        - containerPort: 80
-   
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: ngnix-service
-spec:
-  selector:
-    app: nginx
-  type: NodePort
-  ports:
-  - protocol: TCP
-    port: 80
-    targetPort: 80
-   

k8s/rolebinding.yaml

@@ -1,12 +0,0 @@
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: goreplay-reader-binding
-subjects:
-- kind: ServiceAccount
-  name: goreplay
-  namespace: goreplay
-roleRef:
-  kind: ClusterRole
-  name: pod-reader
-  apiGroup: ""

kafka.go

@@ -1,47 +1,35 @@
-package goreplay
+package main
 
 import (
 	"bytes"
-	"crypto/sha256"
-	"crypto/sha512"
 	"crypto/tls"
 	"crypto/x509"
 	"errors"
 	"fmt"
-	"github.com/buger/goreplay/proto"
 	"io/ioutil"
 	"log"
 
 	"github.com/Shopify/sarama"
-	"github.com/xdg-go/scram"
+	"github.com/buger/goreplay/proto"
 )
 
-// SASLKafkaConfig SASL configuration
-type SASLKafkaConfig struct {
-	UseSASL   bool   `json:"input-kafka-use-sasl"`
-	Mechanism string `json:"input-kafka-mechanism"`
-	Username  string `json:"input-kafka-username"`
-	Password  string `json:"input-kafka-password"`
-}
-
 // InputKafkaConfig should contains required information to
 // build producers.
 type InputKafkaConfig struct {
-	consumer   sarama.Consumer
-	Host       string `json:"input-kafka-host"`
-	Topic      string `json:"input-kafka-topic"`
-	UseJSON    bool   `json:"input-kafka-json-format"`
-	Offset     string  `json:"input-kafka-offset"`
-	SASLConfig SASLKafkaConfig
+	producer sarama.AsyncProducer
+	consumer sarama.Consumer
+	Host     string `json:"input-kafka-host"`
+	Topic    string `json:"input-kafka-topic"`
+	UseJSON  bool   `json:"input-kafka-json-format"`
 }
 
 // OutputKafkaConfig is the representation of kfka output configuration
 type OutputKafkaConfig struct {
-	producer   sarama.AsyncProducer
-	Host       string `json:"output-kafka-host"`
-	Topic      string `json:"output-kafka-topic"`
-	UseJSON    bool   `json:"output-kafka-json-format"`
-	SASLConfig SASLKafkaConfig
+	producer sarama.AsyncProducer
+	consumer sarama.Consumer
+	Host     string `json:"output-kafka-host"`
+	Topic    string `json:"output-kafka-topic"`
+	UseJSON  bool   `json:"output-kafka-json-format"`
 }
 
 // KafkaTLSConfig should contains TLS certificates for connecting to secured Kafka clusters
@@ -95,7 +83,7 @@ func NewTLSConfig(clientCertFile, clientKeyFile, caCertFile string) (*tls.Config
 }
 
 // NewKafkaConfig returns Kafka config with or without TLS
-func NewKafkaConfig(saslConfig *SASLKafkaConfig, tlsConfig *KafkaTLSConfig) *sarama.Config {
+func NewKafkaConfig(tlsConfig *KafkaTLSConfig) *sarama.Config {
 	config := sarama.NewConfig()
 	// Configuration options go here
 	if tlsConfig != nil && (tlsConfig.ClientCert != "" || tlsConfig.CACert != "") {
@@ -106,18 +94,6 @@ func NewKafkaConfig(saslConfig *SASLKafkaConfig, tlsConfig *KafkaTLSConfig) *sar
 		}
 		config.Net.TLS.Config = tlsConfig
 	}
-	if saslConfig.UseSASL {
-		mechanism := sarama.SASLMechanism(saslConfig.Mechanism)
-		config.Net.SASL.Enable = saslConfig.UseSASL
-		config.Net.SASL.Mechanism = mechanism
-		config.Net.SASL.User = saslConfig.Username
-		config.Net.SASL.Password = saslConfig.Password
-		if mechanism == sarama.SASLTypeSCRAMSHA256 {
-			config.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient { return &XDGSCRAMClient{HashGeneratorFcn: SHA256} }
-		} else if mechanism == sarama.SASLTypeSCRAMSHA512 {
-			config.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient { return &XDGSCRAMClient{HashGeneratorFcn: SHA512} }
-		}
-	}
 	return config
 }
 
@@ -139,38 +115,3 @@ func (m KafkaMessage) Dump() ([]byte, error) {
 
 	return b.Bytes(), nil
 }
-
-var (
-	// SHA256 SASLMechanism
-	SHA256 scram.HashGeneratorFcn = sha256.New
-	// SHA512 SASLMechanism
-	SHA512 scram.HashGeneratorFcn = sha512.New
-)
-
-// XDGSCRAMClient for SASL-Protocol
-type XDGSCRAMClient struct {
-	*scram.Client
-	*scram.ClientConversation
-	scram.HashGeneratorFcn
-}
-
-// Begin of XDGSCRAMClient
-func (x *XDGSCRAMClient) Begin(userName, password, authzID string) (err error) {
-	x.Client, err = x.HashGeneratorFcn.NewClient(userName, password, authzID)
-	if err != nil {
-		return err
-	}
-	x.ClientConversation = x.Client.NewConversation()
-	return nil
-}
-
-// Step of XDGSCRAMClient
-func (x *XDGSCRAMClient) Step(challenge string) (response string, err error) {
-	response, err = x.ClientConversation.Step(challenge)
-	return
-}
-
-// Done of XDGSCRAMClient
-func (x *XDGSCRAMClient) Done() bool {
-	return x.ClientConversation.Done()
-}

limiter.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"fmt"
@@ -31,22 +31,6 @@ func parseLimitOptions(options string) (limit int, isPercent bool) {
 	return
 }
 
-func newLimiterExceptions(l *Limiter) {
-
-	if !l.isPercent {
-		return
-	}
-	speedFactor := float64(l.limit) / float64(100)
-
-	// FileInput、KafkaInput have its own rate limiting. Unlike other inputs we not just dropping requests, we can slow down or speed up request emittion.
-	switch input := l.plugin.(type) {
-	case *FileInput:
-		input.speedFactor = speedFactor
-	case *KafkaInput:
-		input.speedFactor = speedFactor
-	}
-}
-
 // NewLimiter constructor for Limiter, accepts plugin and options
 // `options` allow to sprcify relatve or absolute limiting
 func NewLimiter(plugin interface{}, options string) PluginReadWriter {
@@ -55,28 +39,17 @@ func NewLimiter(plugin interface{}, options string) PluginReadWriter {
 	l.plugin = plugin
 	l.currentTime = time.Now().UnixNano()
 
-	newLimiterExceptions(l)
+	// FileInput have its own rate limiting. Unlike other inputs we not just dropping requests, we can slow down or speed up request emittion.
+	if fi, ok := l.plugin.(*FileInput); ok && l.isPercent {
+		fi.speedFactor = float64(l.limit) / float64(100)
+	}
 
 	return l
 }
 
-func (l *Limiter) isLimitedExceptions() bool {
-	if !l.isPercent {
-		return false
-	}
-	// Fileinput、Kafkainput have its own limiting algorithm
-	switch l.plugin.(type) {
-	case *FileInput:
-		return true
-	case *KafkaInput:
-		return true
-	default:
-		return false
-	}
-}
-
 func (l *Limiter) isLimited() bool {
-	if l.isLimitedExceptions() {
+	// File input have its own limiting algorithm
+	if _, ok := l.plugin.(*FileInput); ok && l.isPercent {
 		return false
 	}
 

limiter_test.go

@@ -1,6 +1,6 @@
-//go:build !race
+// +build !race
 
-package goreplay
+package main
 
 import (
 	"sync"

middleware.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"bufio"

middleware/README.md

@@ -117,115 +117,6 @@ Package expose following functions to process raw HTTP payloads:
 Also it is totally legit to use standard `Buffer` functions like `indexOf` for processing the HTTP payload. Just do not forget that if you modify the body, update the `Content-Length` header with a new value. And if you modify any of the headers, line endings should be `\r\n`. Rest is up to your imagination.
 
 
-## Masking PII Data
-
-This middleware provides functionality to mask Personally Identifiable Information (PII) data in HTTP requests based on specified headers and JSON paths. It allows you to define a configuration object that specifies which headers and JSON fields should be masked and the type of data they represent.
-
-```javascript
-const gor = require("goreplay_middleware");
-const faker = require("faker");
-
-// Initialize the middleware
-gor.init();
-
-// Configuration for masking PII data
-const maskConfig = {
-  headers: [
-    { name: "Authorization", type: "token" },
-    { name: "X-API-Key", type: "token" },
-    { name: "X-User-Email", type: "email" },
-    { name: "X-User-Name", type: "name" },
-  ],
-  jsonPaths: [
-    { path: "$.user.email", type: "email" },
-    { path: "$.user.name", type: "name" },
-    { path: "$.user.phone", type: "phone" },
-    { path: "$.user.address", type: "address" },
-  ],
-};
-
-// Function to mask a value based on its type
-function maskValue(type) {
-  switch (type) {
-    case "email":
-      return faker.internet.email();
-    case "name":
-      return faker.name.findName();
-    case "phone":
-      return faker.phone.phoneNumber();
-    case "address":
-      return faker.address.streetAddress();
-    case "token":
-      return faker.random.alphaNumeric(32);
-    default:
-      return "***";
-  }
-}
-
-// Middleware function to mask PII data
-gor.on("message", (data) => {
-  // Mask headers
-  maskConfig.headers.forEach((header) => {
-    const value = gor.httpHeader(data.http, header.name);
-    if (value) {
-      data.http = gor.setHttpHeader(data.http, header.name, maskValue(header.type));
-    }
-  });
-
-  // Mask JSON fields
-  const body = gor.httpBody(data.http);
-  if (body) {
-    try {
-      const jsonBody = JSON.parse(body.toString());
-      maskConfig.jsonPaths.forEach((field) => {
-        const value = eval(`jsonBody${field.path.slice(1)}`);
-        if (value) {
-          eval(`jsonBody${field.path.slice(1)} = maskValue(field.type)`);
-        }
-      });
-      data.http = gor.setHttpBody(data.http, Buffer.from(JSON.stringify(jsonBody)));
-    } catch (error) {
-      console.error("Error parsing JSON body:", error);
-    }
-  }
-
-  return data;
-});
-```
-
-### Configuration
-
-The `maskConfig` object is used to configure the masking behavior. It consists of two properties:
-
-- `headers`: An array of objects representing the headers to be masked. Each object should have the following properties:
-  - `name`: The name of the header.
-  - `type`: The type of data the header represents (e.g., "email", "name", "token").
-
-- `jsonPaths`: An array of objects representing the JSON paths to be masked. Each object should have the following properties:
-  - `path`: The JSON path to the field to be masked (e.g., "$.user.email").
-  - `type`: The type of data the field represents (e.g., "email", "name", "phone", "address").
-
-### Masking Function
-
-The `maskValue` function is responsible for generating masked values based on the data type. It uses the Faker library to generate realistic-looking masked data for different types such as email, name, phone, address, and token. You can extend this function to support additional data types or customize the masking behavior.
-
-### Middleware Function
-
-The middleware function is triggered for each HTTP message (request or response) processed by GoReplay. It performs the following steps:
-
-1. Iterate over the specified headers in the `maskConfig` and mask their values using the `maskValue` function based on the associated data type.
-
-2. Parse the JSON body of the request (if present) and iterate over the specified JSON paths in the `maskConfig`. If a value exists at a given path, replace it with a masked value generated by the `maskValue` function based on the associated data type.
-
-3. Update the request body with the masked JSON data.
-
-4. Return the modified HTTP message.
-
-Note: The middleware uses the `eval` function to dynamically access and modify the JSON object based on the provided paths. Exercise caution when using `eval` and ensure that the paths are properly validated to prevent potential security risks.
-
-To use this middleware, make sure to install the required dependencies (`goreplay_middleware` and `faker`), configure the `maskConfig` object according to your needs, and run the middleware with GoReplay.
-
-
 ## Support
 
 Feel free to ask questions here and by sending email to [support@goreplay.org](mailto:support@goreplay.org). Commercial support is available and welcomed 🙈.

middleware_test.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"bytes"
@@ -9,12 +9,14 @@ import (
 	"sync/atomic"
 	"syscall"
 	"testing"
+
+	"github.com/buger/goreplay/proto"
 )
 
 const echoSh = "./examples/middleware/echo.sh"
 const tokenModifier = "go run ./examples/middleware/token_modifier.go"
 
-var withDebug = append(syscall.Environ(), "GOR_TEST=1")
+var noDebug = append(syscall.Environ(), "GOR_TEST=1")
 
 func initMiddleware(cmd *exec.Cmd, cancl context.CancelFunc, l PluginReader, c func(error)) *Middleware {
 	var m Middleware
@@ -50,7 +52,7 @@ func initCmd(command string, env []string) (*exec.Cmd, context.CancelFunc) {
 func TestMiddlewareEarlyClose(t *testing.T) {
 	quit := make(chan struct{})
 	in := NewTestInput()
-	cmd, cancl := initCmd(echoSh, withDebug)
+	cmd, cancl := initCmd(echoSh, noDebug)
 	midd := initMiddleware(cmd, cancl, in, func(err error) {
 		if err != nil {
 			if e, ok := err.(*exec.ExitError); ok {
@@ -87,66 +89,66 @@ func TestMiddlewareEarlyClose(t *testing.T) {
 	<-quit
 }
 
-//func TestTokenMiddleware(t *testing.T) {
-//	quit := make(chan struct{})
-//	in := NewTestInput()
-//	in.skipHeader = true
-//	cmd, cancl := initCmd(tokenModifier, withDebug)
-//	midd := initMiddleware(cmd, cancl, in, func(err error) {})
-//	req := []byte("1 932079936fa4306fc308d67588178d17d823647c 1439818823587396305 200\nGET /token HTTP/1.1\r\nHost: example.org\r\n\r\n")
-//	res := []byte("2 932079936fa4306fc308d67588178d17d823647c 1439818823587396305 200\nHTTP/1.1 200 OK\r\nContent-Length: 10\r\nContent-Type: text/plain; charset=utf-8\r\n\r\n17d823647c")
-//	rep := []byte("3 932079936fa4306fc308d67588178d17d823647c 1439818823587396305 200\nHTTP/1.1 200 OK\r\nContent-Length: 15\r\nContent-Type: text/plain; charset=utf-8\r\n\r\n932079936fa4306")
-//	count := uint32(0)
-//	out := NewTestOutput(func(msg *Message) {
-//		if msg.Meta[0] == '1' && !bytes.Equal(payloadID(msg.Meta), payloadID(req)) {
-//			token, _, _ := proto.PathParam(msg.Data, []byte("token"))
-//			if !bytes.Equal(token, proto.Body(rep)) {
-//				t.Errorf("expected the token %s to be equal to the replayed response's token %s", token, proto.Body(rep))
-//			}
-//		}
-//		atomic.AddUint32(&count, 1)
-//		if atomic.LoadUint32(&count) == 2 {
-//			quit <- struct{}{}
-//		}
-//	})
-//	pl := &InOutPlugins{}
-//	pl.Inputs = []PluginReader{midd, in}
-//	pl.Outputs = []PluginWriter{out}
-//	pl.All = []interface{}{midd, out, in}
-//	e := NewEmitter()
-//	go e.Start(pl, "")
-//	in.EmitBytes(req) // emit original request
-//	in.EmitBytes(res) // emit its response
-//	in.EmitBytes(rep) // emit replayed response
-//	// emit the request which should have modified token
-//	token := []byte("1 8e091765ae902fef8a2b7d9dd96 14398188235873 100\nGET /?token=17d823647c HTTP/1.1\r\nHost: example.org\r\n\r\n")
-//	in.EmitBytes(token)
-//	<-quit
-//	midd.Close()
-//}
+func TestTokenMiddleware(t *testing.T) {
+	quit := make(chan struct{})
+	in := NewTestInput()
+	in.skipHeader = true
+	cmd, cancl := initCmd(tokenModifier, noDebug)
+	midd := initMiddleware(cmd, cancl, in, func(err error) {})
+	req := []byte("1 932079936fa4306fc308d67588178d17d823647c 1439818823587396305 200\nGET /token HTTP/1.1\r\nHost: example.org\r\n\r\n")
+	res := []byte("2 932079936fa4306fc308d67588178d17d823647c 1439818823587396305 200\nHTTP/1.1 200 OK\r\nContent-Length: 10\r\nContent-Type: text/plain; charset=utf-8\r\n\r\n17d823647c")
+	rep := []byte("3 932079936fa4306fc308d67588178d17d823647c 1439818823587396305 200\nHTTP/1.1 200 OK\r\nContent-Length: 15\r\nContent-Type: text/plain; charset=utf-8\r\n\r\n932079936fa4306")
+	count := uint32(0)
+	out := NewTestOutput(func(msg *Message) {
+		if msg.Meta[0] == '1' && !bytes.Equal(payloadID(msg.Meta), payloadID(req)) {
+			token, _, _ := proto.PathParam(msg.Data, []byte("token"))
+			if !bytes.Equal(token, proto.Body(rep)) {
+				t.Error("expected the token to be equal to the replayed responses's token")
+			}
+		}
+		atomic.AddUint32(&count, 1)
+		if atomic.LoadUint32(&count) == 2 {
+			quit <- struct{}{}
+		}
+	})
+	pl := &InOutPlugins{}
+	pl.Inputs = []PluginReader{midd, in}
+	pl.Outputs = []PluginWriter{out}
+	pl.All = []interface{}{midd, out, in}
+	e := NewEmitter()
+	go e.Start(pl, "")
+	in.EmitBytes(req) // emit original request
+	in.EmitBytes(res) // emit its response
+	in.EmitBytes(rep) // emit replayed response
+	// emit the request which should have modified token
+	token := []byte("1 8e091765ae902fef8a2b7d9dd96 14398188235873 100\nGET /?token=17d823647c HTTP/1.1\r\nHost: example.org\r\n\r\n")
+	in.EmitBytes(token)
+	<-quit
+	midd.Close()
+}
 
-//func TestMiddlewareWithPrettify(t *testing.T) {
-//	Settings.PrettifyHTTP = true
-//	quit := make(chan struct{})
-//	in := NewTestInput()
-//	cmd, cancl := initCmd(echoSh, withDebug)
-//	midd := initMiddleware(cmd, cancl, in, func(err error) {})
-//	var b1 = []byte("POST / HTTP/1.1\r\nHost: example.org\r\nTransfer-Encoding: chunked\r\n\r\n4\r\nWiki\r\n5\r\npedia\r\nE\r\n in\r\n\r\nchunks.\r\n0\r\n\r\n")
-//	var b2 = []byte("POST / HTTP/1.1\r\nHost: example.org\r\nContent-Length: 25\r\n\r\nWikipedia in\r\n\r\nchunks.")
-//	out := NewTestOutput(func(msg *Message) {
-//		if !bytes.Equal(proto.Body(b2), proto.Body(msg.Data)) {
-//			t.Errorf("expected %q body to equal %q body", b2, msg.Data)
-//		}
-//		quit <- struct{}{}
-//	})
-//	pl := &InOutPlugins{}
-//	pl.Inputs = []PluginReader{midd, in}
-//	pl.Outputs = []PluginWriter{out}
-//	pl.All = []interface{}{midd, out, in}
-//	e := NewEmitter()
-//	go e.Start(pl, "")
-//	in.EmitBytes(b1)
-//	<-quit
-//	midd.Close()
-//	Settings.PrettifyHTTP = false
-//}
+func TestMiddlewareWithPrettify(t *testing.T) {
+	Settings.PrettifyHTTP = true
+	quit := make(chan struct{})
+	in := NewTestInput()
+	cmd, cancl := initCmd(echoSh, noDebug)
+	midd := initMiddleware(cmd, cancl, in, func(err error) {})
+	var b1 = []byte("POST / HTTP/1.1\r\nHost: example.org\r\nTransfer-Encoding: chunked\r\n\r\n4\r\nWiki\r\n5\r\npedia\r\nE\r\n in\r\n\r\nchunks.\r\n0\r\n\r\n")
+	var b2 = []byte("POST / HTTP/1.1\r\nHost: example.org\r\nContent-Length: 25\r\n\r\nWikipedia in\r\n\r\nchunks.")
+	out := NewTestOutput(func(msg *Message) {
+		if !bytes.Equal(proto.Body(b2), proto.Body(msg.Data)) {
+			t.Errorf("expected %q body to equal %q body", b2, msg.Data)
+		}
+		quit <- struct{}{}
+	})
+	pl := &InOutPlugins{}
+	pl.Inputs = []PluginReader{midd, in}
+	pl.Outputs = []PluginWriter{out}
+	pl.All = []interface{}{midd, out, in}
+	e := NewEmitter()
+	go e.Start(pl, "")
+	in.EmitBytes(b1)
+	<-quit
+	midd.Close()
+	Settings.PrettifyHTTP = false
+}

nfpm.yaml

@@ -1,21 +0,0 @@
-# nfpm example config file
-#
-# check https://nfpm.goreleaser.com/configuration for detailed usage
-#
-name: "GoReplay"
-arch: ${PLATFORM}
-platform: "linux"
-version: ${VERSION}
-section: "default"
-priority: "extra"
-provides:
-- goreplay
-maintainer: "Leonid Bugaev <hello@goreplay.org>"
-description: |
- GoReplay is the simplest and safest way to test your app using real traffic before you put it into production. 
-vendor: "GoReplay"
-homepage: "https://goreplay.org"
-license: "AGPL"
-contents:
-- src: ./${BIN_NAME}
-  dst: /usr/local/bin

output_binary.go

@@ -1,16 +1,12 @@
-//go:build !pro
-
-package goreplay
+package main
 
 import (
-	"errors"
+	"sync/atomic"
 	"time"
 
-	"github.com/buger/goreplay/internal/size"
+	"github.com/buger/goreplay/size"
 )
 
-var _ PluginWriter = (*BinaryOutput)(nil)
-
 // BinaryOutputConfig struct for holding binary output configuration
 type BinaryOutputConfig struct {
 	Workers        int           `json:"output-binary-workers"`
@@ -24,30 +20,155 @@ type BinaryOutputConfig struct {
 // By default workers pool is dynamic and starts with 10 workers
 // You can specify fixed number of workers using `--output-tcp-workers`
 type BinaryOutput struct {
-	address string
+	// Keep this as first element of struct because it guarantees 64bit
+	// alignment. atomic.* functions crash on 32bit machines if operand is not
+	// aligned at 64bit. See https://github.com/golang/go/issues/599
+	activeWorkers int64
+	address       string
+	queue         chan *Message
+	responses     chan response
+	needWorker    chan int
+	quit          chan struct{}
+	config        *BinaryOutputConfig
+	queueStats    *GorStat
 }
 
 // NewBinaryOutput constructor for BinaryOutput
 // Initialize workers
 func NewBinaryOutput(address string, config *BinaryOutputConfig) PluginReadWriter {
-	return &BinaryOutput{address: address}
+	o := new(BinaryOutput)
+
+	o.address = address
+	o.config = config
+
+	o.queue = make(chan *Message, 1000)
+	o.responses = make(chan response, 1000)
+	o.needWorker = make(chan int, 1)
+	o.quit = make(chan struct{})
+
+	// Initial workers count
+	if o.config.Workers == 0 {
+		o.needWorker <- initialDynamicWorkers
+	} else {
+		o.needWorker <- o.config.Workers
+	}
+
+	go o.workerMaster()
+
+	return o
 }
 
-// PluginWrite writes a message to this plugin
+func (o *BinaryOutput) workerMaster() {
+	for {
+		newWorkers := <-o.needWorker
+		for i := 0; i < newWorkers; i++ {
+			go o.startWorker()
+		}
+
+		// Disable dynamic scaling if workers poll fixed size
+		if o.config.Workers != 0 {
+			return
+		}
+	}
+}
+
+func (o *BinaryOutput) startWorker() {
+	client := NewTCPClient(o.address, &TCPClientConfig{
+		Debug:              o.config.Debug,
+		Timeout:            o.config.Timeout,
+		ResponseBufferSize: int(o.config.BufferSize),
+	})
+
+	deathCount := 0
+
+	atomic.AddInt64(&o.activeWorkers, 1)
+
+	for {
+		select {
+		case msg := <-o.queue:
+			o.sendRequest(client, msg)
+			deathCount = 0
+		case <-time.After(time.Millisecond * 100):
+			// When dynamic scaling enabled workers die after 2s of inactivity
+			if o.config.Workers == 0 {
+				deathCount++
+			} else {
+				continue
+			}
+
+			if deathCount > 20 {
+				workersCount := atomic.LoadInt64(&o.activeWorkers)
+
+				// At least 1 startWorker should be alive
+				if workersCount != 1 {
+					atomic.AddInt64(&o.activeWorkers, -1)
+					return
+				}
+			}
+		}
+	}
+}
+
+// PluginWrite writes a message tothis plugin
 func (o *BinaryOutput) PluginWrite(msg *Message) (n int, err error) {
-	return 0, errors.New("binary output is only available in PRO version")
+	if !isRequestPayload(msg.Meta) {
+		return len(msg.Data), nil
+	}
+
+	o.queue <- msg
+
+	if o.config.Workers == 0 {
+		workersCount := atomic.LoadInt64(&o.activeWorkers)
+
+		if len(o.queue) > int(workersCount) {
+			o.needWorker <- len(o.queue)
+		}
+	}
+
+	return len(msg.Data) + len(msg.Meta), nil
 }
 
 // PluginRead reads a message from this plugin
 func (o *BinaryOutput) PluginRead() (*Message, error) {
-	return nil, errors.New("binary output is only available in PRO version")
+	var resp response
+	var msg Message
+	select {
+	case <-o.quit:
+		return nil, ErrorStopped
+	case resp = <-o.responses:
+	}
+	msg.Data = resp.payload
+	msg.Meta = payloadHeader(ReplayedResponsePayload, resp.uuid, resp.startedAt, resp.roundTripTime)
+
+	return &msg, nil
+}
+
+func (o *BinaryOutput) sendRequest(client *TCPClient, msg *Message) {
+	if !isRequestPayload(msg.Meta) {
+		return
+	}
+
+	uuid := payloadID(msg.Meta)
+
+	start := time.Now()
+	resp, err := client.Send(msg.Data)
+	stop := time.Now()
+
+	if err != nil {
+		Debug(1, "Request error:", err)
+	}
+
+	if o.config.TrackResponses {
+		o.responses <- response{resp, uuid, start.UnixNano(), stop.UnixNano() - start.UnixNano()}
+	}
 }
 
 func (o *BinaryOutput) String() string {
-	return "Binary output: " + o.address + " (PRO version required)"
+	return "Binary output: " + o.address
 }
 
 // Close closes this plugin for reading
 func (o *BinaryOutput) Close() error {
+	close(o.quit)
 	return nil
 }

output_binary_pro.go

@@ -1,178 +0,0 @@
-//go:build pro
-
-package goreplay
-
-import (
-	"sync/atomic"
-	"time"
-
-	"github.com/buger/goreplay/internal/size"
-)
-
-var _ PluginWriter = (*BinaryOutput)(nil)
-
-// BinaryOutputConfig struct for holding binary output configuration
-type BinaryOutputConfig struct {
-	Workers        int           `json:"output-binary-workers"`
-	Timeout        time.Duration `json:"output-binary-timeout"`
-	BufferSize     size.Size     `json:"output-tcp-response-buffer"`
-	Debug          bool          `json:"output-binary-debug"`
-	TrackResponses bool          `json:"output-binary-track-response"`
-}
-
-// BinaryOutput plugin manage pool of workers which send request to replayed server
-// By default workers pool is dynamic and starts with 10 workers
-// You can specify fixed number of workers using `--output-tcp-workers`
-type BinaryOutput struct {
-	// Keep this as first element of struct because it guarantees 64bit
-	// alignment. atomic.* functions crash on 32bit machines if operand is not
-	// aligned at 64bit. See https://github.com/golang/go/issues/599
-	activeWorkers int64
-	address       string
-	queue         chan *Message
-	responses     chan response
-	needWorker    chan int
-	quit          chan struct{}
-	config        *BinaryOutputConfig
-	queueStats    *GorStat
-}
-
-// NewBinaryOutput constructor for BinaryOutput
-// Initialize workers
-func NewBinaryOutput(address string, config *BinaryOutputConfig) PluginReadWriter {
-	o := new(BinaryOutput)
-
-	o.address = address
-	o.config = config
-
-	o.queue = make(chan *Message, 1000)
-	o.responses = make(chan response, 1000)
-	o.needWorker = make(chan int, 1)
-	o.quit = make(chan struct{})
-
-	// Initial workers count
-	if o.config.Workers == 0 {
-		o.needWorker <- initialDynamicWorkers
-	} else {
-		o.needWorker <- o.config.Workers
-	}
-
-	go o.workerMaster()
-
-	return o
-}
-
-func (o *BinaryOutput) workerMaster() {
-	for {
-		newWorkers := <-o.needWorker
-		for i := 0; i < newWorkers; i++ {
-			go o.startWorker()
-		}
-
-		// Disable dynamic scaling if workers poll fixed size
-		if o.config.Workers != 0 {
-			return
-		}
-	}
-}
-
-func (o *BinaryOutput) startWorker() {
-	client := NewTCPClient(o.address, &TCPClientConfig{
-		Debug:              o.config.Debug,
-		Timeout:            o.config.Timeout,
-		ResponseBufferSize: int(o.config.BufferSize),
-	})
-
-	deathCount := 0
-
-	atomic.AddInt64(&o.activeWorkers, 1)
-
-	for {
-		select {
-		case msg := <-o.queue:
-			o.sendRequest(client, msg)
-			deathCount = 0
-		case <-time.After(time.Millisecond * 100):
-			// When dynamic scaling enabled workers die after 2s of inactivity
-			if o.config.Workers == 0 {
-				deathCount++
-			} else {
-				continue
-			}
-
-			if deathCount > 20 {
-				workersCount := atomic.LoadInt64(&o.activeWorkers)
-
-				// At least 1 startWorker should be alive
-				if workersCount != 1 {
-					atomic.AddInt64(&o.activeWorkers, -1)
-					return
-				}
-			}
-		}
-	}
-}
-
-// PluginWrite writes a message tothis plugin
-func (o *BinaryOutput) PluginWrite(msg *Message) (n int, err error) {
-	if !isRequestPayload(msg.Meta) {
-		return len(msg.Data), nil
-	}
-
-	o.queue <- msg
-
-	if o.config.Workers == 0 {
-		workersCount := atomic.LoadInt64(&o.activeWorkers)
-
-		if len(o.queue) > int(workersCount) {
-			o.needWorker <- len(o.queue)
-		}
-	}
-
-	return len(msg.Data) + len(msg.Meta), nil
-}
-
-// PluginRead reads a message from this plugin
-func (o *BinaryOutput) PluginRead() (*Message, error) {
-	var resp response
-	var msg Message
-	select {
-	case <-o.quit:
-		return nil, ErrorStopped
-	case resp = <-o.responses:
-	}
-	msg.Data = resp.payload
-	msg.Meta = payloadHeader(ReplayedResponsePayload, resp.uuid, resp.startedAt, resp.roundTripTime)
-
-	return &msg, nil
-}
-
-func (o *BinaryOutput) sendRequest(client *TCPClient, msg *Message) {
-	if !isRequestPayload(msg.Meta) {
-		return
-	}
-
-	uuid := payloadID(msg.Meta)
-
-	start := time.Now()
-	resp, err := client.Send(msg.Data)
-	stop := time.Now()
-
-	if err != nil {
-		Debug(1, "Request error:", err)
-	}
-
-	if o.config.TrackResponses {
-		o.responses <- response{resp, uuid, start.UnixNano(), stop.UnixNano() - start.UnixNano()}
-	}
-}
-
-func (o *BinaryOutput) String() string {
-	return "Binary output: " + o.address
-}
-
-// Close closes this plugin for reading
-func (o *BinaryOutput) Close() error {
-	close(o.quit)
-	return nil
-}

output_dummy.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"os"

output_file.go

@@ -1,11 +1,10 @@
-package goreplay
+package main
 
 import (
 	"bufio"
 	"compress/gzip"
 	"errors"
 	"fmt"
-	"github.com/buger/goreplay/internal/size"
 	"io"
 	"log"
 	"math/rand"
@@ -17,6 +16,8 @@ import (
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/buger/goreplay/size"
 )
 
 var letters = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
@@ -81,6 +82,7 @@ func NewFileOutput(pathTemplate string, config *FileOutputConfig) *FileOutput {
 	o := new(FileOutput)
 	o.pathTemplate = pathTemplate
 	o.config = config
+	o.updateName()
 
 	if strings.Contains(pathTemplate, "%r") {
 		o.requestPerFile = true
@@ -96,6 +98,7 @@ func NewFileOutput(pathTemplate string, config *FileOutputConfig) *FileOutput {
 			if o.IsClosed() {
 				break
 			}
+			o.updateName()
 			o.flush()
 		}
 	}()

output_file_test.go

@@ -1,8 +1,7 @@
-package goreplay
+package main
 
 import (
 	"fmt"
-	"github.com/buger/goreplay/internal/size"
 	"math/rand"
 	"os"
 	"reflect"
@@ -11,6 +10,8 @@ import (
 	"sync/atomic"
 	"testing"
 	"time"
+
+	"github.com/buger/goreplay/size"
 )
 
 func TestFileOutput(t *testing.T) {
@@ -314,6 +315,7 @@ func TestFileOutputAppendSizeLimitOverflow(t *testing.T) {
 	name2 := output.file.Name()
 
 	output.flush()
+	output.updateName()
 
 	output.PluginWrite(&Message{Meta: []byte("1 1 1\r\n"), Data: []byte("test")})
 	name3 := output.file.Name()

output_http.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"bufio"
@@ -13,7 +13,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/buger/goreplay/internal/size"
+	"github.com/buger/goreplay/size"
 )
 
 const (
@@ -25,100 +25,42 @@ const (
 type response struct {
 	payload       []byte
 	uuid          []byte
-	startedAt     int64
 	roundTripTime int64
+	startedAt     int64
 }
 
 // HTTPOutputConfig struct for holding http output configuration
 type HTTPOutputConfig struct {
-	TrackResponses    bool          `json:"output-http-track-response"`
-	Stats             bool          `json:"output-http-stats"`
-	OriginalHost      bool          `json:"output-http-original-host"`
-	RedirectLimit     int           `json:"output-http-redirect-limit"`
-	WorkersMin        int           `json:"output-http-workers-min"`
-	WorkersMax        int           `json:"output-http-workers"`
-	StatsMs           int           `json:"output-http-stats-ms"`
-	QueueLen          int           `json:"output-http-queue-len"`
-	ElasticSearch     string        `json:"output-http-elasticsearch"`
-	Timeout           time.Duration `json:"output-http-timeout"`
-	WorkerTimeout     time.Duration `json:"output-http-worker-timeout"`
-	BufferSize        size.Size     `json:"output-http-response-buffer"`
-	SkipVerify        bool          `json:"output-http-skip-verify"`
-	CompatibilityMode bool          `json:"output-http-compatibility-mode"`
-	RequestGroup      string        `json:"output-http-request-group"`
-	Debug             bool          `json:"output-http-debug"`
-	rawURL            string
-	url               *url.URL
-}
-
-func (hoc *HTTPOutputConfig) Copy() *HTTPOutputConfig {
-	return &HTTPOutputConfig{
-		TrackResponses:    hoc.TrackResponses,
-		Stats:             hoc.Stats,
-		OriginalHost:      hoc.OriginalHost,
-		RedirectLimit:     hoc.RedirectLimit,
-		WorkersMin:        hoc.WorkersMin,
-		WorkersMax:        hoc.WorkersMax,
-		StatsMs:           hoc.StatsMs,
-		QueueLen:          hoc.QueueLen,
-		ElasticSearch:     hoc.ElasticSearch,
-		Timeout:           hoc.Timeout,
-		WorkerTimeout:     hoc.WorkerTimeout,
-		BufferSize:        hoc.BufferSize,
-		SkipVerify:        hoc.SkipVerify,
-		CompatibilityMode: hoc.CompatibilityMode,
-		RequestGroup:      hoc.RequestGroup,
-		Debug:             hoc.Debug,
-	}
+	TrackResponses bool          `json:"output-http-track-response"`
+	Stats          bool          `json:"output-http-stats"`
+	OriginalHost   bool          `json:"output-http-original-host"`
+	RedirectLimit  int           `json:"output-http-redirect-limit"`
+	WorkersMin     int           `json:"output-http-workers-min"`
+	WorkersMax     int           `json:"output-http-workers"`
+	StatsMs        int           `json:"output-http-stats-ms"`
+	QueueLen       int           `json:"output-http-queue-len"`
+	ElasticSearch  string        `json:"output-http-elasticsearch"`
+	Timeout        time.Duration `json:"output-http-timeout"`
+	WorkerTimeout  time.Duration `json:"output-http-worker-timeout"`
+	BufferSize     size.Size     `json:"output-http-response-buffer"`
+	SkipVerify     bool          `json:"output-http-skip-verify"`
+	rawURL         string
+	url            *url.URL
 }
 
 // HTTPOutput plugin manage pool of workers which send request to replayed server
 // By default workers pool is dynamic and starts with 1 worker or workerMin workers
 // You can specify maximum number of workers using `--output-http-workers`
 type HTTPOutput struct {
-	activeWorkers  int64
-	config         *HTTPOutputConfig
-	queueStats     *GorStat
-	elasticSearch  *ESPlugin
-	client         *HTTPClient
-	stopWorker     chan struct{}
-	queue          chan *Message
-	responses      chan *response
-	stop           chan bool // Channel used only to indicate goroutine should shutdown
-	workerSessions map[string]*httpWorker
-}
-
-type httpWorker struct {
-	output       *HTTPOutput
-	client       *HTTPClient
-	lastActivity time.Time
-	queue        chan *Message
-	stop         chan bool
-}
-
-func newHTTPWorker(output *HTTPOutput, queue chan *Message) *httpWorker {
-	client := NewHTTPClient(output.config)
-
-	w := &httpWorker{client: client, output: output}
-	if queue == nil {
-		w.queue = make(chan *Message, 100)
-	} else {
-		w.queue = queue
-	}
-	w.stop = make(chan bool)
-
-	go func() {
-		for {
-			select {
-			case msg := <-w.queue:
-				output.sendRequest(client, msg)
-			case <-w.stop:
-				return
-			}
-		}
-	}()
-
-	return w
+	activeWorkers int32
+	config        *HTTPOutputConfig
+	queueStats    *GorStat
+	elasticSearch *ESPlugin
+	client        *HTTPClient
+	stopWorker    chan struct{}
+	queue         chan *Message
+	responses     chan *response
+	stop          chan bool // Channel used only to indicate goroutine should shutdown
 }
 
 // NewHTTPOutput constructor for HTTPOutput
@@ -126,43 +68,42 @@ func newHTTPWorker(output *HTTPOutput, queue chan *Message) *httpWorker {
 func NewHTTPOutput(address string, config *HTTPOutputConfig) PluginReadWriter {
 	o := new(HTTPOutput)
 	var err error
-	newConfig := config.Copy()
-	newConfig.url, err = url.Parse(address)
+	config.url, err = url.Parse(address)
 	if err != nil {
 		log.Fatal(fmt.Sprintf("[OUTPUT-HTTP] parse HTTP output URL error[%q]", err))
 	}
-	if newConfig.url.Scheme == "" {
-		newConfig.url.Scheme = "http"
+	if config.url.Scheme == "" {
+		config.url.Scheme = "http"
 	}
-	newConfig.rawURL = newConfig.url.String()
-	if newConfig.Timeout < time.Millisecond*100 {
-		newConfig.Timeout = time.Second
+	config.rawURL = config.url.String()
+	if config.Timeout < time.Millisecond*100 {
+		config.Timeout = time.Second
 	}
-	if newConfig.BufferSize <= 0 {
-		newConfig.BufferSize = 100 * 1024 // 100kb
+	if config.BufferSize <= 0 {
+		config.BufferSize = 100 * 1024 // 100kb
 	}
-	if newConfig.WorkersMin <= 0 {
-		newConfig.WorkersMin = 1
+	if config.WorkersMin <= 0 {
+		config.WorkersMin = 1
 	}
-	if newConfig.WorkersMin > 1000 {
-		newConfig.WorkersMin = 1000
+	if config.WorkersMin > 1000 {
+		config.WorkersMin = 1000
 	}
-	if newConfig.WorkersMax <= 0 {
-		newConfig.WorkersMax = math.MaxInt32 // ideally so large
+	if config.WorkersMax <= 0 {
+		config.WorkersMax = math.MaxInt32 // idealy so large
 	}
-	if newConfig.WorkersMax < newConfig.WorkersMin {
-		newConfig.WorkersMax = newConfig.WorkersMin
+	if config.WorkersMax < config.WorkersMin {
+		config.WorkersMax = config.WorkersMin
 	}
-	if newConfig.QueueLen <= 0 {
-		newConfig.QueueLen = 1000
+	if config.QueueLen <= 0 {
+		config.QueueLen = 1000
 	}
-	if newConfig.RedirectLimit < 0 {
-		newConfig.RedirectLimit = 0
+	if config.RedirectLimit < 0 {
+		config.RedirectLimit = 0
 	}
-	if newConfig.WorkerTimeout <= 0 {
-		newConfig.WorkerTimeout = time.Second * 2
+	if config.WorkerTimeout <= 0 {
+		config.WorkerTimeout = time.Second * 2
 	}
-	o.config = newConfig
+	o.config = config
 	o.stop = make(chan bool)
 	if o.config.Stats {
 		o.queueStats = NewGorStat("output_http", o.config.StatsMs)
@@ -180,18 +121,11 @@ func NewHTTPOutput(address string, config *HTTPOutputConfig) PluginReadWriter {
 		o.elasticSearch.Init(o.config.ElasticSearch)
 	}
 	o.client = NewHTTPClient(o.config)
-
-	if Settings.RecognizeTCPSessions {
-		o.workerSessions = make(map[string]*httpWorker, 100)
-		go o.sessionWorkerMaster()
-	} else {
-		o.activeWorkers += int64(o.config.WorkersMin)
-		for i := 0; i < o.config.WorkersMin; i++ {
-			go o.startWorker()
-		}
-		go o.workerMaster()
+	o.activeWorkers += int32(o.config.WorkersMin)
+	for i := 0; i < o.config.WorkersMin; i++ {
+		go o.startWorker()
 	}
-
+	go o.workerMaster()
 	return o
 }
 
@@ -212,48 +146,16 @@ func (o *HTTPOutput) workerMaster() {
 		}
 		// rollback workers
 	rollback:
-		if atomic.LoadInt64(&o.activeWorkers) > int64(o.config.WorkersMin) && len(o.queue) < 1 {
+		if atomic.LoadInt32(&o.activeWorkers) > int32(o.config.WorkersMin) && len(o.queue) < 1 {
 			// close one worker
 			o.stopWorker <- struct{}{}
-			atomic.AddInt64(&o.activeWorkers, -1)
+			atomic.AddInt32(&o.activeWorkers, -1)
 			goto rollback
 		}
 		timer.Reset(o.config.WorkerTimeout)
 	}
 }
 
-func (o *HTTPOutput) sessionWorkerMaster() {
-	gc := time.Tick(time.Second)
-
-	for {
-		select {
-		case msg := <-o.queue:
-			id := payloadID(msg.Meta)
-			sessionID := string(id[0:20])
-			worker, ok := o.workerSessions[sessionID]
-
-			if !ok {
-				atomic.AddInt64(&o.activeWorkers, 1)
-				worker = newHTTPWorker(o, nil)
-				o.workerSessions[sessionID] = worker
-			}
-
-			worker.queue <- msg
-			worker.lastActivity = time.Now()
-		case <-gc:
-			now := time.Now()
-
-			for id, w := range o.workerSessions {
-				if !w.lastActivity.IsZero() && now.Sub(w.lastActivity) >= 120*time.Second {
-					w.stop <- true
-					delete(o.workerSessions, id)
-					atomic.AddInt64(&o.activeWorkers, -1)
-				}
-			}
-		}
-	}
-}
-
 func (o *HTTPOutput) startWorker() {
 	for {
 		select {
@@ -280,25 +182,13 @@ func (o *HTTPOutput) PluginWrite(msg *Message) (n int, err error) {
 	if o.config.Stats {
 		o.queueStats.Write(len(o.queue))
 	}
-
-	if !Settings.RecognizeTCPSessions && o.config.WorkersMax != o.config.WorkersMin {
-		workersCount := int(atomic.LoadInt64(&o.activeWorkers))
-
-		if len(o.queue) > workersCount {
-			extraWorkersReq := len(o.queue) - workersCount + 1
-			maxWorkersAvailable := o.config.WorkersMax - workersCount
-			if extraWorkersReq > maxWorkersAvailable {
-				extraWorkersReq = maxWorkersAvailable
-			}
-			if extraWorkersReq > 0 {
-				for i := 0; i < extraWorkersReq; i++ {
-					go o.startWorker()
-					atomic.AddInt64(&o.activeWorkers, 1)
-				}
-			}
+	if len(o.queue) > 0 {
+		// try to start a new worker to serve
+		if atomic.LoadInt32(&o.activeWorkers) < int32(o.config.WorkersMax) {
+			go o.startWorker()
+			atomic.AddInt32(&o.activeWorkers, 1)
 		}
 	}
-
 	return len(msg.Data) + len(msg.Meta), nil
 }
 
@@ -316,7 +206,7 @@ func (o *HTTPOutput) PluginRead() (*Message, error) {
 		msg.Data = resp.payload
 	}
 
-	msg.Meta = payloadHeader(ReplayedResponsePayload, resp.uuid, resp.startedAt, resp.roundTripTime)
+	msg.Meta = payloadHeader(ReplayedResponsePayload, resp.uuid, resp.roundTripTime, resp.startedAt)
 
 	return &msg, nil
 }
@@ -384,7 +274,7 @@ func NewHTTPClient(config *HTTPOutputConfig) *HTTPClient {
 		},
 	}
 	if config.SkipVerify {
-		// clone to avoid modifying global default RoundTripper
+		// clone to avoid modying global default RoundTripper
 		transport = http.DefaultTransport.(*http.Transport).Clone()
 		transport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
 		client.Client.Transport = transport
@@ -393,7 +283,7 @@ func NewHTTPClient(config *HTTPOutputConfig) *HTTPClient {
 	return client
 }
 
-// Send sends an http request using client created by NewHTTPClient
+// Send sends an http request using client create by NewHTTPClient
 func (c *HTTPClient) Send(data []byte) ([]byte, error) {
 	var req *http.Request
 	var resp *http.Response

output_http_test.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"io/ioutil"

output_kafka.go

@@ -1,13 +1,14 @@
-package goreplay
+package main
 
 import (
 	"encoding/json"
-	"github.com/buger/goreplay/internal/byteutils"
-	"github.com/buger/goreplay/proto"
 	"log"
 	"strings"
 	"time"
 
+	"github.com/buger/goreplay/byteutils"
+	"github.com/buger/goreplay/proto"
+
 	"github.com/Shopify/sarama"
 	"github.com/Shopify/sarama/mocks"
 )
@@ -22,8 +23,8 @@ type KafkaOutput struct {
 const KafkaOutputFrequency = 500
 
 // NewKafkaOutput creates instance of kafka producer client  with TLS config
-func NewKafkaOutput(_ string, config *OutputKafkaConfig, tlsConfig *KafkaTLSConfig) PluginWriter {
-	c := NewKafkaConfig(&config.SASLConfig, tlsConfig)
+func NewKafkaOutput(address string, config *OutputKafkaConfig, tlsConfig *KafkaTLSConfig) PluginWriter {
+	c := NewKafkaConfig(tlsConfig)
 
 	var producer sarama.AsyncProducer
 

output_kafka_test.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"testing"

output_null.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 // NullOutput used for debugging, prints nothing
 type NullOutput struct {

output_s3.go

@@ -1,29 +1,131 @@
-//go:build !pro
-
-package goreplay
+package main
 
 import (
-	"errors"
+	_ "bufio"
 	"fmt"
+	_ "io"
+	"log"
+	"math/rand"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/s3"
+	_ "github.com/aws/aws-sdk-go/service/s3/s3manager"
 )
 
 // S3Output output plugin
-type S3Output struct{}
+type S3Output struct {
+	pathTemplate string
+
+	buffer  *FileOutput
+	session *session.Session
+	config  *FileOutputConfig
+	closeCh chan struct{}
+}
 
 // NewS3Output constructor for FileOutput, accepts path
 func NewS3Output(pathTemplate string, config *FileOutputConfig) *S3Output {
-	fmt.Println("S3 output is only available in the pro version")
-	return &S3Output{}
+	if !PRO {
+		log.Fatal("Using S3 output and input requires PRO license")
+		return nil
+	}
+
+	o := new(S3Output)
+	o.pathTemplate = pathTemplate
+	o.config = config
+	o.config.onClose = o.onBufferUpdate
+
+	if config.BufferPath == "" {
+		config.BufferPath = "/tmp"
+	}
+
+	rnd := rand.Int63()
+	bufferName := fmt.Sprintf("gor_output_s3_%d_buf_", rnd)
+
+	pathParts := strings.Split(pathTemplate, "/")
+	bufferName += pathParts[len(pathParts)-1]
+
+	if strings.HasSuffix(o.pathTemplate, ".gz") {
+		bufferName += ".gz"
+	}
+
+	bufferPath := filepath.Join(config.BufferPath, bufferName)
+
+	o.buffer = NewFileOutput(bufferPath, config)
+	o.connect()
+
+	return o
 }
 
+func (o *S3Output) connect() {
+	if o.session == nil {
+		o.session = session.Must(session.NewSession(awsConfig()))
+		log.Println("[S3 Output] S3 connection successfully initialized")
+	}
+}
+
+// PluginWrite writes message to this plugin
 func (o *S3Output) PluginWrite(msg *Message) (n int, err error) {
-	return 0, errors.New("S3 output is only available in the pro version")
+	return o.buffer.PluginWrite(msg)
 }
 
 func (o *S3Output) String() string {
-	return "S3 output (pro version only)"
+	return "S3 output: " + o.pathTemplate
 }
 
+// Close close the buffer of the S3 connection
 func (o *S3Output) Close() error {
-	return errors.New("S3 output is only available in the pro version")
+	return o.buffer.Close()
+}
+
+func parseS3Url(path string) (bucket, key string) {
+	path = path[5:] // stripping `s3://`
+	sep := strings.IndexByte(path, '/')
+
+	bucket = path[:sep]
+	key = path[sep+1:]
+
+	return bucket, key
+}
+
+func (o *S3Output) keyPath(idx int) (bucket, key string) {
+	bucket, key = parseS3Url(o.pathTemplate)
+
+	for name, fn := range dateFileNameFuncs {
+		key = strings.Replace(key, name, fn(o.buffer), -1)
+	}
+
+	key = setFileIndex(key, idx)
+
+	return
+}
+
+func (o *S3Output) onBufferUpdate(path string) {
+	svc := s3.New(o.session)
+	idx := getFileIndex(path)
+	bucket, key := o.keyPath(idx)
+
+	file, err := os.Open(path)
+	if err != nil {
+		Debug(0, fmt.Sprintf("[S3 Output] Failed to open file %q. err: %q", path, err))
+		return
+	}
+	defer os.Remove(path)
+
+	_, err = svc.PutObject(&s3.PutObjectInput{
+		Body:   file,
+		Bucket: aws.String(bucket),
+		Key:    aws.String(key),
+	})
+	if err != nil {
+		Debug(0, fmt.Sprintf("[S3 Output] Failed to upload data to %q/%q, %q", bucket, key, err))
+		return
+	}
+
+	if o.closeCh != nil {
+		o.closeCh <- struct{}{}
+	}
 }

output_s3_pro.go

@@ -1,117 +0,0 @@
-//go:build pro
-
-package goreplay
-
-import (
-	_ "bufio"
-	"fmt"
-	_ "io"
-	"log"
-	"math/rand"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/s3"
-	_ "github.com/aws/aws-sdk-go/service/s3/s3manager"
-)
-
-var _ PluginWriter = (*S3Output)(nil)
-
-// S3Output output plugin
-type S3Output struct {
-	pathTemplate string
-
-	buffer  *FileOutput
-	session *session.Session
-	config  *FileOutputConfig
-	closeC  chan struct{}
-}
-
-// NewS3Output constructor for FileOutput, accepts path
-func NewS3Output(pathTemplate string, config *FileOutputConfig) *S3Output {
-	o := new(S3Output)
-	o.pathTemplate = pathTemplate
-	o.config = config
-	o.config.onClose = o.onBufferUpdate
-
-	if config.BufferPath == "" {
-		config.BufferPath = "/tmp"
-	}
-
-	rnd := rand.Int63()
-	buffer_name := fmt.Sprintf("gor_output_s3_%d_buf_", rnd)
-
-	pathParts := strings.Split(pathTemplate, "/")
-	buffer_name += pathParts[len(pathParts)-1]
-
-	if strings.HasSuffix(o.pathTemplate, ".gz") {
-		buffer_name += ".gz"
-	}
-
-	buffer_path := filepath.Join(config.BufferPath, buffer_name)
-
-	o.buffer = NewFileOutput(buffer_path, config)
-	o.connect()
-
-	return o
-}
-
-func (o *S3Output) connect() {
-	if o.session == nil {
-		o.session = session.Must(session.NewSession(awsConfig()))
-		log.Println("[S3 Output] S3 connection succesfully initialized")
-	}
-}
-
-func (o *S3Output) PluginWrite(msg *Message) (n int, err error) {
-	return o.buffer.PluginWrite(msg)
-}
-
-func (o *S3Output) String() string {
-	return "S3 output: " + o.pathTemplate
-}
-
-func (o *S3Output) Close() error {
-	return o.buffer.Close()
-}
-
-func (o *S3Output) keyPath(idx int) (bucket, key string) {
-	bucket, key = parseS3Url(o.pathTemplate)
-
-	for name, fn := range dateFileNameFuncs {
-		key = strings.Replace(key, name, fn(o.buffer), -1)
-	}
-
-	key = setFileIndex(key, idx)
-
-	return
-}
-
-func (o *S3Output) onBufferUpdate(path string) {
-	svc := s3.New(o.session)
-	idx := getFileIndex(path)
-	bucket, key := o.keyPath(idx)
-
-	file, _ := os.Open(path)
-	// reader := bufio.NewReader(file)
-
-	_, err := svc.PutObject(&s3.PutObjectInput{
-		Body:   file,
-		Bucket: aws.String(bucket),
-		Key:    aws.String(key),
-	})
-	if err != nil {
-		log.Printf("[S3 Output] Failed to upload data to %s/%s, %s\n", bucket, key, err)
-		os.Remove(path)
-		return
-	}
-
-	os.Remove(path)
-
-	if o.closeC != nil {
-		o.closeC <- struct{}{}
-	}
-}

output_tcp.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"context"
@@ -29,9 +29,6 @@ type TCPOutputConfig struct {
 	Sticky     bool `json:"output-tcp-sticky"`
 	SkipVerify bool `json:"output-tcp-skip-verify"`
 	Workers    int  `json:"output-tcp-workers"`
-
-	GetInitMessage     func() *Message                         `json:"-"`
-	WriteBeforeMessage func(conn net.Conn, msg *Message) error `json:"-"`
 }
 
 // NewTCPOutput constructor for TCPOutput
@@ -81,37 +78,21 @@ func (o *TCPOutput) worker(bufferIndex int) {
 
 	defer conn.Close()
 
-	if o.config.GetInitMessage != nil {
-		msg := o.config.GetInitMessage()
-		_ = o.writeToConnection(conn, msg)
-	}
-
 	for {
 		msg := <-o.buf[bufferIndex]
-		err = o.writeToConnection(conn, msg)
-		if err != nil {
-			Debug(2, "INFO: TCP output connection closed, reconnecting")
-			go o.worker(bufferIndex)
-			o.buf[bufferIndex] <- msg
-			break
-		}
-	}
-}
-
-func (o *TCPOutput) writeToConnection(conn net.Conn, msg *Message) (err error) {
-	if o.config.WriteBeforeMessage != nil {
-		err = o.config.WriteBeforeMessage(conn, msg)
-	}
-
-	if err == nil {
 		if _, err = conn.Write(msg.Meta); err == nil {
 			if _, err = conn.Write(msg.Data); err == nil {
 				_, err = conn.Write(payloadSeparatorAsBytes)
 			}
 		}
-	}
 
-	return err
+		if err != nil {
+			Debug(2, "INFO: TCP output connection closed, reconnecting")
+			o.buf[bufferIndex] <- msg
+			go o.worker(bufferIndex)
+			break
+		}
+	}
 }
 
 func (o *TCPOutput) getBufferIndex(msg *Message) int {

output_tcp_test.go

@@ -1,15 +1,12 @@
-package goreplay
+package main
 
 import (
 	"bufio"
 	"log"
 	"net"
-	"strings"
 	"sync"
 	"testing"
 	"time"
-
-	"github.com/stretchr/testify/assert"
 )
 
 func TestTCPOutput(t *testing.T) {
@@ -18,8 +15,24 @@ func TestTCPOutput(t *testing.T) {
 	listener := startTCP(func(data []byte) {
 		wg.Done()
 	})
+	input := NewTestInput()
 	output := NewTCPOutput(listener.Addr().String(), &TCPOutputConfig{Workers: 10})
-	runTCPOutput(wg, output, 10, false)
+
+	plugins := &InOutPlugins{
+		Inputs:  []PluginReader{input},
+		Outputs: []PluginWriter{output},
+	}
+
+	emitter := NewEmitter()
+	go emitter.Start(plugins, Settings.Middleware)
+
+	for i := 0; i < 10; i++ {
+		wg.Add(1)
+		input.EmitGET()
+	}
+
+	wg.Wait()
+	emitter.Close()
 }
 
 func startTCP(cb func([]byte)) net.Listener {
@@ -118,76 +131,3 @@ func getTestBytes() *Message {
 		Data: []byte("GET / HTTP/1.1\r\nHost: www.w3.org\r\nUser-Agent: Go 1.1 package http\r\nAccept-Encoding: gzip\r\n\r\n"),
 	}
 }
-
-func TestTCPOutputGetInitMessage(t *testing.T) {
-	wg := new(sync.WaitGroup)
-
-	var dataList [][]byte
-	listener := startTCP(func(data []byte) {
-		dataList = append(dataList, data)
-		wg.Done()
-	})
-	getInitMessage := func() *Message {
-		return &Message{
-			Meta: []byte{},
-			Data: []byte("test1"),
-		}
-	}
-	output := NewTCPOutput(listener.Addr().String(), &TCPOutputConfig{Workers: 1, GetInitMessage: getInitMessage})
-
-	runTCPOutput(wg, output, 1, true)
-
-	if assert.Equal(t, 2, len(dataList)) {
-		assert.Equal(t, "test1", string(dataList[0]))
-	}
-}
-
-func TestTCPOutputGetInitMessageAndWriteBeforeMessage(t *testing.T) {
-	wg := new(sync.WaitGroup)
-
-	var dataList [][]byte
-	listener := startTCP(func(data []byte) {
-		dataList = append(dataList, data)
-		wg.Done()
-	})
-	getInitMessage := func() *Message {
-		return &Message{
-			Meta: []byte{},
-			Data: []byte("test2"),
-		}
-	}
-	writeBeforeMessage := func(conn net.Conn, _ *Message) error {
-		_, err := conn.Write([]byte("before"))
-		return err
-	}
-	output := NewTCPOutput(listener.Addr().String(), &TCPOutputConfig{Workers: 1, GetInitMessage: getInitMessage, WriteBeforeMessage: writeBeforeMessage})
-
-	runTCPOutput(wg, output, 1, true)
-
-	if assert.Equal(t, 2, len(dataList)) {
-		assert.Equal(t, "beforetest2", string(dataList[0]))
-		assert.True(t, strings.HasPrefix(string(dataList[1]), "before"))
-	}
-}
-
-func runTCPOutput(wg *sync.WaitGroup, output PluginWriter, repeat int, initMessage bool) {
-	input := NewTestInput()
-	plugins := &InOutPlugins{
-		Inputs:  []PluginReader{input},
-		Outputs: []PluginWriter{output},
-	}
-
-	emitter := NewEmitter()
-	go emitter.Start(plugins, Settings.Middleware)
-
-	if initMessage {
-		wg.Add(1)
-	}
-	for i := 0; i < repeat; i++ {
-		wg.Add(1)
-		input.EmitGET()
-	}
-
-	wg.Wait()
-	emitter.Close()
-}

output_ws.go

@@ -1,162 +0,0 @@
-package goreplay
-
-import (
-	"context"
-	"crypto/tls"
-	"encoding/base64"
-	"fmt"
-	"hash/fnv"
-	"log"
-	"net/http"
-	"net/url"
-	"strings"
-	"time"
-
-	"github.com/gorilla/websocket"
-)
-
-// WebSocketOutput used for sending raw tcp payloads
-// Can be used for transferring binary payloads like protocol buffers
-type WebSocketOutput struct {
-	address     string
-	limit       int
-	buf         []chan *Message
-	bufStats    *GorStat
-	config      *WebSocketOutputConfig
-	workerIndex uint32
-	headers     http.Header
-
-	close bool
-}
-
-// WebSocketOutputConfig WebSocket output configuration
-type WebSocketOutputConfig struct {
-	Sticky     bool `json:"output-ws-sticky"`
-	SkipVerify bool `json:"output-ws-skip-verify"`
-	Workers    int  `json:"output-ws-workers"`
-
-	Headers map[string][]string `json:"output-ws-headers"`
-}
-
-// NewWebSocketOutput constructor for WebSocketOutput
-// Initialize X workers which hold keep-alive connection
-func NewWebSocketOutput(address string, config *WebSocketOutputConfig) PluginWriter {
-	o := new(WebSocketOutput)
-
-	u, err := url.Parse(address)
-	if err != nil {
-		log.Fatal(fmt.Sprintf("[OUTPUT-WS] parse WS output URL error[%q]", err))
-	}
-
-	o.config = config
-	o.headers = http.Header{
-		"Authorization": []string{"Basic " + base64.StdEncoding.EncodeToString([]byte(u.User.String()))},
-	}
-	for k, values := range config.Headers {
-		for _, v := range values {
-			o.headers.Add(k, v)
-		}
-	}
-
-	u.User = nil // must be after creating the headers
-	o.address = u.String()
-
-	if Settings.OutputWebSocketStats {
-		o.bufStats = NewGorStat("output_ws", 5000)
-	}
-
-	// create X buffers and send the buffer index to the worker
-	o.buf = make([]chan *Message, o.config.Workers)
-	for i := 0; i < o.config.Workers; i++ {
-		o.buf[i] = make(chan *Message, 100)
-		go o.worker(i)
-	}
-
-	return o
-}
-
-func (o *WebSocketOutput) worker(bufferIndex int) {
-	retries := 0
-	conn, err := o.connect(o.address)
-	for {
-		if o.close {
-			return
-		}
-
-		if err == nil {
-			break
-		}
-
-		Debug(1, fmt.Sprintf("Can't connect to aggregator instance, reconnecting in 1 second. Retries:%d", retries))
-		time.Sleep(1 * time.Second)
-
-		conn, err = o.connect(o.address)
-		retries++
-	}
-
-	if retries > 0 {
-		Debug(2, fmt.Sprintf("Connected to aggregator instance after %d retries", retries))
-	}
-
-	defer conn.Close()
-
-	for {
-		msg := <-o.buf[bufferIndex]
-		err = conn.WriteMessage(websocket.BinaryMessage, append(msg.Meta, msg.Data...))
-		if err != nil {
-			Debug(2, "INFO: WebSocket output connection closed, reconnecting "+err.Error())
-			go o.worker(bufferIndex)
-			o.buf[bufferIndex] <- msg
-			break
-		}
-	}
-}
-
-func (o *WebSocketOutput) getBufferIndex(msg *Message) int {
-	if !o.config.Sticky {
-		o.workerIndex++
-		return int(o.workerIndex) % o.config.Workers
-	}
-
-	hasher := fnv.New32a()
-	hasher.Write(payloadID(msg.Meta))
-	return int(hasher.Sum32()) % o.config.Workers
-}
-
-// PluginWrite writes message to this plugin
-func (o *WebSocketOutput) PluginWrite(msg *Message) (n int, err error) {
-	if !isOriginPayload(msg.Meta) {
-		return len(msg.Data), nil
-	}
-
-	bufferIndex := o.getBufferIndex(msg)
-	o.buf[bufferIndex] <- msg
-
-	if Settings.OutputTCPStats {
-		o.bufStats.Write(len(o.buf[bufferIndex]))
-	}
-
-	return len(msg.Data) + len(msg.Meta), nil
-}
-
-func (o *WebSocketOutput) connect(address string) (conn *websocket.Conn, err error) {
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-
-	d := websocket.DefaultDialer
-	if strings.HasPrefix(address, "wss://") {
-		d.TLSClientConfig = &tls.Config{InsecureSkipVerify: o.config.SkipVerify}
-	}
-
-	conn, _, err = d.DialContext(ctx, address, o.headers)
-	return
-}
-
-func (o *WebSocketOutput) String() string {
-	return fmt.Sprintf("WebSocket output %s, limit: %d", o.address, o.limit)
-}
-
-// Close closes the output
-func (o *WebSocketOutput) Close() {
-	o.close = true
-}

output_ws_test.go

@@ -1,82 +0,0 @@
-package goreplay
-
-import (
-	"log"
-	"net/http"
-	"sync"
-	"testing"
-
-	"github.com/gorilla/websocket"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestWebSocketOutput(t *testing.T) {
-	wg := new(sync.WaitGroup)
-
-	var gotHeader http.Header
-	wsAddr := startWebsocket(func(data []byte) {
-		wg.Done()
-	}, func(header http.Header) {
-		gotHeader = header
-	})
-	input := NewTestInput()
-	headers := map[string][]string{
-		"key1": {"value1"},
-		"key2": {"value2"},
-	}
-	output := NewWebSocketOutput(wsAddr, &WebSocketOutputConfig{Workers: 1, Headers: headers})
-
-	plugins := &InOutPlugins{
-		Inputs:  []PluginReader{input},
-		Outputs: []PluginWriter{output},
-	}
-
-	emitter := NewEmitter()
-	go emitter.Start(plugins, Settings.Middleware)
-
-	for i := 0; i < 10; i++ {
-		wg.Add(1)
-		input.EmitGET()
-	}
-
-	wg.Wait()
-	emitter.Close()
-
-	if assert.NotNil(t, gotHeader) {
-		assert.Equal(t, "Basic dXNlcjE=", gotHeader.Get("Authorization"))
-		for k, values := range headers {
-			assert.Equal(t, 1, len(values))
-			assert.Equal(t, values[0], gotHeader.Get(k))
-		}
-	}
-}
-
-func startWebsocket(cb func([]byte), headercb func(http.Header)) string {
-	upgrader := websocket.Upgrader{}
-
-	http.HandleFunc("/test", func(w http.ResponseWriter, r *http.Request) {
-		headercb(r.Header)
-		c, err := upgrader.Upgrade(w, r, nil)
-		if err != nil {
-			log.Print("upgrade:", err)
-			return
-		}
-
-		go func(conn *websocket.Conn) {
-			defer conn.Close()
-			for {
-				_, msg, _ := conn.ReadMessage()
-				cb(msg)
-			}
-		}(c)
-	})
-
-	go func() {
-		err := http.ListenAndServe("localhost:8081", nil)
-		if err != nil {
-			log.Fatal("Can't start:", err)
-		}
-	}()
-
-	return "ws://user1@localhost:8081/test"
-}

plugins.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"reflect"
@@ -106,7 +106,7 @@ func NewPlugins() *InOutPlugins {
 	}
 
 	for _, options := range Settings.InputRAW {
-		plugins.registerPlugin(NewRAWInput, options, Settings.InputRAWConfig)
+		plugins.registerPlugin(NewRAWInput, options, Settings.RAWInputConfig)
 	}
 
 	for _, options := range Settings.InputTCP {
@@ -117,10 +117,6 @@ func NewPlugins() *InOutPlugins {
 		plugins.registerPlugin(NewTCPOutput, options, &Settings.OutputTCPConfig)
 	}
 
-	for _, options := range Settings.OutputWebSocket {
-		plugins.registerPlugin(NewWebSocketOutput, options, &Settings.OutputWebSocketConfig)
-	}
-
 	for _, options := range Settings.InputFile {
 		plugins.registerPlugin(NewFileInput, options, Settings.InputFileLoop, Settings.InputFileReadDepth, Settings.InputFileMaxWait, Settings.InputFileDryRun)
 	}
@@ -159,7 +155,7 @@ func NewPlugins() *InOutPlugins {
 	}
 
 	if Settings.InputKafkaConfig.Host != "" && Settings.InputKafkaConfig.Topic != "" {
-		plugins.registerPlugin(NewKafkaInput, Settings.InputKafkaConfig.Offset, &Settings.InputKafkaConfig, &Settings.KafkaTLSConfig)
+		plugins.registerPlugin(NewKafkaInput, "", &Settings.InputKafkaConfig, &Settings.KafkaTLSConfig)
 	}
 
 	return plugins

plugins_test.go

@@ -1,14 +1,14 @@
-package goreplay
+package main
 
 import (
 	"testing"
 )
 
 func TestPluginsRegistration(t *testing.T) {
-	Settings.InputDummy = []string{"[]"}
-	Settings.OutputDummy = []string{"[]"}
-	Settings.OutputHTTP = []string{"www.example.com|10"}
-	Settings.InputFile = []string{"/dev/null"}
+	Settings.InputDummy = MultiOption{"[]"}
+	Settings.OutputDummy = MultiOption{"[]"}
+	Settings.OutputHTTP = MultiOption{"www.example.com|10"}
+	Settings.InputFile = MultiOption{"/dev/null"}
 
 	plugins := NewPlugins()
 

pro.go

@@ -1,10 +1,5 @@
-//go:build pro
-
-package goreplay
+package main
 
 // PRO this value indicates if goreplay is running in PRO mode..
 // it must not be modified explicitly in production
-var PRO = true
-
-// SettingsHook is intentionally left as a no-op
-var SettingsHook = func(*AppSettings) {}
+var PRO = false

proto/fuzz.go

@@ -1,4 +1,4 @@
-//go:build gofuzz
+// +build gofuzz
 
 package proto
 

proto/proto.go

@@ -19,12 +19,12 @@ package proto
 import (
 	"bufio"
 	"bytes"
-	"github.com/buger/goreplay/internal/byteutils"
-
 	_ "fmt"
 	"net/http"
 	"net/textproto"
 	"strings"
+
+	"github.com/buger/goreplay/byteutils"
 )
 
 // CRLF In HTTP newline defined by 2 bytes (for both windows and *nix support)
@@ -477,15 +477,6 @@ func HasFullPayload(m ProtocolStateSetter, payloads ...[]byte) bool {
 			m.SetProtocolState(state)
 		}
 	}
-
-	// Http Packets can only start with a few things, check if this is one of them
-	if len(payloads) == 0 {
-		return false
-	}
-	if !HasRequestTitle(payloads[0]) && !HasResponseTitle(payloads[0]) {
-		return false
-	}
-
 	if state.HeaderStart < 1 {
 		for _, data := range payloads {
 			state.HeaderStart = MIMEHeadersStartPos(data)

proto/proto_test.go

@@ -485,14 +485,6 @@ func TestHasFullPayload(t *testing.T) {
 	if got != expected {
 		t.Errorf("expected %v to equal %v", got, expected)
 	}
-
-	// check with trailer and no header
-	m = "Content-Type: text/plain\r\nContent-Length: 23\r\n\r\nMozillaDeveloperNetwork"
-	got = HasFullPayload(nil, []byte(m))
-	expected = false
-	if got != expected {
-		t.Errorf("expected %v to equal %v", got, expected)
-	}
 }
 
 func BenchmarkHasFullPayload(b *testing.B) {

protocol.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"bytes"

s3_reader.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"bytes"

s3_test.go

@@ -1,6 +1,6 @@
-//go:build pro
+// +build pro
 
-package goreplay
+package main
 
 import (
 	"fmt"

settings.go

@@ -1,62 +1,26 @@
-package goreplay
+package main
 
 import (
 	"flag"
 	"fmt"
 	"os"
-	"strconv"
 	"sync"
 	"time"
-
-	"github.com/buger/goreplay/internal/size"
 )
 
 // DEMO indicates that goreplay is running in demo mode
 var DEMO string
 
 // MultiOption allows to specify multiple flags with same name and collects all values into array
-type MultiOption struct {
-	a *[]string
-}
+type MultiOption []string
 
 func (h *MultiOption) String() string {
-	if h.a == nil {
-		return ""
-	}
-	return fmt.Sprint(*h.a)
+	return fmt.Sprint(*h)
 }
 
 // Set gets called multiple times for each flag with same name
 func (h *MultiOption) Set(value string) error {
-	if h.a == nil {
-		return nil
-	}
-
-	*h.a = append(*h.a, value)
-	return nil
-}
-
-// MultiOption allows to specify multiple flags with same name and collects all values into array
-type MultiIntOption struct {
-	a *[]int
-}
-
-func (h *MultiIntOption) String() string {
-	if h.a == nil {
-		return ""
-	}
-
-	return fmt.Sprint(*h.a)
-}
-
-// Set gets called multiple times for each flag with same name
-func (h *MultiIntOption) Set(value string) error {
-	if h.a == nil {
-		return nil
-	}
-
-	val, _ := strconv.Atoi(value)
-	*h.a = append(*h.a, val)
+	*h = append(*h, value)
 	return nil
 }
 
@@ -70,43 +34,37 @@ type AppSettings struct {
 	RecognizeTCPSessions bool   `json:"recognize-tcp-sessions"`
 	Pprof                string `json:"http-pprof"`
 
-	CopyBufferSize size.Size `json:"copy-buffer-size"`
-
-	InputDummy   []string `json:"input-dummy"`
-	OutputDummy  []string
+	InputDummy   MultiOption `json:"input-dummy"`
+	OutputDummy  MultiOption
 	OutputStdout bool `json:"output-stdout"`
 	OutputNull   bool `json:"output-null"`
 
-	InputTCP        []string `json:"input-tcp"`
+	InputTCP        MultiOption `json:"input-tcp"`
 	InputTCPConfig  TCPInputConfig
-	OutputTCP       []string `json:"output-tcp"`
+	OutputTCP       MultiOption `json:"output-tcp"`
 	OutputTCPConfig TCPOutputConfig
 	OutputTCPStats  bool `json:"output-tcp-stats"`
 
-	OutputWebSocket       []string `json:"output-ws"`
-	OutputWebSocketConfig WebSocketOutputConfig
-	OutputWebSocketStats  bool `json:"output-ws-stats"`
-
-	InputFile          []string      `json:"input-file"`
+	InputFile          MultiOption   `json:"input-file"`
 	InputFileLoop      bool          `json:"input-file-loop"`
 	InputFileReadDepth int           `json:"input-file-read-depth"`
 	InputFileDryRun    bool          `json:"input-file-dry-run"`
 	InputFileMaxWait   time.Duration `json:"input-file-max-wait"`
-	OutputFile         []string      `json:"output-file"`
+	OutputFile         MultiOption   `json:"output-file"`
 	OutputFileConfig   FileOutputConfig
 
-	InputRAW       []string `json:"input_raw"`
-	InputRAWConfig RAWInputConfig
+	InputRAW MultiOption `json:"input_raw"`
+	RAWInputConfig
 
 	Middleware string `json:"middleware"`
 
-	InputHTTP    []string
-	OutputHTTP   []string `json:"output-http"`
-	PrettifyHTTP bool     `json:"prettify-http"`
+	InputHTTP    MultiOption
+	OutputHTTP   MultiOption `json:"output-http"`
+	PrettifyHTTP bool        `json:"prettify-http"`
 
 	OutputHTTPConfig HTTPOutputConfig
 
-	OutputBinary       []string `json:"output-binary"`
+	OutputBinary       MultiOption `json:"output-binary"`
 	OutputBinaryConfig BinaryOutputConfig
 
 	ModifierConfig HTTPModifierConfig
@@ -140,35 +98,29 @@ func init() {
 	flag.BoolVar(&Settings.SplitOutput, "split-output", false, "By default each output gets same traffic. If set to `true` it splits traffic equally among all outputs.")
 	flag.BoolVar(&Settings.RecognizeTCPSessions, "recognize-tcp-sessions", false, "[PRO] If turned on http output will create separate worker for each TCP session. Splitting output will session based as well.")
 
-	flag.Var(&MultiOption{&Settings.InputDummy}, "input-dummy", "Used for testing outputs. Emits 'Get /' request every 1s")
+	flag.Var(&Settings.InputDummy, "input-dummy", "Used for testing outputs. Emits 'Get /' request every 1s")
 	flag.BoolVar(&Settings.OutputStdout, "output-stdout", false, "Used for testing inputs. Just prints to console data coming from inputs.")
 	flag.BoolVar(&Settings.OutputNull, "output-null", false, "Used for testing inputs. Drops all requests.")
 
-	flag.Var(&MultiOption{&Settings.InputTCP}, "input-tcp", "Used for internal communication between Gor instances. Example: \n\t# Receive requests from other Gor instances on 28020 port, and redirect output to staging\n\tgor --input-tcp :28020 --output-http staging.com")
+	flag.Var(&Settings.InputTCP, "input-tcp", "Used for internal communication between Gor instances. Example: \n\t# Receive requests from other Gor instances on 28020 port, and redirect output to staging\n\tgor --input-tcp :28020 --output-http staging.com")
 	flag.BoolVar(&Settings.InputTCPConfig.Secure, "input-tcp-secure", false, "Turn on TLS security. Do not forget to specify certificate and key files.")
 	flag.StringVar(&Settings.InputTCPConfig.CertificatePath, "input-tcp-certificate", "", "Path to PEM encoded certificate file. Used when TLS turned on.")
 	flag.StringVar(&Settings.InputTCPConfig.KeyPath, "input-tcp-certificate-key", "", "Path to PEM encoded certificate key file. Used when TLS turned on.")
 
-	flag.Var(&MultiOption{&Settings.OutputTCP}, "output-tcp", "Used for internal communication between Gor instances. Example: \n\t# Listen for requests on 80 port and forward them to other Gor instance on 28020 port\n\tgor --input-raw :80 --output-tcp replay.local:28020")
+	flag.Var(&Settings.OutputTCP, "output-tcp", "Used for internal communication between Gor instances. Example: \n\t# Listen for requests on 80 port and forward them to other Gor instance on 28020 port\n\tgor --input-raw :80 --output-tcp replay.local:28020")
 	flag.BoolVar(&Settings.OutputTCPConfig.Secure, "output-tcp-secure", false, "Use TLS secure connection. --input-file on another end should have TLS turned on as well.")
 	flag.BoolVar(&Settings.OutputTCPConfig.SkipVerify, "output-tcp-skip-verify", false, "Don't verify hostname on TLS secure connection.")
 	flag.BoolVar(&Settings.OutputTCPConfig.Sticky, "output-tcp-sticky", false, "Use Sticky connection. Request/Response with same ID will be sent to the same connection.")
 	flag.IntVar(&Settings.OutputTCPConfig.Workers, "output-tcp-workers", 10, "Number of parallel tcp connections, default is 10")
 	flag.BoolVar(&Settings.OutputTCPStats, "output-tcp-stats", false, "Report TCP output queue stats to console every 5 seconds.")
 
-	flag.Var(&MultiOption{&Settings.OutputWebSocket}, "output-ws", "Just like output tcp, just with WebSocket. Example: \n\t# Listen for requests on 80 port and forward them to other Gor instance on 28020 port\n\tgor --input-raw :80 --output-ws wss://replay.local:28020/endpoint")
-	flag.BoolVar(&Settings.OutputWebSocketConfig.SkipVerify, "output-ws-skip-verify", false, "Don't verify hostname on TLS secure connection.")
-	flag.BoolVar(&Settings.OutputWebSocketConfig.Sticky, "output-ws-sticky", false, "Use Sticky connection. Request/Response with same ID will be sent to the same connection.")
-	flag.IntVar(&Settings.OutputWebSocketConfig.Workers, "output-ws-workers", 10, "Number of parallel ws connections, default is 10")
-	flag.BoolVar(&Settings.OutputWebSocketStats, "output-ws-stats", false, "Report WebSocket output queue stats to console every 5 seconds.")
-
-	flag.Var(&MultiOption{&Settings.InputFile}, "input-file", "Read requests from file: \n\tgor --input-file ./requests.gor --output-http staging.com")
+	flag.Var(&Settings.InputFile, "input-file", "Read requests from file: \n\tgor --input-file ./requests.gor --output-http staging.com")
 	flag.BoolVar(&Settings.InputFileLoop, "input-file-loop", false, "Loop input files, useful for performance testing.")
 	flag.IntVar(&Settings.InputFileReadDepth, "input-file-read-depth", 100, "GoReplay tries to read and cache multiple records, in advance. In parallel it also perform sorting of requests, if they came out of order. Since it needs hold this buffer in memory, bigger values can cause worse performance")
 	flag.BoolVar(&Settings.InputFileDryRun, "input-file-dry-run", false, "Simulate reading from the data source without replaying it. You will get information about expected replay time, number of found records etc.")
 	flag.DurationVar(&Settings.InputFileMaxWait, "input-file-max-wait", 0, "Set the maximum time between requests. Can help in situations when you have too long periods between request, and you want to skip them. Example: --input-raw-max-wait 1s")
 
-	flag.Var(&MultiOption{&Settings.OutputFile}, "output-file", "Write incoming requests to file: \n\tgor --input-raw :80 --output-file ./requests.gor")
+	flag.Var(&Settings.OutputFile, "output-file", "Write incoming requests to file: \n\tgor --input-raw :80 --output-file ./requests.gor")
 	flag.DurationVar(&Settings.OutputFileConfig.FlushInterval, "output-file-flush-interval", time.Second, "Interval for forcing buffer flush to the file, default: 1s.")
 	flag.BoolVar(&Settings.OutputFileConfig.Append, "output-file-append", false, "The flushed chunk is appended to existence file or not. ")
 	flag.Var(&Settings.OutputFileConfig.SizeLimit, "output-file-size-limit", "Size of each chunk. Default: 32mb")
@@ -179,33 +131,27 @@ func init() {
 
 	flag.BoolVar(&Settings.PrettifyHTTP, "prettify-http", false, "If enabled, will automatically decode requests and responses with: Content-Encoding: gzip and Transfer-Encoding: chunked. Useful for debugging, in conjunction with --output-stdout")
 
-	flag.Var(&Settings.CopyBufferSize, "copy-buffer-size", "Set the buffer size for an individual request (default 5MB)")
-
 	// input raw flags
-	flag.Var(&MultiOption{&Settings.InputRAW}, "input-raw", "Capture traffic from given port (use RAW sockets and require *sudo* access):\n\t# Capture traffic from 8080 port\n\tgor --input-raw :8080 --output-http staging.com")
-	flag.BoolVar(&Settings.InputRAWConfig.TrackResponse, "input-raw-track-response", false, "If turned on Gor will track responses in addition to requests, and they will be available to middleware and file output.")
-	flag.IntVar(&Settings.InputRAWConfig.VXLANPort, "input-raw-vxlan-port", 4789, "VXLAN port. Can be used only when engine set to `vxlan`. Default: 4789")
-	flag.Var(&MultiIntOption{&Settings.InputRAWConfig.VXLANVNIs}, "input-raw-vxlan-vni", "VXLAN VNI to capture. By default capture all VNIs. Ignore VNI by setting them with minus sign, example: `--input-raw-vxlan-vni -2`")
-	flag.BoolVar(&Settings.InputRAWConfig.VLAN, "input-raw-vlan", false, "Enable VLAN (802.1Q) support")
-	flag.Var(&MultiIntOption{&Settings.InputRAWConfig.VLANVIDs}, "input-raw-vlan-vid", "VLAN VID to capture. By default capture all VIDs")
-	flag.Var(&Settings.InputRAWConfig.Engine, "input-raw-engine", "Intercept traffic using `libpcap` (default), `raw_socket`, `pcap_file`, `vxlan`")
-	flag.Var(&Settings.InputRAWConfig.Protocol, "input-raw-protocol", "Specify application protocol of intercepted traffic. Possible values: http, binary")
-	flag.StringVar(&Settings.InputRAWConfig.RealIPHeader, "input-raw-realip-header", "", "If not blank, injects header with given name and real IP value to the request payload. Usually this header should be named: X-Real-IP")
-	flag.DurationVar(&Settings.InputRAWConfig.Expire, "input-raw-expire", time.Second*2, "How much it should wait for the last TCP packet, till consider that TCP message complete.")
-	flag.StringVar(&Settings.InputRAWConfig.BPFFilter, "input-raw-bpf-filter", "", "BPF filter to write custom expressions. Can be useful in case of non standard network interfaces like tunneling or SPAN port. Example: --input-raw-bpf-filter 'dst port 80'")
-	flag.StringVar(&Settings.InputRAWConfig.TimestampType, "input-raw-timestamp-type", "", "Possible values: PCAP_TSTAMP_HOST, PCAP_TSTAMP_HOST_LOWPREC, PCAP_TSTAMP_HOST_HIPREC, PCAP_TSTAMP_ADAPTER, PCAP_TSTAMP_ADAPTER_UNSYNCED. This values not supported on all systems, GoReplay will tell you available values of you put wrong one.")
-	flag.BoolVar(&Settings.InputRAWConfig.Snaplen, "input-raw-override-snaplen", false, "Override the capture snaplen to be 64k. Required for some Virtualized environments")
-	flag.DurationVar(&Settings.InputRAWConfig.BufferTimeout, "input-raw-buffer-timeout", 0, "set the pcap timeout. for immediate mode don't set this flag")
-	flag.Var(&Settings.InputRAWConfig.BufferSize, "input-raw-buffer-size", "Controls size of the OS buffer which holds packets until they dispatched. Default value depends by system: in Linux around 2MB. If you see big package drop, increase this value.")
-	flag.BoolVar(&Settings.InputRAWConfig.Promiscuous, "input-raw-promisc", false, "enable promiscuous mode")
-	flag.BoolVar(&Settings.InputRAWConfig.Monitor, "input-raw-monitor", false, "enable RF monitor mode")
-	flag.BoolVar(&Settings.InputRAWConfig.Stats, "input-raw-stats", false, "enable stats generator on raw TCP messages")
-	flag.BoolVar(&Settings.InputRAWConfig.AllowIncomplete, "input-raw-allow-incomplete", false, "If turned on Gor will record HTTP messages with missing packets")
-	flag.Var(&MultiOption{&Settings.InputRAWConfig.IgnoreInterface}, "input-raw-ignore-interface", "In case if you want listen for all interfaces except a few ones. Can be used in k8s environment. Example: --input-raw-ignore-interface cbr0 --input-raw-ignore-interface eth0 --input-raw-ignore-interface localhost")
+	flag.Var(&Settings.InputRAW, "input-raw", "Capture traffic from given port (use RAW sockets and require *sudo* access):\n\t# Capture traffic from 8080 port\n\tgor --input-raw :8080 --output-http staging.com")
+	flag.BoolVar(&Settings.TrackResponse, "input-raw-track-response", false, "If turned on Gor will track responses in addition to requests, and they will be available to middleware and file output.")
+	flag.Var(&Settings.Engine, "input-raw-engine", "Intercept traffic using `libpcap` (default), `raw_socket` or `pcap_file`")
+	flag.Var(&Settings.Protocol, "input-raw-protocol", "Specify application protocol of intercepted traffic. Possible values: http, binary")
+	flag.StringVar(&Settings.RealIPHeader, "input-raw-realip-header", "", "If not blank, injects header with given name and real IP value to the request payload. Usually this header should be named: X-Real-IP")
+	flag.DurationVar(&Settings.Expire, "input-raw-expire", time.Second*2, "How much it should wait for the last TCP packet, till consider that TCP message complete.")
+	flag.StringVar(&Settings.BPFFilter, "input-raw-bpf-filter", "", "BPF filter to write custom expressions. Can be useful in case of non standard network interfaces like tunneling or SPAN port. Example: --input-raw-bpf-filter 'dst port 80'")
+	flag.StringVar(&Settings.TimestampType, "input-raw-timestamp-type", "", "Possible values: PCAP_TSTAMP_HOST, PCAP_TSTAMP_HOST_LOWPREC, PCAP_TSTAMP_HOST_HIPREC, PCAP_TSTAMP_ADAPTER, PCAP_TSTAMP_ADAPTER_UNSYNCED. This values not supported on all systems, GoReplay will tell you available values of you put wrong one.")
+	flag.Var(&Settings.CopyBufferSize, "copy-buffer-size", "Set the buffer size for an individual request (default 5MB)")
+	flag.BoolVar(&Settings.Snaplen, "input-raw-override-snaplen", false, "Override the capture snaplen to be 64k. Required for some Virtualized environments")
+	flag.DurationVar(&Settings.BufferTimeout, "input-raw-buffer-timeout", 0, "set the pcap timeout. for immediate mode don't set this flag")
+	flag.Var(&Settings.BufferSize, "input-raw-buffer-size", "Controls size of the OS buffer which holds packets until they dispatched. Default value depends by system: in Linux around 2MB. If you see big package drop, increase this value.")
+	flag.BoolVar(&Settings.Promiscuous, "input-raw-promisc", false, "enable promiscuous mode")
+	flag.BoolVar(&Settings.Monitor, "input-raw-monitor", false, "enable RF monitor mode")
+	flag.BoolVar(&Settings.Stats, "input-raw-stats", false, "enable stats generator on raw TCP messages")
+	flag.BoolVar(&Settings.AllowIncomplete, "input-raw-allow-incomplete", false, "If turned on Gor will record HTTP messages with missing packets")
 
 	flag.StringVar(&Settings.Middleware, "middleware", "", "Used for modifying traffic using external command")
 
-	flag.Var(&MultiOption{&Settings.OutputHTTP}, "output-http", "Forwards incoming requests to given http address.\n\t# Redirect all incoming requests to staging.com address \n\tgor --input-raw :80 --output-http http://staging.com")
+	flag.Var(&Settings.OutputHTTP, "output-http", "Forwards incoming requests to given http address.\n\t# Redirect all incoming requests to staging.com address \n\tgor --input-raw :80 --output-http http://staging.com")
 
 	/* outputHTTPConfig */
 	flag.Var(&Settings.OutputHTTPConfig.BufferSize, "output-http-response-buffer", "HTTP response buffer size, all data after this size will be discarded.")
@@ -225,7 +171,7 @@ func init() {
 	flag.StringVar(&Settings.OutputHTTPConfig.ElasticSearch, "output-http-elasticsearch", "", "Send request and response stats to ElasticSearch:\n\tgor --input-raw :8080 --output-http staging.com --output-http-elasticsearch 'es_host:api_port/index_name'")
 	/* outputHTTPConfig */
 
-	flag.Var(&MultiOption{&Settings.OutputBinary}, "output-binary", "Forwards incoming binary payloads to given address.\n\t# Redirect all incoming requests to staging.com address \n\tgor --input-raw :80 --input-raw-protocol binary --output-binary staging.com:80")
+	flag.Var(&Settings.OutputBinary, "output-binary", "Forwards incoming binary payloads to given address.\n\t# Redirect all incoming requests to staging.com address \n\tgor --input-raw :80 --input-raw-protocol binary --output-binary staging.com:80")
 
 	/* outputBinaryConfig */
 	flag.Var(&Settings.OutputBinaryConfig.BufferSize, "output-tcp-response-buffer", "TCP response buffer size, all data after this size will be discarded.")
@@ -239,19 +185,10 @@ func init() {
 	flag.StringVar(&Settings.OutputKafkaConfig.Host, "output-kafka-host", "", "Read request and response stats from Kafka:\n\tgor --input-raw :8080 --output-kafka-host '192.168.0.1:9092,192.168.0.2:9092'")
 	flag.StringVar(&Settings.OutputKafkaConfig.Topic, "output-kafka-topic", "", "Read request and response stats from Kafka:\n\tgor --input-raw :8080 --output-kafka-topic 'kafka-log'")
 	flag.BoolVar(&Settings.OutputKafkaConfig.UseJSON, "output-kafka-json-format", false, "If turned on, it will serialize messages from GoReplay text format to JSON.")
-	flag.BoolVar(&Settings.OutputKafkaConfig.SASLConfig.UseSASL, "output-kafka-use-sasl", false, "--output-kafka-use-sasl true")
-	flag.StringVar(&Settings.OutputKafkaConfig.SASLConfig.Mechanism, "output-kafka-mechanism", "", "mechanism\n\tgor --input-raw :8080 --output-kafka-mechanism 'SCRAM-SHA-512'")
-	flag.StringVar(&Settings.OutputKafkaConfig.SASLConfig.Username, "output-kafka-username", "", "username\n\tgor --input-raw :8080 --output-kafka-username 'username'")
-	flag.StringVar(&Settings.OutputKafkaConfig.SASLConfig.Password, "output-kafka-password", "", "password\n\tgor --input-raw :8080 --output-kafka-password 'password'")
 
 	flag.StringVar(&Settings.InputKafkaConfig.Host, "input-kafka-host", "", "Send request and response stats to Kafka:\n\tgor --output-stdout --input-kafka-host '192.168.0.1:9092,192.168.0.2:9092'")
 	flag.StringVar(&Settings.InputKafkaConfig.Topic, "input-kafka-topic", "", "Send request and response stats to Kafka:\n\tgor --output-stdout --input-kafka-topic 'kafka-log'")
 	flag.BoolVar(&Settings.InputKafkaConfig.UseJSON, "input-kafka-json-format", false, "If turned on, it will assume that messages coming in JSON format rather than  GoReplay text format.")
-	flag.BoolVar(&Settings.InputKafkaConfig.SASLConfig.UseSASL, "input-kafka-use-sasl", false, "use-sasl\n\t--use-sasl true")
-	flag.StringVar(&Settings.InputKafkaConfig.SASLConfig.Mechanism, "input-kafka-mechanism", "", "mechanism\n\tgor --input-raw :8080 --output-kafka-mechanism 'SCRAM-SHA-512'")
-	flag.StringVar(&Settings.InputKafkaConfig.SASLConfig.Username, "input-kafka-username", "", "username\n\tgor --input-raw :8080 --output-kafka-username 'username'")
-	flag.StringVar(&Settings.InputKafkaConfig.SASLConfig.Password, "input-kafka-password", "", "password\n\tgor --input-raw :8080 --output-kafka-password 'password'")
-	flag.StringVar(&Settings.InputKafkaConfig.Offset, "input-kafka-offset", "-1", "Specify offset in Kafka partitions start to consume\n\t-1: Starts from newest, -2: Starts from oldest\nAnd supported for showdown or speedup for emitting!\n\tgor --input-kafka-offset \"-2|200%\"")
 
 	flag.StringVar(&Settings.KafkaTLSConfig.CACert, "kafka-tls-ca-cert", "", "CA certificate for Kafka TLS Config:\n\tgor  --input-raw :3000 --output-kafka-host '192.168.0.1:9092' --output-kafka-topic 'topic' --kafka-tls-ca-cert cacert.cer.pem --kafka-tls-client-cert client.cer.pem --kafka-tls-client-key client.key.pem")
 	flag.StringVar(&Settings.KafkaTLSConfig.ClientCert, "kafka-tls-client-cert", "", "Client certificate for Kafka TLS Config (mandatory with to kafka-tls-ca-cert and kafka-tls-client-key)")
@@ -277,9 +214,7 @@ func init() {
 
 }
 
-func CheckSettings() {
-	SettingsHook(&Settings)
-
+func checkSettings() {
 	if Settings.OutputFileConfig.SizeLimit < 1 {
 		Settings.OutputFileConfig.SizeLimit.Set("32mb")
 	}

settings_test.go

@@ -1,4 +1,4 @@
-package goreplay
+package main
 
 import (
 	"encoding/json"

tcp/doc.go

@@ -4,6 +4,7 @@ parsing, reassembling tcp packets, handling communication with engine listeners(
 and reporting errors and statistics of packets.
 the packets are parsed by following TCP way(https://en.wikipedia.org/wiki/Transmission_Control_Protocol#TCP_segment_structure).
 
+
 example:
 
 import "github.com/buger/goreplay/tcp"
@@ -21,5 +22,6 @@ you can use pool.End or/and pool.Start to set custom session behaviors
 
 debugLevel in debugger function indicates the priority of the logs, the bigger the number the lower
 the priority. errors are signified by debug level 4 for errors, 5 for discarded packets, and 6 for received packets.
+
 */
 package tcp // import github.com/buger/goreplay/tcp

tcp/tcp_message.go

@@ -4,12 +4,13 @@ import (
 	"encoding/binary"
 	"encoding/hex"
 	"fmt"
-	"github.com/buger/goreplay/proto"
 	"net"
 	"reflect"
 	"sort"
 	"time"
 	"unsafe"
+
+	"github.com/buger/goreplay/proto"
 )
 
 // TCPProtocol is a number to indicate type of protocol
@@ -62,10 +63,9 @@ type Stats struct {
 
 // Message is the representation of a tcp message
 type Message struct {
-	packets          []*Packet
-	parser           *MessageParser
-	feedback         interface{}
-	continueAdjusted bool
+	packets  []*Packet
+	parser   *MessageParser
+	feedback interface{}
 	Stats
 }
 
@@ -288,11 +288,13 @@ func (parser *MessageParser) parsePacket(pcapPkt *PcapPacket) *Packet {
 	}
 
 	for _, p := range parser.ports {
-		if pckt.DstPort == p && containsOrEmpty(pckt.DstIP, parser.ips) {
-			pckt.Direction = DirIncoming
-			break
-		} else if pckt.SrcPort == p && containsOrEmpty(pckt.SrcIP, parser.ips) {
-			pckt.Direction = DirOutcoming
+		if pckt.DstPort == p {
+			for _, ip := range parser.ips {
+				if pckt.DstIP.Equal(ip) {
+					pckt.Direction = DirIncoming
+					break
+				}
+			}
 			break
 		}
 	}
@@ -300,18 +302,6 @@ func (parser *MessageParser) parsePacket(pcapPkt *PcapPacket) *Packet {
 	return pckt
 }
 
-func containsOrEmpty(element net.IP, ipList []net.IP) bool {
-	if len(ipList) == 0 {
-		return true
-	}
-	for _, ip := range ipList {
-		if ip.Equal(element) {
-			return true
-		}
-	}
-	return false
-}
-
 func (parser *MessageParser) processPacket(pckt *Packet) {
 	if pckt == nil {
 		return
@@ -347,9 +337,7 @@ func (parser *MessageParser) processPacket(pckt *Packet) {
 	m.Direction = pckt.Direction
 	m.SrcAddr = pckt.SrcIP.String()
 	m.DstAddr = pckt.DstIP.String()
-
 	parser.m[pckt.MessageID()] = m
-
 	m.Start = pckt.Timestamp
 	m.parser = parser
 	parser.addPacket(m, pckt)
@@ -375,8 +363,9 @@ func (parser *MessageParser) addPacket(m *Message, pckt *Packet) bool {
 }
 
 func (parser *MessageParser) Fix100Continue(m *Message) {
-	// Only adjust a message once
-	if state, ok := m.feedback.(*proto.HTTPState); ok && state.Continue100 && !m.continueAdjusted {
+	if state, ok := m.feedback.(*proto.HTTPState); ok && state.Continue100 {
+		delete(parser.m, m.packets[0].MessageID())
+
 		// Shift Ack by given offset
 		// Size of "HTTP/1.1 100 Continue\r\n\r\n" message
 		for _, p := range m.packets {
@@ -393,7 +382,6 @@ func (parser *MessageParser) Fix100Continue(m *Message) {
 
 		// Re-add (or override) again with new message and ID
 		parser.m[m.packets[0].MessageID()] = m
-		m.continueAdjusted = true
 	}
 }