Merge pull request #49 from sysflow-telemetry/go1.19-sigma

Go1.19 sigma

.github/workflows/ci.yaml

@@ -35,13 +35,13 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.19
       - name: Lint core module
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.47.1
+          version: v1.51.1
           working-directory: core
-          args: --disable=errcheck
+          args: --disable=errcheck --build-tags=flatrecord
   lint-driver:
     needs: lint-core
     runs-on: ubuntu-latest
@@ -51,11 +51,11 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.19
       - name: Lint driver module
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.47.1
+          version: v1.51.1
           working-directory: driver
           args: --disable=errcheck
   docker:

Dockerfile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2021 IBM Corporation.
+# Copyright (C) 2022 IBM Corporation.
 #
 # Authors:
 # Frederico Araujo <[email protected]>
@@ -38,8 +38,8 @@ ENV SRC_ROOT=/go/src/github.com/sysflow-telemetry/sf-processor/
 RUN dnf update -y --disableplugin=subscription-manager && \
      dnf install -y  --disableplugin=subscription-manager wget gcc make git device-mapper-devel
 
-RUN wget https://go.dev/dl/go1.17.7.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzf go1.17.7.linux-amd64.tar.gz && mkdir -p $SRC_ROOT
+RUN wget https://go.dev/dl/go1.19.4.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzf go1.19.4.linux-amd64.tar.gz && mkdir -p $SRC_ROOT
 
 # Copy sources
 COPY core ${SRC_ROOT}core

Makefile

@@ -12,10 +12,10 @@ include ./makefile.manifest.inc
 # Basic go commands
 PATH=$(shell printenv PATH):/usr/local/go/bin
 GOCMD=go
-GOBUILD=$(GOCMD) build -trimpath -tags exclude_graphdriver_btrfs
+GOBUILD=$(GOCMD) build -trimpath -tags "exclude_graphdriver_btrfs flatrecord"
 GOCLEAN=$(GOCMD) clean
-GOTEST=$(GOCMD) test -tags exclude_graphdriver_btrfs
-GOGET=$(GOCMD) get -tags exclude_graphdriver_btrfs
+GOTEST=$(GOCMD) test -tags "exclude_graphdriver_btrfs flatrecord"
+GOGET=$(GOCMD) get -tags "exclude_graphdriver_btrfs flatrecord"
 BIN=sfprocessor
 OUTPUT=$(BIN)
 SRC=./driver
@@ -80,3 +80,11 @@ pull:
 up: 
 	sudo docker-compose -f docker-compose.yml up
 
+.PHONY: plugins
+plugins:
+	@for dir in `find plugins -type d`; do \
+	    if [ -f $${dir}/Makefile ]; then \
+	        $(MAKE) -C $${dir}; \
+            fi; \
+	done
+

core/exporter/encoders/encoder.go

@@ -22,13 +22,13 @@ package encoders
 
 import (
 	"github.com/sysflow-telemetry/sf-processor/core/exporter/commons"
-	"github.com/sysflow-telemetry/sf-processor/core/policyengine/engine"
+	"github.com/sysflow-telemetry/sf-processor/core/policyengine/source/flatrecord"
 )
 
 // Encoder converts and serializes a record into export data.
 type Encoder interface {
 	Register(codecs map[commons.Format]EncoderFactory)
-	Encode(recs []*engine.Record) ([]commons.EncodedData, error)
+	Encode(recs []*flatrecord.Record) ([]commons.EncodedData, error)
 	Cleanup()
 }