Support tapper profiling on macOS (#1098)

* Fix `checkFilterByMethod` in acceptance tests

* #run_acceptance_tests

* Add `numberOfRecords` parameter to test specs #run_acceptance_tests

* Fix the values #run_acceptance_tests

* Fix the values #run_acceptance_tests

* Fix #run_acceptance_tests

* #run_acceptance_tests

* Reduce value duplication #run_acceptance_tests

Co-authored-by: gadotroee <55343099+gadotroee@users.noreply.github.com>
Co-authored-by: Roee Gadot <roee.gadot@up9.com>

acceptanceTests/cypress/integration/testHelpers/TrafficHelper.js

@@ -58,7 +58,7 @@ export function rightOnHoverCheck(path, expectedText) {
 }
 
 export function checkFilterByMethod(funcDict) {
-    const {protocol, method, methodQuery, summary, summaryQuery} = funcDict;
+    const {protocol, method, methodQuery, summary, summaryQuery, numberOfRecords} = funcDict;
     const summaryDict = getSummaryDict(summary, summaryQuery);
     const methodDict = getMethodDict(method, methodQuery);
     const protocolDict = getProtocolDict(protocol.name, protocol.text);
@@ -69,47 +69,53 @@ export function checkFilterByMethod(funcDict) {
         cy.get('[type="submit"]').click();
         cy.get('.w-tc-editor').should('have.attr', 'style').and('include', Cypress.env('greenFilterColor'));
 
-            cy.get('#entries-length').should('not.have.text', '0').then(() => {
-                cy.get(`#list [id]`).then(elements => {
-                    const listElmWithIdAttr = Object.values(elements);
-                    let doneCheckOnFirst = false;
+        waitForFetch(numberOfRecords);
+        pauseStream();
 
-                    cy.get('#entries-length').invoke('text').then(len => {
-                        resizeIfNeeded(len);
-                        listElmWithIdAttr.forEach(entry => {
-                            if (entry?.id && entry.id.match(RegExp(/entry-(\d{24})$/gm))) {
-                                const entryId = getEntryId(entry.id);
+        cy.get(`#list [id^=entry]`).then(elements => {
+            const listElmWithIdAttr = Object.values(elements);
+            let doneCheckOnFirst = false;
 
-                                leftTextCheck(entryId, methodDict.pathLeft, methodDict.expectedText);
-                                leftTextCheck(entryId, protocolDict.pathLeft, protocolDict.expectedTextLeft);
-                                if (summaryDict)
-                                    leftTextCheck(entryId, summaryDict.pathLeft, summaryDict.expectedText);
+            cy.get('#entries-length').invoke('text').then(len => {
+                listElmWithIdAttr.forEach(entry => {
+                    if (entry?.id && entry.id.match(RegExp(/entry-(\d{24})$/gm))) {
+                        const entryId = getEntryId(entry.id);
 
-                                if (!doneCheckOnFirst) {
-                                    deepCheck(funcDict, protocolDict, methodDict, entry);
-                                    doneCheckOnFirst = true;
-                                }
-                            }
-                        });
-                        resizeIfNeeded(len);
-                    });
+                        leftTextCheck(entryId, methodDict.pathLeft, methodDict.expectedText);
+                        leftTextCheck(entryId, protocolDict.pathLeft, protocolDict.expectedTextLeft);
+                        if (summaryDict)
+                            leftTextCheck(entryId, summaryDict.pathLeft, summaryDict.expectedText);
+
+                        if (!doneCheckOnFirst) {
+                            deepCheck(funcDict, protocolDict, methodDict, entry);
+                            doneCheckOnFirst = true;
+                        }
+                    }
                 });
             });
         });
+    });
 }
 
+export const refreshWaitTimeout = 10000;
+
+export function waitForFetch(gt) {
+    cy.get('#entries-length', {timeout: refreshWaitTimeout}).should((el) => {
+        expect(parseInt(el.text().trim(), 10)).to.be.greaterThan(gt);
+    });
+}
+
+export function pauseStream() {
+    cy.get('#pause-icon').click();
+    cy.get('#pause-icon').should('not.be.visible');
+}
+
+
 export function getEntryId(id) {
     // take the second part from the string (entry-<ID>)
     return id.split('-')[1];
 }
 
-function resizeIfNeeded(entriesLen) {
-    if (entriesLen > maxEntriesInDom){
-        Cypress.config().viewportHeight === Cypress.env('normalMizuHeight') ?
-            resizeToHugeMizu() : resizeToNormalMizu()
-    }
-}
-
 function deepCheck(generalDict, protocolDict, methodDict, entry) {
     const entryId = getEntryId(entry.id);
     const {summary, value} = generalDict;

acceptanceTests/cypress/integration/tests/Rabbit.js

@@ -5,6 +5,7 @@ it('opening mizu', function () {
 });
 
 const rabbitProtocolDetails = {name: 'AMQP', text: 'Advanced Message Queuing Protocol 0-9-1'};
+const numberOfRecords = 5;
 
 checkFilterByMethod({
     protocol: rabbitProtocolDetails,
@@ -12,6 +13,7 @@ checkFilterByMethod({
     methodQuery: 'request.method == "exchange declare"',
     summary: 'exchange',
     summaryQuery: 'request.exchange == "exchange"',
+    numberOfRecords: numberOfRecords,
     value: null
 });
 
@@ -21,6 +23,7 @@ checkFilterByMethod({
     methodQuery: 'request.method == "queue declare"',
     summary: 'queue',
     summaryQuery: 'request.queue == "queue"',
+    numberOfRecords: numberOfRecords,
     value: null
 });
 
@@ -30,6 +33,7 @@ checkFilterByMethod({
     methodQuery: 'request.method == "queue bind"',
     summary: 'queue',
     summaryQuery: 'request.queue == "queue"',
+    numberOfRecords: numberOfRecords,
     value: null
 });
 
@@ -39,6 +43,7 @@ checkFilterByMethod({
     methodQuery: 'request.method == "basic publish"',
     summary: 'exchange',
     summaryQuery: 'request.exchange == "exchange"',
+    numberOfRecords: numberOfRecords,
     value: {tab: valueTabs.request, regex: /^message$/mg}
 });
 
@@ -48,6 +53,7 @@ checkFilterByMethod({
     methodQuery: 'request.method == "basic consume"',
     summary: 'queue',
     summaryQuery: 'request.queue == "queue"',
+    numberOfRecords: numberOfRecords,
     value: null
 });
 
@@ -57,5 +63,6 @@ checkFilterByMethod({
     methodQuery: 'request.method == "basic deliver"',
     summary: 'exchange',
     summaryQuery: 'request.queue == "exchange"',
+    numberOfRecords: numberOfRecords,
     value: {tab: valueTabs.request, regex: /^message$/mg}
 });

acceptanceTests/cypress/integration/tests/Redis.js

@@ -5,6 +5,7 @@ it('opening mizu', function () {
 });
 
 const redisProtocolDetails = {name: 'redis', text: 'Redis Serialization Protocol'};
+const numberOfRecords = 5;
 
 checkFilterByMethod({
     protocol: redisProtocolDetails,
@@ -12,6 +13,7 @@ checkFilterByMethod({
     methodQuery: 'request.command == "PING"',
     summary: null,
     summaryQuery: '',
+    numberOfRecords: numberOfRecords,
     value: null
 })
 
@@ -21,6 +23,7 @@ checkFilterByMethod({
     methodQuery: 'request.command == "SET"',
     summary: 'key',
     summaryQuery: 'request.key == "key"',
+    numberOfRecords: numberOfRecords,
     value: {tab: valueTabs.request, regex: /^\[value, keepttl]$/mg}
 })
 
@@ -30,6 +33,7 @@ checkFilterByMethod({
     methodQuery: 'request.command == "EXISTS"',
     summary: 'key',
     summaryQuery: 'request.key == "key"',
+    numberOfRecords: numberOfRecords,
     value: {tab: valueTabs.response, regex: /^1$/mg}
 })
 
@@ -39,6 +43,7 @@ checkFilterByMethod({
     methodQuery: 'request.command == "GET"',
     summary: 'key',
     summaryQuery: 'request.key == "key"',
+    numberOfRecords: numberOfRecords,
     value: {tab: valueTabs.response, regex: /^value$/mg}
 })
 
@@ -48,5 +53,6 @@ checkFilterByMethod({
     methodQuery: 'request.command == "DEL"',
     summary: 'key',
     summaryQuery: 'request.key == "key"',
+    numberOfRecords: numberOfRecords,
     value: {tab: valueTabs.response, regex: /^1$|^0$/mg}
 })

acceptanceTests/cypress/integration/tests/UiTest.js

@@ -7,12 +7,12 @@ import {
     resizeToNormalMizu,
     rightOnHoverCheck,
     rightTextCheck,
-    verifyMinimumEntries
+    verifyMinimumEntries,
+    refreshWaitTimeout,
+    waitForFetch,
+    pauseStream
 } from "../testHelpers/TrafficHelper";
 
-const refreshWaitTimeout = 10000;
-
-
 const fullParam = Cypress.env('arrayDict'); // "Name:fooNamespace:barName:foo1Namespace:bar1"
 const podsArray = fullParam.split('Name:').slice(1); // ["fooNamespace:bar", "foo1Namespace:bar1"]
 podsArray.forEach((podStr, index) => {
@@ -70,7 +70,8 @@ checkFilter({
     leftSideExpectedText: 'HTTP',
     rightSidePath: '[title=HTTP]',
     rightSideExpectedText: 'Hypertext Transfer Protocol -- HTTP/1.1',
-    applyByCtrlEnter: true
+    applyByCtrlEnter: true,
+    numberOfRecords: 20,
 });
 
 checkFilter({
@@ -79,7 +80,8 @@ checkFilter({
     leftSideExpectedText: '200',
     rightSidePath: '> :nth-child(2) [title="Status Code"]',
     rightSideExpectedText: '200',
-    applyByCtrlEnter: false
+    applyByCtrlEnter: false,
+    numberOfRecords: 20
 });
 
 if (Cypress.env('shouldCheckSrcAndDest')) {
@@ -91,7 +93,8 @@ if (Cypress.env('shouldCheckSrcAndDest')) {
         leftSideExpectedText: '[Unresolved]',
         rightSidePath: '> :nth-child(2) [title="Source Name"]',
         rightSideExpectedText: '[Unresolved]',
-        applyByCtrlEnter: false
+        applyByCtrlEnter: false,
+        numberOfRecords: 20
     });
 
     checkFilter({
@@ -100,7 +103,8 @@ if (Cypress.env('shouldCheckSrcAndDest')) {
         leftSideExpectedText: 'httpbin.mizu-tests',
         rightSidePath: '> :nth-child(2) > :nth-child(2) > :nth-child(2) > :nth-child(3) > :nth-child(2)',
         rightSideExpectedText: 'httpbin.mizu-tests',
-        applyByCtrlEnter: false
+        applyByCtrlEnter: false,
+        numberOfRecords: 20
     });
 }
 
@@ -110,7 +114,8 @@ checkFilter({
     leftSideExpectedText: 'GET',
     rightSidePath: '> :nth-child(2) > :nth-child(2) > :nth-child(1) > :nth-child(1) > :nth-child(2)',
     rightSideExpectedText: 'GET',
-    applyByCtrlEnter: true
+    applyByCtrlEnter: true,
+    numberOfRecords: 20
 });
 
 checkFilter({
@@ -119,7 +124,8 @@ checkFilter({
     leftSideExpectedText: '/get',
     rightSidePath: '> :nth-child(2) > :nth-child(2) > :nth-child(1) > :nth-child(2) > :nth-child(2)',
     rightSideExpectedText: '/get',
-    applyByCtrlEnter: false
+    applyByCtrlEnter: false,
+    numberOfRecords: 20
 });
 
 checkFilter({
@@ -128,7 +134,8 @@ checkFilter({
     leftSideExpectedText: '127.0.0.1',
     rightSidePath: '> :nth-child(2) [title="Source IP"]',
     rightSideExpectedText: '127.0.0.1',
-    applyByCtrlEnter: false
+    applyByCtrlEnter: false,
+    numberOfRecords: 20
 });
 
 checkFilterNoResults('request.method == "POST"');
@@ -187,7 +194,8 @@ function checkFilter(filterDetails) {
         rightSidePath,
         rightSideExpectedText,
         leftSideExpectedText,
-        applyByCtrlEnter
+        applyByCtrlEnter,
+        numberOfRecords
     } = filterDetails;
 
     const entriesForDeeperCheck = 5;
@@ -200,7 +208,7 @@ function checkFilter(filterDetails) {
         if (!applyByCtrlEnter)
             cy.get('[type="submit"]').click();
 
-        waitForFetch();
+        waitForFetch(numberOfRecords);
         pauseStream();
 
         cy.get(`#list [id^=entry]`).last().then(elem => {
@@ -231,22 +239,11 @@ function checkFilter(filterDetails) {
         // reloading then waiting for the entries number to load
         resizeToNormalMizu();
         cy.reload();
-        waitForFetch();
+        waitForFetch(numberOfRecords);
         pauseStream();
     });
 }
 
-function waitForFetch() {
-    cy.get('#entries-length', {timeout: refreshWaitTimeout}).should((el) => {
-        expect(parseInt(el.text().trim(), 10)).to.be.greaterThan(20);
-    });
-}
-
-function pauseStream() {
-    cy.get('#pause-icon').click();
-    cy.get('#pause-icon').should('not.be.visible');
-}
-
 function deeperCheck(leftSidePath, rightSidePath, filterName, rightSideExpectedText, entriesNumToCheck) {
     cy.get(`#list [id^=entry]`).each((element, index) => {
         if (index < entriesNumToCheck) {

performance_analysis/plot_from_tapper_logs.py

@@ -128,8 +128,8 @@ if __name__ == '__main__':
         matched_samples_all_files.append(matched_samples)
         live_samples_all_files.append(live_samples)
         processed_samples_all_files.append(processed_samples)
-        heap_samples_all_files.append(processed_samples)
-        goroutines_samples_all_files.append(processed_samples)
+        heap_samples_all_files.append(heap_samples)
+        goroutines_samples_all_files.append(goroutines_samples)
 
     cpu_samples_df = pd.concat(cpu_samples_all_files, axis=1)
     rss_samples_df = pd.concat(rss_samples_all_files, axis=1)
@@ -137,7 +137,6 @@ if __name__ == '__main__':
     matched_samples_df = pd.concat(matched_samples_all_files, axis=1)
     live_samples_df = pd.concat(live_samples_all_files, axis=1)
     processed_samples_df = pd.concat(processed_samples_all_files, axis=1)
-
     heap_samples_df = pd.concat(heap_samples_all_files, axis=1)
     goroutines_samples_df = pd.concat(goroutines_samples_all_files, axis=1)
 
@@ -172,7 +171,7 @@ if __name__ == '__main__':
     heap_plot.legend().remove()
 
     goroutines_plot = plt.subplot(8, 2, 8)
-    plot(goroutines_plot, (goroutines_samples_df / 1024 / 1024), 'goroutines', '', 'goroutines', group_pattern)
+    plot(goroutines_plot, goroutines_samples_df, 'goroutines', '', 'goroutines', group_pattern)
     goroutines_plot.legend().remove()
 
     fig = plt.gcf()

performance_analysis/run_tapper_benchmark.sh

@@ -22,7 +22,14 @@ function run_single_bench() {
 	for ((i=0;i<"$MIZU_BENCHMARK_RUN_COUNT";i++)); do
 		log "  $i: Running tapper"
 		rm -f tapper.log
-		nohup ./agent/build/mizuagent --tap --api-server-address ws://localhost:8899/wsTapper -i lo -stats 10 > tapper.log 2>&1 &
+		tapper_args=("--tap" "--api-server-address" "ws://localhost:8899/wsTapper" "-stats" "10")
+		if [[ $(uname) == "Darwin" ]]
+		then
+			tapper_args+=("-i" "lo0" "-"decoder "Loopback")
+		else
+			tapper_args+=("-i" "lo")
+		fi
+		nohup ./agent/build/mizuagent ${tapper_args[@]} > tapper.log 2>&1 &
 
 		log "  $i: Running client (hey)"
 		hey -z $MIZU_BENCHMARK_CLIENT_PERIOD -c $MIZU_BENCHMARK_CLIENTS_COUNT -q $MIZU_BENCHMARK_QPS $MIZU_BENCHMARK_URL > /dev/null || return 1

shared/kubernetes/provider.go

@@ -392,6 +392,16 @@ func (provider *Provider) GetMizuApiServerPodObject(opts *ApiServerOptions, moun
 			Volumes:                       volumes,
 			DNSPolicy:                     core.DNSClusterFirstWithHostNet,
 			TerminationGracePeriodSeconds: new(int64),
+			Tolerations: []core.Toleration{
+				{
+					Operator: core.TolerationOpExists,
+					Effect: core.TaintEffectNoExecute,
+				},
+				{
+					Operator: core.TolerationOpExists,
+					Effect: core.TaintEffectNoSchedule,
+				},
+			},
 		},
 	}
 

tap/api/api.go

@@ -431,7 +431,6 @@ type TcpReader interface {
 type TcpStream interface {
 	SetProtocol(protocol *Protocol)
 	GetOrigin() Capture
-	GetProtocol() *Protocol
 	GetReqResMatchers() []RequestResponseMatcher
 	GetIsTapTarget() bool
 	GetIsClosed() bool

tap/extensions/amqp/main.go

@@ -3,7 +3,6 @@ package amqp
 import (
 	"bufio"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"log"
@@ -75,10 +74,6 @@ func (d dissecting) Dissect(b *bufio.Reader, reader api.TcpReader, options *api.
 	var lastMethodFrameMessage Message
 
 	for {
-		if reader.GetParent().GetProtocol() != nil && reader.GetParent().GetProtocol() != &protocol {
-			return errors.New("Identified by another protocol")
-		}
-
 		frame, err := r.ReadFrame()
 		if err == io.EOF {
 			// We must read until we see an EOF... very important!
@@ -90,6 +85,8 @@ func (d dissecting) Dissect(b *bufio.Reader, reader api.TcpReader, options *api.
 			// drop
 
 		case *HeaderFrame:
+			reader.GetParent().SetProtocol(&protocol)
+
 			// start content state
 			header = f
 			remaining = int(header.Size)
@@ -107,20 +104,22 @@ func (d dissecting) Dissect(b *bufio.Reader, reader api.TcpReader, options *api.
 			}
 
 		case *BodyFrame:
+			reader.GetParent().SetProtocol(&protocol)
+
 			// continue until terminated
 			remaining -= len(f.Body)
 			switch lastMethodFrameMessage.(type) {
 			case *BasicPublish:
 				eventBasicPublish.Body = f.Body
-				reader.GetParent().SetProtocol(&protocol)
 				emitAMQP(*eventBasicPublish, amqpRequest, basicMethodMap[40], connectionInfo, reader.GetCaptureTime(), reader.GetReadProgress().Current(), reader.GetEmitter(), reader.GetParent().GetOrigin())
 			case *BasicDeliver:
 				eventBasicDeliver.Body = f.Body
-				reader.GetParent().SetProtocol(&protocol)
 				emitAMQP(*eventBasicDeliver, amqpRequest, basicMethodMap[60], connectionInfo, reader.GetCaptureTime(), reader.GetReadProgress().Current(), reader.GetEmitter(), reader.GetParent().GetOrigin())
 			}
 
 		case *MethodFrame:
+			reader.GetParent().SetProtocol(&protocol)
+
 			lastMethodFrameMessage = f.Method
 			switch m := f.Method.(type) {
 			case *BasicPublish:
@@ -137,7 +136,6 @@ func (d dissecting) Dissect(b *bufio.Reader, reader api.TcpReader, options *api.
 					NoWait:     m.NoWait,
 					Arguments:  m.Arguments,
 				}
-				reader.GetParent().SetProtocol(&protocol)
 				emitAMQP(*eventQueueBind, amqpRequest, queueMethodMap[20], connectionInfo, reader.GetCaptureTime(), reader.GetReadProgress().Current(), reader.GetEmitter(), reader.GetParent().GetOrigin())
 
 			case *BasicConsume:
@@ -150,7 +148,6 @@ func (d dissecting) Dissect(b *bufio.Reader, reader api.TcpReader, options *api.
 					NoWait:      m.NoWait,
 					Arguments:   m.Arguments,
 				}
-				reader.GetParent().SetProtocol(&protocol)
 				emitAMQP(*eventBasicConsume, amqpRequest, basicMethodMap[20], connectionInfo, reader.GetCaptureTime(), reader.GetReadProgress().Current(), reader.GetEmitter(), reader.GetParent().GetOrigin())
 
 			case *BasicDeliver:
@@ -170,7 +167,6 @@ func (d dissecting) Dissect(b *bufio.Reader, reader api.TcpReader, options *api.
 					NoWait:     m.NoWait,
 					Arguments:  m.Arguments,
 				}
-				reader.GetParent().SetProtocol(&protocol)
 				emitAMQP(*eventQueueDeclare, amqpRequest, queueMethodMap[10], connectionInfo, reader.GetCaptureTime(), reader.GetReadProgress().Current(), reader.GetEmitter(), reader.GetParent().GetOrigin())
 
 			case *ExchangeDeclare:
@@ -184,7 +180,6 @@ func (d dissecting) Dissect(b *bufio.Reader, reader api.TcpReader, options *api.
 					NoWait:     m.NoWait,
 					Arguments:  m.Arguments,
 				}
-				reader.GetParent().SetProtocol(&protocol)
 				emitAMQP(*eventExchangeDeclare, amqpRequest, exchangeMethodMap[10], connectionInfo, reader.GetCaptureTime(), reader.GetReadProgress().Current(), reader.GetEmitter(), reader.GetParent().GetOrigin())
 
 			case *ConnectionStart:
@@ -195,7 +190,6 @@ func (d dissecting) Dissect(b *bufio.Reader, reader api.TcpReader, options *api.
 					Mechanisms:       m.Mechanisms,
 					Locales:          m.Locales,
 				}
-				reader.GetParent().SetProtocol(&protocol)
 				emitAMQP(*eventConnectionStart, amqpRequest, connectionMethodMap[10], connectionInfo, reader.GetCaptureTime(), reader.GetReadProgress().Current(), reader.GetEmitter(), reader.GetParent().GetOrigin())
 
 			case *ConnectionClose:
@@ -205,7 +199,6 @@ func (d dissecting) Dissect(b *bufio.Reader, reader api.TcpReader, options *api.
 					ClassId:   m.ClassId,
 					MethodId:  m.MethodId,
 				}
-				reader.GetParent().SetProtocol(&protocol)
 				emitAMQP(*eventConnectionClose, amqpRequest, connectionMethodMap[50], connectionInfo, reader.GetCaptureTime(), reader.GetReadProgress().Current(), reader.GetEmitter(), reader.GetParent().GetOrigin())
 			}
 

tap/extensions/amqp/tcp_stream_mock_test.go

@@ -8,7 +8,6 @@ import (
 
 type tcpStream struct {
 	isClosed       bool
-	protocol       *api.Protocol
 	isTapTarget    bool
 	origin         api.Capture
 	reqResMatchers []api.RequestResponseMatcher
@@ -27,10 +26,6 @@ func (t *tcpStream) GetOrigin() api.Capture {
 	return t.origin
 }
 
-func (t *tcpStream) GetProtocol() *api.Protocol {
-	return t.protocol
-}
-
 func (t *tcpStream) GetReqResMatchers() []api.RequestResponseMatcher {
 	return t.reqResMatchers
 }

tap/extensions/http/main.go

@@ -3,7 +3,6 @@ package http
 import (
 	"bufio"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"log"
@@ -144,10 +143,6 @@ func (d dissecting) Dissect(b *bufio.Reader, reader api.TcpReader, options *api.
 			http2Assembler = createHTTP2Assembler(b)
 		}
 
-		if reader.GetParent().GetProtocol() != nil && reader.GetParent().GetProtocol() != &http11protocol {
-			return errors.New("Identified by another protocol")
-		}
-
 		if isHTTP2 {
 			err = handleHTTP2Stream(http2Assembler, reader.GetReadProgress(), reader.GetParent().GetOrigin(), reader.GetTcpID(), reader.GetCaptureTime(), reader.GetEmitter(), options, reqResMatcher)
 			if err == io.EOF || err == io.ErrUnexpectedEOF {
@@ -200,10 +195,6 @@ func (d dissecting) Dissect(b *bufio.Reader, reader api.TcpReader, options *api.
 		}
 	}
 
-	if reader.GetParent().GetProtocol() == nil {
-		return err
-	}
-
 	return nil
 }
 

tap/extensions/http/tcp_stream_mock_test.go

@@ -8,7 +8,6 @@ import (
 
 type tcpStream struct {
 	isClosed       bool
-	protocol       *api.Protocol
 	isTapTarget    bool
 	origin         api.Capture
 	reqResMatchers []api.RequestResponseMatcher
@@ -27,10 +26,6 @@ func (t *tcpStream) GetOrigin() api.Capture {
 	return t.origin
 }
 
-func (t *tcpStream) GetProtocol() *api.Protocol {
-	return t.protocol
-}
-
 func (t *tcpStream) GetReqResMatchers() []api.RequestResponseMatcher {
 	return t.reqResMatchers
 }

tap/extensions/kafka/main.go

@@ -3,7 +3,6 @@ package kafka
 import (
 	"bufio"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"log"
 	"time"
@@ -38,10 +37,6 @@ func (d dissecting) Ping() {
 func (d dissecting) Dissect(b *bufio.Reader, reader api.TcpReader, options *api.TrafficFilteringOptions) error {
 	reqResMatcher := reader.GetReqResMatcher().(*requestResponseMatcher)
 	for {
-		if reader.GetParent().GetProtocol() != nil && reader.GetParent().GetProtocol() != &_protocol {
-			return errors.New("Identified by another protocol")
-		}
-
 		if reader.GetIsClient() {
 			_, _, err := ReadRequest(b, reader.GetTcpID(), reader.GetCounterPair(), reader.GetCaptureTime(), reqResMatcher)
 			if err != nil {

tap/extensions/kafka/tcp_stream_mock_test.go

@@ -8,7 +8,6 @@ import (
 
 type tcpStream struct {
 	isClosed       bool
-	protocol       *api.Protocol
 	isTapTarget    bool
 	origin         api.Capture
 	reqResMatchers []api.RequestResponseMatcher
@@ -27,10 +26,6 @@ func (t *tcpStream) GetOrigin() api.Capture {
 	return t.origin
 }
 
-func (t *tcpStream) GetProtocol() *api.Protocol {
-	return t.protocol
-}
-
 func (t *tcpStream) GetReqResMatchers() []api.RequestResponseMatcher {
 	return t.reqResMatchers
 }

tap/extensions/redis/tcp_stream_mock_test.go

@@ -8,7 +8,6 @@ import (
 
 type tcpStream struct {
 	isClosed       bool
-	protocol       *api.Protocol
 	isTapTarget    bool
 	origin         api.Capture
 	reqResMatchers []api.RequestResponseMatcher
@@ -27,10 +26,6 @@ func (t *tcpStream) GetOrigin() api.Capture {
 	return t.origin
 }
 
-func (t *tcpStream) GetProtocol() *api.Protocol {
-	return t.protocol
-}
-
 func (t *tcpStream) GetReqResMatchers() []api.RequestResponseMatcher {
 	return t.reqResMatchers
 }

tap/tcp_stream.go

@@ -83,10 +83,6 @@ func (t *tcpStream) GetOrigin() api.Capture {
 	return t.origin
 }
 
-func (t *tcpStream) GetProtocol() *api.Protocol {
-	return t.protocol
-}
-
 func (t *tcpStream) GetReqResMatchers() []api.RequestResponseMatcher {
 	return t.reqResMatchers
 }

tap/tlstapper/tls_stream.go

@@ -11,10 +11,6 @@ func (t *tlsStream) GetOrigin() api.Capture {
 	return api.Ebpf
 }
 
-func (t *tlsStream) GetProtocol() *api.Protocol {
-	return t.protocol
-}
-
 func (t *tlsStream) SetProtocol(protocol *api.Protocol) {
 	t.protocol = protocol
 }