CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: Fix linter findings introduced in last PRs (#12131)

This commit is contained in:
Paweł Żak 2022-11-01 11:27:37 +01:00 committed by GitHub
parent c907cc260e
commit e2b999267f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 33 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/inputs/kafka_consumer/kafka_consumer_test.go
View File

@ -553,7 +553,8 @@ func TestKafkaRoundTripIntegration(t *testing.T) {
MaxUndeliveredMessages: 1, MaxUndeliveredMessages: 1,
} }
parser := &influx.Parser{} parser := &influx.Parser{}
parser.Init() err = parser.Init()
require.NoError(t, err)
input.SetParser(parser) input.SetParser(parser)
err = input.Init() err = input.Init()
require.NoError(t, err) require.NoError(t, err)

4
plugins/inputs/opcua/opcua.go
View File

@ -3,12 +3,11 @@ package opcua
import ( import (
_ "embed" _ "embed"
"github.com/gopcua/opcua/ua"
"github.com/influxdata/telegraf/plugins/common/opcua"
"time" "time"
"github.com/influxdata/telegraf" "github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/config"
"github.com/influxdata/telegraf/plugins/common/opcua"
"github.com/influxdata/telegraf/plugins/common/opcua/input" "github.com/influxdata/telegraf/plugins/common/opcua/input"
"github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/inputs"
) )
@ -21,7 +20,6 @@ type OpcUA struct {
Log telegraf.Logger `toml:"-"` Log telegraf.Logger `toml:"-"`
client *ReadClient client *ReadClient
codes []ua.StatusCode
} }
func (*OpcUA) SampleConfig() string { func (*OpcUA) SampleConfig() string {

17
plugins/inputs/opentelemetry/grpc_services.go
View File

@ -4,12 +4,11 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/influxdata/influxdb-observability/common"
"github.com/influxdata/influxdb-observability/otel2influx"
"go.opentelemetry.io/collector/pdata/plog/plogotlp" "go.opentelemetry.io/collector/pdata/plog/plogotlp"
"go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp" "go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp"
"go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp" "go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp"
"github.com/influxdata/influxdb-observability/common"
"github.com/influxdata/influxdb-observability/otel2influx"
) )
type traceService struct { type traceService struct {
@ -27,9 +26,9 @@ func newTraceService(logger common.Logger, writer *writeToAccumulator) *traceSer
} }
} }
func (s *traceService) Export(ctx context.Context, req ptraceotlp.Request) (ptraceotlp.Response, error) { func (s *traceService) Export(ctx context.Context, req ptraceotlp.ExportRequest) (ptraceotlp.ExportResponse, error) {
err := s.converter.WriteTraces(ctx, req.Traces(), s.writer) err := s.converter.WriteTraces(ctx, req.Traces(), s.writer)
return ptraceotlp.NewResponse(), err return ptraceotlp.NewExportResponse(), err
} }
type metricsService struct { type metricsService struct {
@ -60,9 +59,9 @@ func newMetricsService(logger common.Logger, writer *writeToAccumulator, schema
}, nil }, nil
} }
func (s *metricsService) Export(ctx context.Context, req pmetricotlp.Request) (pmetricotlp.Response, error) { func (s *metricsService) Export(ctx context.Context, req pmetricotlp.ExportRequest) (pmetricotlp.ExportResponse, error) {
err := s.converter.WriteMetrics(ctx, req.Metrics(), s.writer) err := s.converter.WriteMetrics(ctx, req.Metrics(), s.writer)
return pmetricotlp.NewResponse(), err return pmetricotlp.NewExportResponse(), err
} }
type logsService struct { type logsService struct {
@ -80,7 +79,7 @@ func newLogsService(logger common.Logger, writer *writeToAccumulator) *logsServi
} }
} }
func (s *logsService) Export(ctx context.Context, req plogotlp.Request) (plogotlp.Response, error) { func (s *logsService) Export(ctx context.Context, req plogotlp.ExportRequest) (plogotlp.ExportResponse, error) {
err := s.converter.WriteLogs(ctx, req.Logs(), s.writer) err := s.converter.WriteLogs(ctx, req.Logs(), s.writer)
return plogotlp.NewResponse(), err return plogotlp.NewExportResponse(), err
} }

8
plugins/outputs/opentelemetry/opentelemetry.go
View File

@ -13,9 +13,7 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
"google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/credentials/insecure"
_ "google.golang.org/grpc/encoding/gzip" // Blank import to allow gzip encoding
// Blank import to allow gzip encoding
_ "google.golang.org/grpc/encoding/gzip"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
"github.com/influxdata/telegraf" "github.com/influxdata/telegraf"
@ -101,7 +99,7 @@ func (o *OpenTelemetry) Connect() error {
return err return err
} }
metricsServiceClient := pmetricotlp.NewClient(grpcClientConn) metricsServiceClient := pmetricotlp.NewGRPCClient(grpcClientConn)
o.metricsConverter = metricsConverter o.metricsConverter = metricsConverter
o.grpcClientConn = grpcClientConn o.grpcClientConn = grpcClientConn
@ -149,7 +147,7 @@ func (o *OpenTelemetry) Write(metrics []telegraf.Metric) error {
} }
} }
md := pmetricotlp.NewRequestFromMetrics(batch.GetMetrics()) md := pmetricotlp.NewExportRequestFromMetrics(batch.GetMetrics())
if md.Metrics().ResourceMetrics().Len() == 0 { if md.Metrics().ResourceMetrics().Len() == 0 {
return nil return nil
} }

31
plugins/outputs/opentelemetry/opentelemetry_test.go
View File

@ -6,16 +6,14 @@ import (
"testing" "testing"
"time" "time"
"github.com/influxdata/influxdb-observability/common"
"github.com/influxdata/influxdb-observability/influx2otel"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp" "go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp"
"google.golang.org/grpc/credentials/insecure"
"github.com/influxdata/influxdb-observability/common"
"github.com/influxdata/influxdb-observability/influx2otel"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
"github.com/influxdata/telegraf" "github.com/influxdata/telegraf"
@ -51,7 +49,7 @@ func TestOpenTelemetry(t *testing.T) {
Attributes: map[string]string{"attr-key": "attr-val"}, Attributes: map[string]string{"attr-key": "attr-val"},
metricsConverter: metricsConverter, metricsConverter: metricsConverter,
grpcClientConn: m.GrpcClient(), grpcClientConn: m.GrpcClient(),
metricsServiceClient: pmetricotlp.NewClient(m.GrpcClient()), metricsServiceClient: pmetricotlp.NewGRPCClient(m.GrpcClient()),
} }
input := testutil.MustMetric( input := testutil.MustMetric(
@ -71,13 +69,14 @@ func TestOpenTelemetry(t *testing.T) {
got := m.GotMetrics() got := m.GotMetrics()
expectJSON, err := pmetric.NewJSONMarshaler().MarshalMetrics(expect) marshaller := pmetric.JSONMarshaler{}
expectJSON, err := marshaller.MarshalMetrics(expect)
require.NoError(t, err) require.NoError(t, err)
gotJSON, err := pmetric.NewJSONMarshaler().MarshalMetrics(got) gotJSON, err := marshaller.MarshalMetrics(got)
require.NoError(t, err) require.NoError(t, err)
assert.JSONEq(t, string(expectJSON), string(gotJSON)) require.JSONEq(t, string(expectJSON), string(gotJSON))
} }
var _ pmetricotlp.GRPCServer = (*mockOtelService)(nil) var _ pmetricotlp.GRPCServer = (*mockOtelService)(nil)
@ -103,7 +102,7 @@ func newMockOtelService(t *testing.T) *mockOtelService {
} }
pmetricotlp.RegisterGRPCServer(grpcServer, mockOtelService) pmetricotlp.RegisterGRPCServer(grpcServer, mockOtelService)
go func() { assert.NoError(t, grpcServer.Serve(listener)) }() go func() { require.NoError(t, grpcServer.Serve(listener)) }()
grpcClient, err := grpc.Dial(listener.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock()) grpcClient, err := grpc.Dial(listener.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock())
require.NoError(t, err) require.NoError(t, err)
@ -113,7 +112,7 @@ func newMockOtelService(t *testing.T) *mockOtelService {
} }
func (m *mockOtelService) Cleanup() { func (m *mockOtelService) Cleanup() {
assert.NoError(m.t, m.grpcClient.Close()) require.NoError(m.t, m.grpcClient.Close())
m.grpcServer.Stop() m.grpcServer.Stop()
} }
@ -129,11 +128,11 @@ func (m *mockOtelService) Address() string {
return m.listener.Addr().String() return m.listener.Addr().String()
} }
func (m *mockOtelService) Export(ctx context.Context, request pmetricotlp.Request) (pmetricotlp.Response, error) { func (m *mockOtelService) Export(ctx context.Context, request pmetricotlp.ExportRequest) (pmetricotlp.ExportResponse, error) {
m.metrics = pmetric.NewMetrics() m.metrics = pmetric.NewMetrics()
request.Metrics().CopyTo(m.metrics) request.Metrics().CopyTo(m.metrics)
ctxMetadata, ok := metadata.FromIncomingContext(ctx) ctxMetadata, ok := metadata.FromIncomingContext(ctx)
assert.Equal(m.t, []string{"header1"}, ctxMetadata.Get("test")) require.Equal(m.t, []string{"header1"}, ctxMetadata.Get("test"))
assert.True(m.t, ok) require.True(m.t, ok)
return pmetricotlp.NewResponse(), nil return pmetricotlp.NewExportResponse(), nil
} }

11
plugins/processors/parser/parser_test.go
View File

@ -4,19 +4,16 @@ import (
"testing" "testing"
"time" "time"
"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/metric"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
//Blank import to register all new-style parsers "github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/metric"
"github.com/influxdata/telegraf/plugins/parsers" "github.com/influxdata/telegraf/plugins/parsers"
"github.com/influxdata/telegraf/plugins/parsers/grok" "github.com/influxdata/telegraf/plugins/parsers/grok"
"github.com/influxdata/telegraf/plugins/parsers/influx" "github.com/influxdata/telegraf/plugins/parsers/influx"
"github.com/influxdata/telegraf/plugins/parsers/json" "github.com/influxdata/telegraf/plugins/parsers/json"
"github.com/influxdata/telegraf/plugins/parsers/logfmt" "github.com/influxdata/telegraf/plugins/parsers/logfmt"
"github.com/influxdata/telegraf/plugins/parsers/value" "github.com/influxdata/telegraf/plugins/parsers/value"
"github.com/influxdata/telegraf/testutil" "github.com/influxdata/telegraf/testutil"
) )
@ -701,8 +698,8 @@ func TestBadApply(t *testing.T) {
func getMetricFields(m telegraf.Metric) interface{} { func getMetricFields(m telegraf.Metric) interface{} {
key := "field3" key := "field3"
if value, ok := m.Fields()[key]; ok { if v, ok := m.Fields()[key]; ok {
return value return v
} }
return nil return nil
} }