From bdd7e3be32f3e1992a49d1cd95d54a3ba5e8617a Mon Sep 17 00:00:00 2001 From: yotamloe Date: Tue, 9 Aug 2022 14:31:41 +0300 Subject: [PATCH 01/25] Upgrade otelbuilder -> 0.57.2 + update logzioexporter deps --- .github/workflows/release-artifacts.yml | 4 +- Makefile | 2 +- logzio/exporter/logzioexporter/exporter.go | 8 +- .../exporter/logzioexporter/exporter_test.go | 6 +- logzio/exporter/logzioexporter/factory.go | 14 +- logzio/exporter/logzioexporter/go.mod | 40 +++--- logzio/exporter/logzioexporter/go.sum | 85 ++++++------ logzio/exporter/logzioexporter/jsonlog.go | 4 +- .../exporter/logzioexporter/jsonlog_test.go | 4 +- .../exporter/logzioexporter/logzioservice.go | 4 +- logzio/exporter/logzioexporter/logziospan.go | 8 +- .../logzioexporter/logziospan_test.go | 2 +- otelbuilder/Makefile | 4 +- otelbuilder/otelcol-builder.yaml | 128 +++++++++--------- 14 files changed, 158 insertions(+), 155 deletions(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 7f2c778..31161f9 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -1,4 +1,4 @@ -name: build +name: build atrifacts on: release: types: [published] @@ -25,7 +25,7 @@ jobs: run: make otelcol-logzio-${{ matrix.os_arch }} working-directory: ./otelbuilder - name: compress - run: tar -czvf otelcol-logzio-${{ matrix.os_arch }}.tar.gz ./otelcol-logzio-${{ matrix.os_arch }} + run: tar -czvf otelcol-logzio-${{ matrix.os_arch }}.tar.gz otelcol-logzio-${{ matrix.os_arch }} working-directory: ./otelbuilder/cmd - name: upload artifacts to release uses: softprops/action-gh-release@v1 diff --git a/Makefile b/Makefile index cc075c7..1ef1e59 100644 --- a/Makefile +++ b/Makefile @@ -103,7 +103,7 @@ install-tools: go install golang.org/x/tools/cmd/goimports@latest go install github.com/client9/misspell/cmd/misspell@latest go install github.com/pavius/impi/cmd/impi@latest - go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest + go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.47.3 .PHONY: test-componenets test-components: diff --git a/logzio/exporter/logzioexporter/exporter.go b/logzio/exporter/logzioexporter/exporter.go index 01c4623..2ab644c 100644 --- a/logzio/exporter/logzioexporter/exporter.go +++ b/logzio/exporter/logzioexporter/exporter.go @@ -127,7 +127,7 @@ func newLogzioLogsExporter(config *Config, set component.ExporterCreateSettings) } func (exporter *logzioExporter) start(_ context.Context, host component.Host) error { - client, err := exporter.config.HTTPClientSettings.ToClient(host.GetExtensions(), exporter.settings) + client, err := exporter.config.HTTPClientSettings.ToClient(host, exporter.settings) if err != nil { return err } @@ -145,7 +145,7 @@ func (exporter *logzioExporter) pushLogData(ctx context.Context, ld plog.Logs) e logRecords := scopeLogs.At(j).LogRecords() for k := 0; k < logRecords.Len(); k++ { log := logRecords.At(k) - jsonLog := ConvertLogRecordToJSON(log, resource, exporter.logger) + jsonLog := convertLogRecordToJSON(log, resource, exporter.logger) logzioLog, err := json.Marshal(jsonLog) if err != nil { return err @@ -175,7 +175,7 @@ func (exporter *logzioExporter) pushTraceData(ctx context.Context, traces ptrace span.Process = batch.Process span.Tags = exporter.dropEmptyTags(span.Tags) span.Process.Tags = exporter.dropEmptyTags(span.Process.Tags) - logzioSpan, transformErr := TransformToLogzioSpanBytes(span) + logzioSpan, transformErr := transformToLogzioSpanBytes(span) if transformErr != nil { return transformErr } @@ -187,7 +187,7 @@ func (exporter *logzioExporter) pushTraceData(ctx context.Context, traces ptrace // if the service hash already exists in cache: skip // else: store service in cache and send to logz.io // this prevents sending duplicate logzio services - service := NewLogzioService(span) + service := newLogzioService(span) serviceHash, hashErr := service.HashCode() if exporter.serviceCache.Get(serviceHash) == nil || hashErr != nil { if hashErr == nil { diff --git a/logzio/exporter/logzioexporter/exporter_test.go b/logzio/exporter/logzioexporter/exporter_test.go index 46a80c3..27af615 100644 --- a/logzio/exporter/logzioexporter/exporter_test.go +++ b/logzio/exporter/logzioexporter/exporter_test.go @@ -170,7 +170,7 @@ func GenerateLogsManyLogRecordsSameResource(count int) plog.Logs { func testLogsExporter(ld plog.Logs, t *testing.T, cfg *Config) error { var err error params := componenttest.NewNopExporterCreateSettings() - exporter, err := CreateLogsExporter(context.Background(), params, cfg) + exporter, err := createLogsExporter(context.Background(), params, cfg) if err != nil { return err } @@ -218,7 +218,7 @@ func newTestTraces() ptrace.Traces { func testTracesExporter(td ptrace.Traces, t *testing.T, cfg *Config) error { params := componenttest.NewNopExporterCreateSettings() - exporter, err := CreateTracesExporter(context.Background(), params, cfg) + exporter, err := createTracesExporter(context.Background(), params, cfg) if err != nil { return err } @@ -294,7 +294,7 @@ func TestNullTokenConfig(tester *testing.T) { Region: "eu", } params := componenttest.NewNopExporterCreateSettings() - _, err := CreateTracesExporter(context.Background(), params, &cfg) + _, err := createTracesExporter(context.Background(), params, &cfg) assert.Error(tester, err, "Empty token should produce error") } diff --git a/logzio/exporter/logzioexporter/factory.go b/logzio/exporter/logzioexporter/factory.go index 39e32d3..cd0effe 100644 --- a/logzio/exporter/logzioexporter/factory.go +++ b/logzio/exporter/logzioexporter/factory.go @@ -30,15 +30,19 @@ import ( "go.opentelemetry.io/collector/config" ) -const typeStr = "logzio" +const ( + typeStr = "logzio" + // The stability level of the exporter. + stability = component.StabilityLevelBeta +) // NewFactory creates a factory for Logz.io exporter. func NewFactory() component.ExporterFactory { return component.NewExporterFactory( typeStr, createDefaultConfig, - component.WithTracesExporter(CreateTracesExporter), - component.WithLogsExporter(CreateLogsExporter)) + component.WithTracesExporter(createTracesExporter, stability), + component.WithLogsExporter(createLogsExporter, component.StabilityLevelBeta)) } @@ -99,12 +103,12 @@ func generateEndpoint(cfg *Config) (string, error) { } } -func CreateTracesExporter(_ context.Context, params component.ExporterCreateSettings, cfg config.Exporter) (component.TracesExporter, error) { +func createTracesExporter(_ context.Context, params component.ExporterCreateSettings, cfg config.Exporter) (component.TracesExporter, error) { exporterConfig := cfg.(*Config) return newLogzioTracesExporter(exporterConfig, params) } -func CreateLogsExporter(_ context.Context, params component.ExporterCreateSettings, cfg config.Exporter) (component.LogsExporter, error) { +func createLogsExporter(_ context.Context, params component.ExporterCreateSettings, cfg config.Exporter) (component.LogsExporter, error) { exporterConfig := cfg.(*Config) return newLogzioLogsExporter(exporterConfig, params) } diff --git a/logzio/exporter/logzioexporter/go.mod b/logzio/exporter/logzioexporter/go.mod index 708c62e..eeb5706 100644 --- a/logzio/exporter/logzioexporter/go.mod +++ b/logzio/exporter/logzioexporter/go.mod @@ -1,18 +1,18 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter -go 1.17 +go 1.18 require ( - github.com/hashicorp/go-hclog v1.2.1 - github.com/jaegertracing/jaeger v1.35.2 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.54.0 - github.com/stretchr/testify v1.7.4 - go.opentelemetry.io/collector v0.54.0 - go.opentelemetry.io/collector/pdata v0.54.0 - go.opentelemetry.io/collector/semconv v0.54.0 + github.com/hashicorp/go-hclog v1.2.2 + github.com/jaegertracing/jaeger v1.37.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.57.2 + github.com/stretchr/testify v1.8.0 + go.opentelemetry.io/collector v0.57.2 + go.opentelemetry.io/collector/pdata v0.57.2 + go.opentelemetry.io/collector/semconv v0.57.2 go.uber.org/zap v1.21.0 - google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac - google.golang.org/protobuf v1.28.0 + google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd + google.golang.org/protobuf v1.28.1 ) require ( @@ -20,14 +20,14 @@ require ( github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fatih/color v1.13.0 // indirect - github.com/felixge/httpsnoop v1.0.2 // indirect + github.com/felixge/httpsnoop v1.0.3 // indirect github.com/go-logr/logr v1.2.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.15.6 // indirect + github.com/klauspost/compress v1.15.9 // indirect github.com/knadh/koanf v1.4.2 // indirect github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-isatty v0.0.14 // indirect @@ -36,23 +36,23 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.54.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.57.2 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 // indirect - go.opentelemetry.io/otel v1.7.0 // indirect - go.opentelemetry.io/otel/metric v0.30.0 // indirect - go.opentelemetry.io/otel/trace v1.7.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect + go.opentelemetry.io/otel v1.9.0 // indirect + go.opentelemetry.io/otel/metric v0.31.0 // indirect + go.opentelemetry.io/otel/trace v1.9.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect - golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect - golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect + golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect + golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect golang.org/x/text v0.3.7 // indirect - google.golang.org/grpc v1.47.0 // indirect + google.golang.org/grpc v1.48.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/logzio/exporter/logzioexporter/go.sum b/logzio/exporter/logzioexporter/go.sum index 8869d62..d47aff0 100644 --- a/logzio/exporter/logzioexporter/go.sum +++ b/logzio/exporter/logzioexporter/go.sum @@ -1,7 +1,7 @@ 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/HdrHistogram/hdrhistogram-go v1.0.1 h1:GX8GAYDuhlFQnI2fRDHQhTlkHMz8bEn0jTI6LJU0mpw= +github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/thrift v0.16.0 h1:qEy6UW60iVOlUy+b9ZR0d5WzUWYGOo4HfopoyBaNmoY= github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= @@ -28,7 +28,6 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk 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/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= @@ -39,15 +38,14 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF 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.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= -github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= -github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= +github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -92,7 +90,6 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/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.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -102,8 +99,8 @@ github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -github.com/hashicorp/go-hclog v1.2.1 h1:YQsLlGDJgwhXFpucSPyVbCBviQtjlHv3jLTlp8YmtEw= -github.com/hashicorp/go-hclog v1.2.1/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-hclog v1.2.2 h1:ihRI7YFwcZdiSD7SIenIhHfQH3OuDvWerAUBZbeQS3M= +github.com/hashicorp/go-hclog v1.2.2/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= @@ -121,8 +118,8 @@ github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoI github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/jaegertracing/jaeger v1.35.2 h1:7bQhPrAHqYpucz9wB3laOm8QO+1rFuSlCcfWASY2QGM= -github.com/jaegertracing/jaeger v1.35.2/go.mod h1:e7FBVZ14ptsRjwiHEnLyxvOa4bSnZA0BDFE1OcvNiHs= +github.com/jaegertracing/jaeger v1.37.0 h1:/EY0n/IUFT/NozEM78bzW2Lm2dPoKuIF/9c9UcoMBxQ= +github.com/jaegertracing/jaeger v1.37.0/go.mod h1:2tPPMcktsOFhmsiyxoYnUE0QAlP4UC6DEsC2jdllt5g= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= @@ -131,8 +128,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= 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.15.6 h1:6D9PcO8QWu0JyaQ2zUMmu16T1T+zjjEpP91guRsvDfY= -github.com/klauspost/compress v1.15.6/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= +github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= +github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/knadh/koanf v1.4.2 h1:2itp+cdC6miId4pO4Jw7c/3eiYD26Z/Sz3ATJMwHxIs= github.com/knadh/koanf v1.4.2/go.mod h1:4NCo0q4pmU398vF9vq2jStF9MWQZ8JEDcDMHlDCr4h0= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -170,15 +167,15 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.54.0 h1:Bvf7Dt70kj9O2lJ6XCiYny4aFqp6WlSR6d40gj9GzgI= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.54.0/go.mod h1:CSe1wsnLhSAEgAEXLfi8wTyl0VwPVkq7925aV8xm0oM= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.54.0 h1:uLPf9F2+09biNWiLm64Cs0504grwY1hL9eKQ62GUJrA= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.54.0/go.mod h1:uWFgO68sLEqWrQxL8rws1CkB8EUNQaedP3FWI1gMJOU= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.57.2 h1:4HeNNbZnqz15hj4oGm1O1x+yP+hPnvhz2UYqrApvPDk= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.57.2/go.mod h1:xPchY5YNOL9jr6phVkJEvkEakMYr8HMD4uGYEoKXIek= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.57.2 h1:6aMr+4kCgzJKBpWwZwPGzKfdn0ujXObJC9Rhkg+ak1s= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.57.2/go.mod h1:4rFuWKMbzM9H39RbDvPtJfAp/fxsHydhJhKns6skmK0= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= -github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= +github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -205,8 +202,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= -github.com/stretchr/testify v1.7.4 h1:wZRexSlwd7ZXfKINDLsO4r7WBt3gTKONc6K/VesHvHM= -github.com/stretchr/testify v1.7.4/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= @@ -216,21 +213,21 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.54.0 h1:GGSLxp90IbdySxXdk1CA2aT8l/gZt+przVL43uQEYp4= -go.opentelemetry.io/collector v0.54.0/go.mod h1:FgNzyfb4sAGb5cqusB5znETJ8Pz4OQUBGbOeGIZ2rlQ= -go.opentelemetry.io/collector/pdata v0.54.0 h1:oo3HyHwdf4lJmDUN0yrOGKj2tiHIoXDutDd0HKR++/0= -go.opentelemetry.io/collector/pdata v0.54.0/go.mod h1:1nSelv/YqGwdHHaIKNW9ZOHSMqicDX7W4/7TjNCm6N8= -go.opentelemetry.io/collector/semconv v0.54.0 h1:MaC9XW5xCqyoGp45yuSE4MSH8Ec0vawwh+w9JPjNNgA= -go.opentelemetry.io/collector/semconv v0.54.0/go.mod h1:HAGkPKNMhc4kEHevEqVIEtUuvsRQMIbUWBb8yBrqEwk= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 h1:mac9BKRqwaX6zxHPDe3pvmWpwuuIM0vuXv2juCnQevE= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0/go.mod h1:5eCOqeGphOyz6TsY3ZDNjE33SM/TFAK3RGuCL2naTgY= -go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM= -go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk= -go.opentelemetry.io/otel/metric v0.30.0 h1:Hs8eQZ8aQgs0U49diZoaS6Uaxw3+bBE3lcMUKBFIk3c= -go.opentelemetry.io/otel/metric v0.30.0/go.mod h1:/ShZ7+TS4dHzDFmfi1kSXMhMVubNoP0oIaBp70J6UXU= -go.opentelemetry.io/otel/sdk v1.7.0 h1:4OmStpcKVOfvDOgCt7UriAPtKolwIhxpnSNI/yK+1B0= -go.opentelemetry.io/otel/trace v1.7.0 h1:O37Iogk1lEkMRXewVtZ1BBTVn5JEp8GrJvP92bJqC6o= -go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU= +go.opentelemetry.io/collector v0.57.2 h1:/J7twI5BlIK3I4GfDfLhqPgfgSjnhiDesXf24bmrXYM= +go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= +go.opentelemetry.io/collector/pdata v0.57.2 h1:w2w3NE7/3WzHloT1xV5caRmifV3qt95gc5iJhO/Bues= +go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= +go.opentelemetry.io/collector/semconv v0.57.2 h1:+lcI4yi8xUzoSNZgGTs0vytZcEAH95Tb33Ig+gooBV8= +go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= +go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= +go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= +go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= +go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A= +go.opentelemetry.io/otel/sdk v1.8.0 h1:xwu69/fNuwbSHWe/0PGS888RmjWY181OmcXDQKu7ZQk= +go.opentelemetry.io/otel/trace v1.9.0 h1:oZaCNJUjWcg60VXWee8lJKlqhPbXAPB51URuR47pQYc= +go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= @@ -265,8 +262,8 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20220412020605-290c469a71a5 h1:bRb386wvrE+oBNdF1d/Xh9mQrfQ4ecYhW5qJ5GvTGT4= -golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 h1:NWy5+hlRbC7HK+PmcXVUmW1IMyFce7to56IUvhUFm7Y= +golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= 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/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -295,8 +292,9 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 h1:nonptSpoQ4vQjyraW20DXPAglgQfVnM9ZC6MmNLMR60= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -325,8 +323,8 @@ google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRn 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-20220407144326-9054f6ed7bac h1:qSNTkEN+L2mvWcLgJOR+8bdHX9rN/IdU3A1Ghpfb1Rg= -google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd h1:e0TwkXOdbnH/1x5rc5MZ/VYyiZ4v+RdVfrGMqEwT68I= +google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= @@ -336,9 +334,9 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= -google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8= -google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w= +google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= 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= @@ -351,8 +349,9 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba 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.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/logzio/exporter/logzioexporter/jsonlog.go b/logzio/exporter/logzioexporter/jsonlog.go index f5dd363..f220670 100644 --- a/logzio/exporter/logzioexporter/jsonlog.go +++ b/logzio/exporter/logzioexporter/jsonlog.go @@ -53,8 +53,8 @@ func convertAttributeValue(value pcommon.Value, logger hclog.Logger) interface{} } } -// ConvertLogRecordToJSON Takes `plog.LogRecord` and `pcommon.Resource` input, outputs byte array that represents the log record as json string -func ConvertLogRecordToJSON(log plog.LogRecord, resource pcommon.Resource, logger hclog.Logger) map[string]interface{} { +// convertLogRecordToJSON Takes `plog.LogRecord` and `pcommon.Resource` input, outputs byte array that represents the log record as json string +func convertLogRecordToJSON(log plog.LogRecord, resource pcommon.Resource, logger hclog.Logger) map[string]interface{} { jsonLog := map[string]interface{}{} if spanID := log.SpanID().HexString(); spanID != "" { jsonLog["spanID"] = spanID diff --git a/logzio/exporter/logzioexporter/jsonlog_test.go b/logzio/exporter/logzioexporter/jsonlog_test.go index e262bd3..c89e8ab 100644 --- a/logzio/exporter/logzioexporter/jsonlog_test.go +++ b/logzio/exporter/logzioexporter/jsonlog_test.go @@ -83,7 +83,7 @@ func TestConvertLogRecordToJSON(t *testing.T) { }, } for _, test := range ConvertLogRecordToJSONTests { - output := ConvertLogRecordToJSON(test.log, test.resource, logger) + output := convertLogRecordToJSON(test.log, test.resource, logger) require.Equal(t, output, test.expected) } @@ -106,7 +106,7 @@ func TestSetTimeStamp(t *testing.T) { } var err error params := componenttest.NewNopExporterCreateSettings() - exporter, err := CreateLogsExporter(context.Background(), params, cfg) + exporter, err := createLogsExporter(context.Background(), params, cfg) require.NoError(t, err) err = exporter.Start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) diff --git a/logzio/exporter/logzioexporter/logzioservice.go b/logzio/exporter/logzioexporter/logzioservice.go index 4eaa8cb..b28aecf 100644 --- a/logzio/exporter/logzioexporter/logzioservice.go +++ b/logzio/exporter/logzioexporter/logzioservice.go @@ -30,8 +30,8 @@ type LogzioService struct { Type string `json:"type"` } -// NewLogzioService creates a new logzio service from a span -func NewLogzioService(span *model.Span) LogzioService { +// newLogzioService creates a new logzio service from a span +func newLogzioService(span *model.Span) LogzioService { service := LogzioService{ ServiceName: span.Process.ServiceName, OperationName: span.OperationName, diff --git a/logzio/exporter/logzioexporter/logziospan.go b/logzio/exporter/logzioexporter/logziospan.go index a0acf4a..4497ce3 100644 --- a/logzio/exporter/logzioexporter/logziospan.go +++ b/logzio/exporter/logzioexporter/logziospan.go @@ -53,9 +53,9 @@ func getTagsValues(tags []model.KeyValue) []string { return values } -// TransformToLogzioSpanBytes receives a Jaeger span, converts it to logzio span and returns it as a byte array. +// transformToLogzioSpanBytes receives a Jaeger span, converts it to logzio span and returns it as a byte array. // The main differences between Jaeger span and logzio span are arrays which are represented as maps -func TransformToLogzioSpanBytes(span *model.Span) ([]byte, error) { +func transformToLogzioSpanBytes(span *model.Span) ([]byte, error) { spanConverter := dbmodel.NewFromDomain(true, getTagsValues(span.Tags), TagDotReplacementCharacter) jsonSpan := spanConverter.FromDomainEmbedProcess(span) logzioSpan := LogzioSpan{ @@ -77,8 +77,8 @@ func TransformToLogzioSpanBytes(span *model.Span) ([]byte, error) { return json.Marshal(logzioSpan) } -// TransformToDbModelSpan coverts logz.io span to ElasticSearch span -func (span *LogzioSpan) TransformToDbModelSpan() *dbmodel.Span { +// transformToDbModelSpan coverts logz.io span to ElasticSearch span +func (span *LogzioSpan) transformToDbModelSpan() *dbmodel.Span { return &dbmodel.Span{ OperationName: span.OperationName, Process: span.Process, diff --git a/logzio/exporter/logzioexporter/logziospan_test.go b/logzio/exporter/logzioexporter/logziospan_test.go index ea352ed..5d57fe7 100644 --- a/logzio/exporter/logzioexporter/logziospan_test.go +++ b/logzio/exporter/logzioexporter/logziospan_test.go @@ -34,7 +34,7 @@ func TestTransformToLogzioSpanBytes(tester *testing.T) { if err != nil { fmt.Println("json.Unmarshal") } - logzioSpan, err := TransformToLogzioSpanBytes(&span) + logzioSpan, err := transformToLogzioSpanBytes(&span) if err != nil { tester.Fatalf(err.Error()) } diff --git a/otelbuilder/Makefile b/otelbuilder/Makefile index 935bb82..e0c6bbe 100644 --- a/otelbuilder/Makefile +++ b/otelbuilder/Makefile @@ -1,8 +1,8 @@ BINARY_NAME ?= otelcol-logzio -BUILDER_VERSION ?= 0.56.0 +BUILDER_VERSION ?= 0.57.2 BUILDER_REPO ?= github.com/open-telemetry/opentelemetry-collector BUILDER_BIN_NAME ?= opentelemetry-collector-builder -VERSION ?= 0.56.0 +VERSION ?= 0.57.2 GO ?= go OS ?= $(shell uname -s | tr A-Z a-z) diff --git a/otelbuilder/otelcol-builder.yaml b/otelbuilder/otelcol-builder.yaml index b98b587..b432a6e 100644 --- a/otelbuilder/otelcol-builder.yaml +++ b/otelbuilder/otelcol-builder.yaml @@ -2,90 +2,90 @@ dist: module: github.com/logzio/otel-collector-distro # the module name for the new distribution, following Go mod conventions. Optional, but recommended. name: otelcol-logzio description: "Logzio OpenTelemetry Collector distribution" - otelcol_version: "0.56.0" # the OpenTelemetry Collector version to use as base for the distribution. Optional. + otelcol_version: "0.57.2" # the OpenTelemetry Collector version to use as base for the distribution. Optional. output_path: ./cmd - version: "0.56.0" + version: "0.57.2" exporters: # Maintained exporters - gomod: "github.com/logzio/otel-collector-distro/logzio/exporter/logzioexporter v0.0.1" path: ./../logzio/exporter/logzioexporter # Upstream exporters - import: go.opentelemetry.io/collector/exporter/loggingexporter - gomod: go.opentelemetry.io/collector v0.56.0 + gomod: go.opentelemetry.io/collector v0.57.2 - import: go.opentelemetry.io/collector/exporter/otlpexporter - gomod: go.opentelemetry.io/collector v0.56.0 + gomod: go.opentelemetry.io/collector v0.57.2 - import: go.opentelemetry.io/collector/exporter/otlphttpexporter - gomod: go.opentelemetry.io/collector v0.56.0 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.56.0" + gomod: go.opentelemetry.io/collector v0.57.2 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.57.2" processors: # Upstream processors - import: go.opentelemetry.io/collector/processor/batchprocessor - gomod: go.opentelemetry.io/collector v0.56.0 + gomod: go.opentelemetry.io/collector v0.57.2 - import: go.opentelemetry.io/collector/processor/memorylimiterprocessor - gomod: go.opentelemetry.io/collector v0.56.0 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.56.0" + gomod: go.opentelemetry.io/collector v0.57.2 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.57.2" receivers: # Upstream receivers - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.56.0 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.56.0" + gomod: go.opentelemetry.io/collector v0.57.2 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.57.2" extensions: # Upstream extensions - import: go.opentelemetry.io/collector/extension/ballastextension - gomod: go.opentelemetry.io/collector v0.56.0 + gomod: go.opentelemetry.io/collector v0.57.2 - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.56.0 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.56.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.56.0" + gomod: go.opentelemetry.io/collector v0.57.2 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.57.2" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.57.2" replaces: # Google renamed their org from `googleapis` to `google`, and for `gnostic` this happened in v0.5.6 From 3de667d24a68c91b93c99e707721c1f17b1b604f Mon Sep 17 00:00:00 2001 From: yotamloe Date: Tue, 9 Aug 2022 14:39:41 +0300 Subject: [PATCH 02/25] Add `TestTransformToDbModelSpan` unit test --- .../logzioexporter/logziospan_test.go | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/logzio/exporter/logzioexporter/logziospan_test.go b/logzio/exporter/logzioexporter/logziospan_test.go index 5d57fe7..a23203d 100644 --- a/logzio/exporter/logzioexporter/logziospan_test.go +++ b/logzio/exporter/logzioexporter/logziospan_test.go @@ -47,3 +47,28 @@ func TestTransformToLogzioSpanBytes(tester *testing.T) { tester.Error("error converting span to logzioSpan, JaegerTag is not found") } } + +func TestTransformToDbModelSpan(tester *testing.T) { + inStr, err := ioutil.ReadFile("./testdata/span.json") + if err != nil { + tester.Fatalf(fmt.Sprintf("error opening sample span file %s", err.Error())) + } + var span model.Span + err = json.Unmarshal(inStr, &span) + if err != nil { + fmt.Println("json.Unmarshal") + } + newSpan, err := transformToLogzioSpanBytes(&span) + if err != nil { + tester.Fatalf(err.Error()) + } + var testLogzioSpan LogzioSpan + err = json.Unmarshal(newSpan, &testLogzioSpan) + if err != nil { + tester.Fatalf(err.Error()) + } + dbModelSpan := testLogzioSpan.transformToDbModelSpan() + if len(dbModelSpan.References) != 3 { + tester.Fatalf("Error converting logzio span to dbmodel span") + } +} From 7a561db4e2281b7baa60b406c98ca0165f8aebc6 Mon Sep 17 00:00:00 2001 From: yotamloe Date: Wed, 10 Aug 2022 13:00:08 +0300 Subject: [PATCH 03/25] Test workflow --- .github/workflows/test-artifacts.yml | 46 ++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .github/workflows/test-artifacts.yml diff --git a/.github/workflows/test-artifacts.yml b/.github/workflows/test-artifacts.yml new file mode 100644 index 0000000..c36c5ab --- /dev/null +++ b/.github/workflows/test-artifacts.yml @@ -0,0 +1,46 @@ +name: build atrifacts +on: + push: + branches: [ development ] + pull_request: + branches: [ main ] +jobs: + publish_artifacts: + strategy: + matrix: + os_arch: [ darwin_amd64, linux_amd64, linux_arm64, linux_arm ] + name: publish artifacts + runs-on: macos-latest + steps: + - name: Check out the repo + uses: actions/checkout@v2 + - name: Setup Go + uses: actions/setup-go@v2 + with: + go-version: "1.17" + - name: Install go tools + run: make install-tools + - name: Install builder + run: make install-builder + working-directory: ./otelbuilder + - name: build artifacts + run: make otelcol-logzio-${{ matrix.os_arch }} + working-directory: ./otelbuilder + - name: compress + run: tar -czvf otelcol-logzio-${{ matrix.os_arch }}.tar.gz otelcol-logzio-${{ matrix.os_arch }} + working-directory: ./otelbuilder/cmd + - name: upload artifacts to release + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + files: | + ./otelbuilder/cmd/otelcol-logzio-${{ matrix.os_arch }}.tar.gz + ./otelbuilder/cmd/otelcol-logzio-${{ matrix.os_arch }} + - name: upload to workflow + uses: actions/upload-artifact@v3 + with: + name: otelcol-logzio-${{ matrix.os_arch }}.tar.gz + path: ./otelbuilder/cmd/otelcol-logzio-${{ matrix.os_arch }}.tar.gz + + + From 58c47459c709b6cd326de169c5779fc5d3462f4f Mon Sep 17 00:00:00 2001 From: yotamloe Date: Sun, 14 Aug 2022 12:21:28 +0300 Subject: [PATCH 04/25] Test workflow --- .github/workflows/release-artifacts.yml | 3 +- .github/workflows/test-artifacts.yml | 46 ------------------------- 2 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 .github/workflows/test-artifacts.yml diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 31161f9..5b1e61a 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -25,13 +25,14 @@ jobs: run: make otelcol-logzio-${{ matrix.os_arch }} working-directory: ./otelbuilder - name: compress - run: tar -czvf otelcol-logzio-${{ matrix.os_arch }}.tar.gz otelcol-logzio-${{ matrix.os_arch }} + run: tar -cvf otelcol-logzio-${{ matrix.os_arch }}.tar.gz otelcol-logzio-${{ matrix.os_arch }} working-directory: ./otelbuilder/cmd - name: upload artifacts to release uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') with: files: | + ./otelbuilder/cmd/otelcol-logzio-doesnotexist.tar.gz ./otelbuilder/cmd/otelcol-logzio-${{ matrix.os_arch }}.tar.gz ./otelbuilder/cmd/otelcol-logzio-${{ matrix.os_arch }} diff --git a/.github/workflows/test-artifacts.yml b/.github/workflows/test-artifacts.yml deleted file mode 100644 index c36c5ab..0000000 --- a/.github/workflows/test-artifacts.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: build atrifacts -on: - push: - branches: [ development ] - pull_request: - branches: [ main ] -jobs: - publish_artifacts: - strategy: - matrix: - os_arch: [ darwin_amd64, linux_amd64, linux_arm64, linux_arm ] - name: publish artifacts - runs-on: macos-latest - steps: - - name: Check out the repo - uses: actions/checkout@v2 - - name: Setup Go - uses: actions/setup-go@v2 - with: - go-version: "1.17" - - name: Install go tools - run: make install-tools - - name: Install builder - run: make install-builder - working-directory: ./otelbuilder - - name: build artifacts - run: make otelcol-logzio-${{ matrix.os_arch }} - working-directory: ./otelbuilder - - name: compress - run: tar -czvf otelcol-logzio-${{ matrix.os_arch }}.tar.gz otelcol-logzio-${{ matrix.os_arch }} - working-directory: ./otelbuilder/cmd - - name: upload artifacts to release - uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') - with: - files: | - ./otelbuilder/cmd/otelcol-logzio-${{ matrix.os_arch }}.tar.gz - ./otelbuilder/cmd/otelcol-logzio-${{ matrix.os_arch }} - - name: upload to workflow - uses: actions/upload-artifact@v3 - with: - name: otelcol-logzio-${{ matrix.os_arch }}.tar.gz - path: ./otelbuilder/cmd/otelcol-logzio-${{ matrix.os_arch }}.tar.gz - - - From 17442c44b0346974f961bafe6d3f1a583ab0b053 Mon Sep 17 00:00:00 2001 From: yotamloe Date: Sun, 14 Aug 2022 12:53:38 +0300 Subject: [PATCH 05/25] Test workflow --- .github/workflows/release-artifacts.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 5b1e61a..02d1827 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -24,17 +24,22 @@ jobs: - name: build artifacts run: make otelcol-logzio-${{ matrix.os_arch }} working-directory: ./otelbuilder + - name: mkdir + run: mkdir -p ./artifacts + working-directory: ./otelbuilder/cmd + - name: mv binary + run: mv otelcol-logzio-${{ matrix.os_arch }} ./artifacts + working-directory: ./otelbuilder/cmd - name: compress - run: tar -cvf otelcol-logzio-${{ matrix.os_arch }}.tar.gz otelcol-logzio-${{ matrix.os_arch }} + run: tar -czf otelcol-logzio-${{ matrix.os_arch }}.tar.gz artifacts working-directory: ./otelbuilder/cmd - name: upload artifacts to release uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') with: files: | - ./otelbuilder/cmd/otelcol-logzio-doesnotexist.tar.gz ./otelbuilder/cmd/otelcol-logzio-${{ matrix.os_arch }}.tar.gz - ./otelbuilder/cmd/otelcol-logzio-${{ matrix.os_arch }} + ./otelbuilder/cmd/artifacts/otelcol-logzio-${{ matrix.os_arch }} From edede16e7856ebfa67f97609153ba3ee47dbe090 Mon Sep 17 00:00:00 2001 From: yotamloe Date: Sun, 14 Aug 2022 16:19:58 +0300 Subject: [PATCH 06/25] Test workflow --- .github/workflows/release-artifacts.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 02d1827..f165aaf 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -8,7 +8,7 @@ jobs: matrix: os_arch: [ darwin_amd64, linux_amd64, linux_arm64, linux_arm ] name: publish artifacts - runs-on: macos-latest + runs-on: ubuntu-latest steps: - name: Check out the repo uses: actions/checkout@v2 @@ -24,14 +24,8 @@ jobs: - name: build artifacts run: make otelcol-logzio-${{ matrix.os_arch }} working-directory: ./otelbuilder - - name: mkdir - run: mkdir -p ./artifacts - working-directory: ./otelbuilder/cmd - - name: mv binary - run: mv otelcol-logzio-${{ matrix.os_arch }} ./artifacts - working-directory: ./otelbuilder/cmd - name: compress - run: tar -czf otelcol-logzio-${{ matrix.os_arch }}.tar.gz artifacts + run: tar -cvf otelcol-logzio-${{ matrix.os_arch }}.tar.gz otelcol-logzio-${{ matrix.os_arch }} working-directory: ./otelbuilder/cmd - name: upload artifacts to release uses: softprops/action-gh-release@v1 @@ -39,7 +33,4 @@ jobs: with: files: | ./otelbuilder/cmd/otelcol-logzio-${{ matrix.os_arch }}.tar.gz - ./otelbuilder/cmd/artifacts/otelcol-logzio-${{ matrix.os_arch }} - - - + ./otelbuilder/cmd/otelcol-logzio-${{ matrix.os_arch }} \ No newline at end of file From 462a8257df342de9d7bed5146c52673ce5b4062e Mon Sep 17 00:00:00 2001 From: yotamloe Date: Sun, 14 Aug 2022 17:28:09 +0300 Subject: [PATCH 07/25] Test workflow --- .github/workflows/release-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index f165aaf..ef34d05 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -8,7 +8,7 @@ jobs: matrix: os_arch: [ darwin_amd64, linux_amd64, linux_arm64, linux_arm ] name: publish artifacts - runs-on: ubuntu-latest + runs-on: macos-12 steps: - name: Check out the repo uses: actions/checkout@v2 From fe385aaacd219335361be72b4588bdb4e7c29f51 Mon Sep 17 00:00:00 2001 From: yotamloe Date: Sun, 14 Aug 2022 17:38:39 +0300 Subject: [PATCH 08/25] Test workflow --- .github/workflows/release-artifacts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index ef34d05..709b6a7 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -8,7 +8,7 @@ jobs: matrix: os_arch: [ darwin_amd64, linux_amd64, linux_arm64, linux_arm ] name: publish artifacts - runs-on: macos-12 + runs-on: ubuntu-latest steps: - name: Check out the repo uses: actions/checkout@v2 @@ -25,7 +25,7 @@ jobs: run: make otelcol-logzio-${{ matrix.os_arch }} working-directory: ./otelbuilder - name: compress - run: tar -cvf otelcol-logzio-${{ matrix.os_arch }}.tar.gz otelcol-logzio-${{ matrix.os_arch }} + run: tar -cvzf otelcol-logzio-${{ matrix.os_arch }}.tar.gz otelcol-logzio-${{ matrix.os_arch }} working-directory: ./otelbuilder/cmd - name: upload artifacts to release uses: softprops/action-gh-release@v1 From 8ec9920659cef77d13875ad1da8224b24831aa81 Mon Sep 17 00:00:00 2001 From: yotamloe Date: Sun, 14 Aug 2022 17:49:05 +0300 Subject: [PATCH 09/25] Test workflow --- .github/workflows/release-artifacts.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 709b6a7..ab063cd 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -18,6 +18,8 @@ jobs: go-version: "1.17" - name: Install go tools run: make install-tools + - name: Install deps + run: sudo apt-get install build-essential - name: Install builder run: make install-builder working-directory: ./otelbuilder From 4d432e036c51d68ab075badad66dd95b4e3bd8bc Mon Sep 17 00:00:00 2001 From: yotamloe Date: Sun, 14 Aug 2022 17:58:58 +0300 Subject: [PATCH 10/25] Test workflow --- .github/workflows/release-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index ab063cd..d2c6a2d 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -19,7 +19,7 @@ jobs: - name: Install go tools run: make install-tools - name: Install deps - run: sudo apt-get install build-essential + run: sudo apt-get install build-essential gcc-multilib g++-multilib - name: Install builder run: make install-builder working-directory: ./otelbuilder From cac3d8c9669547772c1861cda09f831d7d02c75b Mon Sep 17 00:00:00 2001 From: yotamloe Date: Sun, 14 Aug 2022 18:10:41 +0300 Subject: [PATCH 11/25] Test workflow --- .github/workflows/release-artifacts.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index d2c6a2d..a336a58 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -8,7 +8,7 @@ jobs: matrix: os_arch: [ darwin_amd64, linux_amd64, linux_arm64, linux_arm ] name: publish artifacts - runs-on: ubuntu-latest + runs-on: macos-latest steps: - name: Check out the repo uses: actions/checkout@v2 @@ -18,17 +18,24 @@ jobs: go-version: "1.17" - name: Install go tools run: make install-tools - - name: Install deps - run: sudo apt-get install build-essential gcc-multilib g++-multilib - name: Install builder run: make install-builder working-directory: ./otelbuilder - name: build artifacts run: make otelcol-logzio-${{ matrix.os_arch }} working-directory: ./otelbuilder - - name: compress - run: tar -cvzf otelcol-logzio-${{ matrix.os_arch }}.tar.gz otelcol-logzio-${{ matrix.os_arch }} - working-directory: ./otelbuilder/cmd + - name: compress artifacts + uses: a7ul/tar-action@v1.1.0 + id: compress + with: + command: cvzf + cwd: ./otelbuilder/cmd + files: | + ./otelcol-logzio-${{ matrix.os_arch }} + outPath: otelcol-logzio-${{ matrix.os_arch }}.tar.gz +# - name: compress +# run: tar -cvzf otelcol-logzio-${{ matrix.os_arch }}.tar.gz otelcol-logzio-${{ matrix.os_arch }} +# working-directory: ./otelbuilder/cmd - name: upload artifacts to release uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') From 1692396e5d10e0658e2169cc9a9b70e80a6661f7 Mon Sep 17 00:00:00 2001 From: yotamloe Date: Sun, 14 Aug 2022 18:19:35 +0300 Subject: [PATCH 12/25] Test workflow --- .github/workflows/release-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index a336a58..e665cdc 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -28,7 +28,7 @@ jobs: uses: a7ul/tar-action@v1.1.0 id: compress with: - command: cvzf + command: c cwd: ./otelbuilder/cmd files: | ./otelcol-logzio-${{ matrix.os_arch }} From 801cf83f0201bc0bd9d7127cd264638244d9fbbf Mon Sep 17 00:00:00 2001 From: yotamloe Date: Sun, 14 Aug 2022 18:32:56 +0300 Subject: [PATCH 13/25] Test workflow --- .github/workflows/release-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index e665cdc..88acb49 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -32,7 +32,7 @@ jobs: cwd: ./otelbuilder/cmd files: | ./otelcol-logzio-${{ matrix.os_arch }} - outPath: otelcol-logzio-${{ matrix.os_arch }}.tar.gz + outPath: ./otelbuilder/cmd/otelcol-logzio-${{ matrix.os_arch }}.tar.gz # - name: compress # run: tar -cvzf otelcol-logzio-${{ matrix.os_arch }}.tar.gz otelcol-logzio-${{ matrix.os_arch }} # working-directory: ./otelbuilder/cmd From 39dabbdeb953872ac1d16b326b33b69a234796a8 Mon Sep 17 00:00:00 2001 From: yotamloe Date: Sun, 14 Aug 2022 18:45:58 +0300 Subject: [PATCH 14/25] Fix `Publish artifacts on a new release` workflow --- .github/workflows/release-artifacts-windows.yml | 15 +++++++++++++-- .github/workflows/release-artifacts.yml | 5 +---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-artifacts-windows.yml b/.github/workflows/release-artifacts-windows.yml index a694cd5..b173e2a 100644 --- a/.github/workflows/release-artifacts-windows.yml +++ b/.github/workflows/release-artifacts-windows.yml @@ -1,4 +1,4 @@ -name: publish artifacts on a new release +name: Publish artifacts on a new release windows on: release: types: [published] @@ -24,11 +24,22 @@ jobs: - name: build artifacts run: make otelcol-logzio-${{ matrix.os_arch }} working-directory: ./otelbuilder + - name: compress artifacts + uses: a7ul/tar-action@v1.1.0 + id: compress + with: + command: c + cwd: ./otelbuilder/cmd + files: | + ./otelcol-logzio-${{ matrix.os_arch }}.exe + outPath: ./otelbuilder/cmd/otelcol-logzio-${{ matrix.os_arch }}.tar.gz - name: upload artifacts to release uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') with: - files: ./otelbuilder/cmd/otelcol-logzio-${{ matrix.os_arch }}.exe + files: | + ./otelbuilder/cmd/otelcol-logzio-${{ matrix.os_arch }}.exe + ./otelbuilder/cmd/otelcol-logzio-${{ matrix.os_arch }}.tar.gz diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 88acb49..32de37a 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -1,4 +1,4 @@ -name: build atrifacts +name: Publish artifacts on a new release on: release: types: [published] @@ -33,9 +33,6 @@ jobs: files: | ./otelcol-logzio-${{ matrix.os_arch }} outPath: ./otelbuilder/cmd/otelcol-logzio-${{ matrix.os_arch }}.tar.gz -# - name: compress -# run: tar -cvzf otelcol-logzio-${{ matrix.os_arch }}.tar.gz otelcol-logzio-${{ matrix.os_arch }} -# working-directory: ./otelbuilder/cmd - name: upload artifacts to release uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') From 8f0538e3326387e4b29be2cd2ce1282336490e37 Mon Sep 17 00:00:00 2001 From: yotamloe Date: Tue, 16 Aug 2022 10:33:05 +0300 Subject: [PATCH 15/25] Add `darwin_arm64` os arch --- .github/workflows/release-artifacts.yml | 2 +- otelbuilder/Makefile | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 32de37a..4bc6956 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -6,7 +6,7 @@ jobs: publish_artifacts: strategy: matrix: - os_arch: [ darwin_amd64, linux_amd64, linux_arm64, linux_arm ] + os_arch: [ darwin_amd64, darwin_arm64, linux_amd64, linux_arm64, linux_arm ] name: publish artifacts runs-on: macos-latest steps: diff --git a/otelbuilder/Makefile b/otelbuilder/Makefile index e0c6bbe..0c90737 100644 --- a/otelbuilder/Makefile +++ b/otelbuilder/Makefile @@ -84,12 +84,16 @@ lint: install-builder generate-sources # build collector distro binaries for all supported os arch combinations .PHONY: otelcol-logzio-all-sys -otelcol-logzio-all-sys: otelcol-logzio-darwin_amd64 otelcol-logzio-linux_amd64 otelcol-logzio-windows_amd64 otelcol-logzio-linux_arm64 otelcol-logzio-linux_arm +otelcol-logzio-all-sys: otelcol-logzio-darwin_amd64 otelcol-logzio-linux_amd64 otelcol-logzio-windows_amd64 otelcol-logzio-linux_arm64 otelcol-logzio-linux_arm otelcol-logzio-darwin_arm64 .PHONY: otelcol-logzio-darwin_amd64 otelcol-logzio-darwin_amd64: CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 $(MAKE) build BINARY_NAME=$(BINARY_NAME)-darwin_amd64 +.PHONY: otelcol-logzio-darwin_arm64 +otelcol-logzio-darwin_arm64: + CGO_ENABLED=1 GOOS=darwin GOARCH=arm64 $(MAKE) build BINARY_NAME=$(BINARY_NAME)-darwin_arm64 + .PHONY: otelcol-logzio-linux_amd64 otelcol-logzio-linux_amd64: GOOS=linux GOARCH=amd64 $(MAKE) build BINARY_NAME=$(BINARY_NAME)-linux_amd64 From ddc37ef33538fd02c94aff1d56148e049cbe8d21 Mon Sep 17 00:00:00 2001 From: yotamloe Date: Tue, 16 Aug 2022 10:47:22 +0300 Subject: [PATCH 16/25] Add `windowseventlogreceiver` --- README.md | 77 +++++++++++++++++--------------- otelbuilder/otelcol-builder.yaml | 1 + 2 files changed, 41 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index 8f365f6..53ae158 100644 --- a/README.md +++ b/README.md @@ -83,40 +83,43 @@ For the default and some example configs, see the [otel-config](/otel-config/) d For general configuration help, see the [openTelemetry docs](https://opentelemetry.io/docs/collector/configuration/). #### Logz.io opentelemetry collector distro components -| Receiver | Processor | Exporter | Extensions | -|---------------------------------|-------------------------------|------------------------------------|------------------------| -| otlpreceiver | attributesprocessor | `logzioexporter` | ballastextension | -| awscontainerinsightreceiver | resourceprocessor | `jsonlogexporter` | zpagesextension | -| awsecscontainermetricsreceiver | batchprocessor | loggingexporter | bearertokenauthextension| -| awsxrayreceiver | memorylimiterprocessor | otlpexporter | healthcheckextension | -| carbonreceiver | probabilisticsamplerprocessor | fileexporter | oidcauthextension | -| collectdreceiver | metricstransformprocessor | otlphttpexporter | pprofextension | -| dockerstatsreceiver | spanprocessor | prometheusexporter | | -| dotnetdiagnosticsreceiver | filterprocessor | prometheusremotewriteexporter | | -| filelogreceiver | resourcedetectionprocessor | | | -| fluentforwardreceiver | groupbyattrsprocessor | | | -| googlecloudspannerreceiver | groupbytraceprocessor | | | -| hostmetricsreceiver | routingprocessor | | | -| jaegerreceiver | spanmetricsprocessor | | | -| jmxreceiver | tailsamplingprocessor | | | -| journaldreceiver | | | | -| k8seventsreceiver | | | | -| kafkametricsreceiver | | | | -| kafkareceiver | | | | -| opencensusreceiver | | | | -| podmanreceiver | | | | -| prometheusreceiver | | | | -| receivercreator | | | | -| redisreceiver | | | | -| sapmreceiver | | | | -| signalfxreceiver | | | | -| simpleprometheusreceiver | | | | -| splunkhecreceiver | | | | -| statsdreceiver | | | | -| syslogreceiver | | | | -| tcplogreceiver | | | | -| udplogreceiver | | | | -| wavefrontreceiver | | | | -| windowsperfcountersreceiver | | | | -| zipkinreceiver | | | | -| zookeeperreceiver | | | | +| Receiver | Processor | Exporter | Extensions | +|-------------------------------|-------------------------------|------------------------------------|------------------------| +| otlpreceiver | attributesprocessor | `logzioexporter` | ballastextension | +| awscontainerinsightreceiver | resourceprocessor | `jsonlogexporter` | zpagesextension | +| awsecscontainermetricsreceiver | batchprocessor | loggingexporter | bearertokenauthextension| +| awsxrayreceiver | memorylimiterprocessor | otlpexporter | healthcheckextension | +| carbonreceiver | probabilisticsamplerprocessor | fileexporter | oidcauthextension | +| collectdreceiver | metricstransformprocessor | otlphttpexporter | pprofextension | +| dockerstatsreceiver | spanprocessor | prometheusexporter | | +| dotnetdiagnosticsreceiver | filterprocessor | prometheusremotewriteexporter | | +| filelogreceiver | resourcedetectionprocessor | | | +| fluentforwardreceiver | groupbyattrsprocessor | | | +| googlecloudspannerreceiver | groupbytraceprocessor | | | +| hostmetricsreceiver | routingprocessor | | | +| jaegerreceiver | spanmetricsprocessor | | | +| jmxreceiver | tailsamplingprocessor | | | +| journaldreceiver | | | | +| k8seventsreceiver | | | | +| kafkametricsreceiver | | | | +| kafkareceiver | | | | +| opencensusreceiver | | | | +| podmanreceiver | | | | +| prometheusreceiver | | | | +| receivercreator | | | | +| redisreceiver | | | | +| sapmreceiver | | | | +| signalfxreceiver | | | | +| simpleprometheusreceiver | | | | +| splunkhecreceiver | | | | +| statsdreceiver | | | | +| syslogreceiver | | | | +| tcplogreceiver | | | | +| udplogreceiver | | | | +| wavefrontreceiver | | | | +| windowsperfcountersreceiver | | | | +| windowseventlogreceiver | | | | +| zipkinreceiver | | | | +| zookeeperreceiver | | | | + + diff --git a/otelbuilder/otelcol-builder.yaml b/otelbuilder/otelcol-builder.yaml index b432a6e..8c3180e 100644 --- a/otelbuilder/otelcol-builder.yaml +++ b/otelbuilder/otelcol-builder.yaml @@ -42,6 +42,7 @@ receivers: # Upstream receivers - import: go.opentelemetry.io/collector/receiver/otlpreceiver gomod: go.opentelemetry.io/collector v0.57.2 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.57.2" - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.57.2" - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.57.2" - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.57.2" From d27c7d16a188e168c7ac9804d20a980b257cbd4c Mon Sep 17 00:00:00 2001 From: yotamloe Date: Tue, 23 Aug 2022 11:14:32 +0300 Subject: [PATCH 17/25] Add CONTRIBUTING.md --- CONTRIBUTING.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..99dc0f9 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,15 @@ +## Adding new components +**Before making a contribution please open an issue describing the new addition and the need for it** +* Fork the repo +* Create a new branch for the new components +* Add your new component in `./logzio/` (exporter, receiver...) +* Add `Makefile` for your component, you can check out `logzioexporter` makefile for example +* Go to `./otelbuilder/otelcol-builder.yaml` and add the path to your component. Example: +```yaml +exporters: + # New exporter component + - gomod: "github.com/logzio/otel-collector-distro/logzio/exporter/logzioexporter v0.0.1" + path: ./../logzio/exporter/logzioexporter +``` +* For testing the build you can go to `./otelbuilder` and run `make otelcol-logzio-<>_<>` ( macOS example: `otelcol-logzio-darwin_amd64` ). This command will build the binary for your machine. Now you can run and test the usage. +* Push changes to your branch and open a PR \ No newline at end of file From ccb5fd7ec7f46898da971626a641410add18df13 Mon Sep 17 00:00:00 2001 From: yotamloe Date: Mon, 5 Sep 2022 17:13:14 +0300 Subject: [PATCH 18/25] Update logzio exporter to v0.59.0 --- logzio/exporter/logzioexporter/config_test.go | 7 +- logzio/exporter/logzioexporter/exporter.go | 16 +- .../exporter/logzioexporter/exporter_test.go | 69 +++---- logzio/exporter/logzioexporter/factory.go | 6 +- .../exporter/logzioexporter/factory_test.go | 3 +- logzio/exporter/logzioexporter/go.mod | 22 +- logzio/exporter/logzioexporter/go.sum | 191 +++++++++++++++--- .../exporter/logzioexporter/jsonlog_test.go | 10 +- logzio/exporter/logzioexporter/logger.go | 6 +- .../exporter/logzioexporter/logzioservice.go | 8 +- logzio/exporter/logzioexporter/logziospan.go | 10 +- .../logzioexporter/logziospan_test.go | 12 +- 12 files changed, 238 insertions(+), 122 deletions(-) diff --git a/logzio/exporter/logzioexporter/config_test.go b/logzio/exporter/logzioexporter/config_test.go index fba24a9..05fe77d 100644 --- a/logzio/exporter/logzioexporter/config_test.go +++ b/logzio/exporter/logzioexporter/config_test.go @@ -19,14 +19,13 @@ import ( "testing" "time" - "go.opentelemetry.io/collector/config/configcompression" - "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/exporter/exporterhelper" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/config/configcompression" + "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/service/servicetest" ) diff --git a/logzio/exporter/logzioexporter/exporter.go b/logzio/exporter/logzioexporter/exporter.go index 2ab644c..33f72d0 100644 --- a/logzio/exporter/logzioexporter/exporter.go +++ b/logzio/exporter/logzioexporter/exporter.go @@ -21,7 +21,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "net/http" "strconv" "time" @@ -29,15 +28,14 @@ import ( "github.com/hashicorp/go-hclog" "github.com/jaegertracing/jaeger/model" "github.com/jaegertracing/jaeger/pkg/cache" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer/consumererror" + "go.opentelemetry.io/collector/exporter/exporterhelper" "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/pdata/ptrace" "google.golang.org/genproto/googleapis/rpc/status" "google.golang.org/protobuf/proto" - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/exporter/exporterhelper" - "go.opentelemetry.io/collector/pdata/ptrace" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger" ) @@ -91,8 +89,9 @@ func newLogzioTracesExporter(config *Config, set component.ExporterCreateSetting } config.checkAndWarnDeprecatedOptions(exporter.logger) return exporterhelper.NewTracesExporter( - config, + context.TODO(), set, + config, exporter.pushTraceData, exporterhelper.WithStart(exporter.start), // disable since we rely on http.Client timeout logic. @@ -115,8 +114,9 @@ func newLogzioLogsExporter(config *Config, set component.ExporterCreateSettings) } config.checkAndWarnDeprecatedOptions(exporter.logger) return exporterhelper.NewLogsExporter( - config, + context.TODO(), set, + config, exporter.pushLogData, exporterhelper.WithStart(exporter.start), // disable since we rely on http.Client timeout logic. @@ -226,7 +226,7 @@ func (exporter *logzioExporter) export(ctx context.Context, url string, request defer func() { // Discard any remaining response body when we are done reading. - io.CopyN(ioutil.Discard, resp.Body, maxHTTPResponseReadBytes) // nolint:errcheck + io.CopyN(io.Discard, resp.Body, maxHTTPResponseReadBytes) // nolint:errcheck resp.Body.Close() }() exporter.logger.Debug(fmt.Sprintf("Response status code: %d", resp.StatusCode)) diff --git a/logzio/exporter/logzioexporter/exporter_test.go b/logzio/exporter/logzioexporter/exporter_test.go index 27af615..893934a 100644 --- a/logzio/exporter/logzioexporter/exporter_test.go +++ b/logzio/exporter/logzioexporter/exporter_test.go @@ -21,7 +21,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "net/http" "net/http/httptest" "strings" @@ -68,54 +67,48 @@ func initResource1(r pcommon.Resource) { func fillLogOne(log plog.LogRecord) { log.SetTimestamp(TestLogTimestamp) log.SetDroppedAttributesCount(1) - log.SetSeverityNumber(plog.SeverityNumberINFO) + log.SetSeverityNumber(plog.SeverityNumberInfo) log.SetSeverityText("Info") log.SetSpanID(pcommon.NewSpanID([8]byte{0x01, 0x02, 0x04, 0x08})) log.SetTraceID(pcommon.NewTraceID([16]byte{0x08, 0x04, 0x02, 0x01})) attrs := log.Attributes() - attrs.InsertString("app", "server") - attrs.InsertDouble("instance_num", 1) + attrs.UpsertString("app", "server") + attrs.UpsertDouble("instance_num", 1) // nested body map - attVal := pcommon.NewValueMap() - attNestedVal := pcommon.NewValueMap() - - attMap := attVal.MapVal() - attMap.InsertDouble("23", 45) - attMap.InsertString("foo", "bar") - attMap.InsertString("message", "hello there") - attNestedMap := attNestedVal.MapVal() - attNestedMap.InsertString("string", "v1") - attNestedMap.InsertDouble("number", 499) - attMap.Insert("nested", attNestedVal) - attVal.CopyTo(log.Body()) - + attMap := log.Body().SetEmptyMapVal() + attMap.UpsertDouble("23", 45) + attMap.UpsertString("foo", "bar") + attMap.UpsertString("message", "hello there") + attNestedMap := attMap.UpsertEmptyMap("nested") + attNestedMap.UpsertString("string", "v1") + attNestedMap.UpsertDouble("number", 499) } func fillLogTwo(log plog.LogRecord) { log.SetTimestamp(TestLogTimestamp) log.SetDroppedAttributesCount(1) - log.SetSeverityNumber(plog.SeverityNumberINFO) + log.SetSeverityNumber(plog.SeverityNumberInfo) log.SetSeverityText("Info") attrs := log.Attributes() - attrs.InsertString("customer", "acme") - attrs.InsertDouble("number", 64) - attrs.InsertBool("bool", true) - attrs.InsertString("env", "dev") + attrs.UpsertString("customer", "acme") + attrs.UpsertDouble("number", 64) + attrs.UpsertBool("bool", true) + attrs.UpsertString("env", "dev") log.Body().SetStringVal("something happened") } func fillLogNoTimestamp(log plog.LogRecord) { log.SetDroppedAttributesCount(1) - log.SetSeverityNumber(plog.SeverityNumberINFO) + log.SetSeverityNumber(plog.SeverityNumberInfo) log.SetSeverityText("Info") attrs := log.Attributes() - attrs.InsertString("customer", "acme") - attrs.InsertDouble("number", 64) - attrs.InsertBool("bool", true) - attrs.InsertString("env", "dev") + attrs.UpsertString("customer", "acme") + attrs.UpsertDouble("number", 64) + attrs.UpsertBool("bool", true) + attrs.UpsertString("env", "dev") log.Body().SetStringVal("something happened") } @@ -199,7 +192,7 @@ func newTestTracesWithAttributes() ptrace.Traces { s.SetTraceID(pcommon.NewTraceID([16]byte{byte(i), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1})) s.SetSpanID(pcommon.NewSpanID([8]byte{byte(i), 0, 0, 0, 0, 0, 0, 2})) for j := 0; j < 5; j++ { - s.Attributes().Insert(fmt.Sprintf("k%d", j), pcommon.NewValueString(fmt.Sprintf("v%d", j))) + s.Attributes().UpsertString(fmt.Sprintf("k%d", j), fmt.Sprintf("v%d", j)) } s.SetKind(ptrace.SpanKindServer) } @@ -319,7 +312,7 @@ func gUnzipData(data []byte) (resData []byte, err error) { func TestPushTraceData(tester *testing.T) { var recordedRequests []byte server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) { - recordedRequests, _ = ioutil.ReadAll(req.Body) + recordedRequests, _ = io.ReadAll(req.Body) rw.WriteHeader(http.StatusOK) })) cfg := Config{ @@ -338,22 +331,22 @@ func TestPushTraceData(tester *testing.T) { res.Attributes().UpsertString(conventions.AttributeHostName, testHost) err := testTracesExporter(td, tester, &cfg) require.NoError(tester, err) - var logzioSpan LogzioSpan + var newSpan logzioSpan decoded, _ := gUnzipData(recordedRequests) requests := strings.Split(string(decoded), "\n") - assert.NoError(tester, json.Unmarshal([]byte(requests[0]), &logzioSpan)) - assert.Equal(tester, testOperation, logzioSpan.OperationName) - assert.Equal(tester, testService, logzioSpan.Process.ServiceName) - var logzioService LogzioService - assert.NoError(tester, json.Unmarshal([]byte(requests[1]), &logzioService)) - assert.Equal(tester, testOperation, logzioService.OperationName) - assert.Equal(tester, testService, logzioService.ServiceName) + assert.NoError(tester, json.Unmarshal([]byte(requests[0]), &newSpan)) + assert.Equal(tester, testOperation, newSpan.OperationName) + assert.Equal(tester, testService, newSpan.Process.ServiceName) + var newService logzioService + assert.NoError(tester, json.Unmarshal([]byte(requests[1]), &newService)) + assert.Equal(tester, testOperation, newService.OperationName) + assert.Equal(tester, testService, newService.ServiceName) } func TestPushLogsData(tester *testing.T) { var recordedRequests []byte server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) { - recordedRequests, _ = ioutil.ReadAll(req.Body) + recordedRequests, _ = io.ReadAll(req.Body) rw.WriteHeader(http.StatusOK) })) cfg := Config{ diff --git a/logzio/exporter/logzioexporter/factory.go b/logzio/exporter/logzioexporter/factory.go index cd0effe..892b5f0 100644 --- a/logzio/exporter/logzioexporter/factory.go +++ b/logzio/exporter/logzioexporter/factory.go @@ -21,13 +21,11 @@ import ( "strings" "time" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configcompression" - "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/exporter/exporterhelper" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config" ) const ( diff --git a/logzio/exporter/logzioexporter/factory_test.go b/logzio/exporter/logzioexporter/factory_test.go index fab01d3..c42057c 100644 --- a/logzio/exporter/logzioexporter/factory_test.go +++ b/logzio/exporter/logzioexporter/factory_test.go @@ -19,12 +19,11 @@ import ( "path/filepath" "testing" - "go.opentelemetry.io/collector/config/confighttp" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/service/servicetest" ) diff --git a/logzio/exporter/logzioexporter/go.mod b/logzio/exporter/logzioexporter/go.mod index eeb5706..2568e2d 100644 --- a/logzio/exporter/logzioexporter/go.mod +++ b/logzio/exporter/logzioexporter/go.mod @@ -3,14 +3,14 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzio go 1.18 require ( - github.com/hashicorp/go-hclog v1.2.2 + github.com/hashicorp/go-hclog v1.3.0 github.com/jaegertracing/jaeger v1.37.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.57.2 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.59.0 github.com/stretchr/testify v1.8.0 - go.opentelemetry.io/collector v0.57.2 - go.opentelemetry.io/collector/pdata v0.57.2 - go.opentelemetry.io/collector/semconv v0.57.2 - go.uber.org/zap v1.21.0 + go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.0 + go.opentelemetry.io/collector/semconv v0.59.0 + go.uber.org/zap v1.23.0 google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd google.golang.org/protobuf v1.28.1 ) @@ -28,7 +28,7 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.15.9 // indirect - github.com/knadh/koanf v1.4.2 // indirect + github.com/knadh/koanf v1.4.3 // indirect github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect @@ -36,7 +36,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.57.2 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.59.0 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect @@ -47,12 +47,12 @@ require ( go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect - go.uber.org/atomic v1.9.0 // indirect + go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect + golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 // indirect golang.org/x/text v0.3.7 // indirect - google.golang.org/grpc v1.48.0 // indirect + google.golang.org/grpc v1.49.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/logzio/exporter/logzioexporter/go.sum b/logzio/exporter/logzioexporter/go.sum index d47aff0..d3a56c4 100644 --- a/logzio/exporter/logzioexporter/go.sum +++ b/logzio/exporter/logzioexporter/go.sum @@ -2,11 +2,18 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT 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/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/thrift v0.16.0 h1:qEy6UW60iVOlUy+b9ZR0d5WzUWYGOo4HfopoyBaNmoY= github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= @@ -17,8 +24,10 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72H github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= @@ -31,16 +40,21 @@ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XP github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= 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/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= 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.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= @@ -49,13 +63,22 @@ github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= 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= @@ -81,6 +104,7 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= 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/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -90,23 +114,33 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/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.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= +github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -github.com/hashicorp/go-hclog v1.2.2 h1:ihRI7YFwcZdiSD7SIenIhHfQH3OuDvWerAUBZbeQS3M= -github.com/hashicorp/go-hclog v1.2.2/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.3.0 h1:G0ACM8Z2WilWgPv3Vdzwm3V0BQu/kSmrkVtpe1fy9do= +github.com/hashicorp/go-hclog v1.3.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= @@ -114,38 +148,63 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= +github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoIospckxBxk6Q= github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= +github.com/hjson/hjson-go/v4 v4.0.0 h1:wlm6IYYqHjOdXH1gHev4VoXCaW20HdQAGCxdOEEg2cs= +github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= github.com/jaegertracing/jaeger v1.37.0 h1:/EY0n/IUFT/NozEM78bzW2Lm2dPoKuIF/9c9UcoMBxQ= github.com/jaegertracing/jaeger v1.37.0/go.mod h1:2tPPMcktsOFhmsiyxoYnUE0QAlP4UC6DEsC2jdllt5g= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= 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/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= 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.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= -github.com/knadh/koanf v1.4.2 h1:2itp+cdC6miId4pO4Jw7c/3eiYD26Z/Sz3ATJMwHxIs= -github.com/knadh/koanf v1.4.2/go.mod h1:4NCo0q4pmU398vF9vq2jStF9MWQZ8JEDcDMHlDCr4h0= +github.com/knadh/koanf v1.4.3 h1:rSJcSH5LSFhvzBRsAYfT3k7eLP0I4UxeZqjtAatk+wc= +github.com/knadh/koanf v1.4.3/go.mod h1:5FAkuykKXZvLqhAbP4peWgM5CTcZmn7L1d27k/a+kfg= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= 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/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= @@ -153,8 +212,8 @@ github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrk github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= @@ -163,40 +222,69 @@ github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx 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 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= 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/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.57.2 h1:4HeNNbZnqz15hj4oGm1O1x+yP+hPnvhz2UYqrApvPDk= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.57.2/go.mod h1:xPchY5YNOL9jr6phVkJEvkEakMYr8HMD4uGYEoKXIek= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.57.2 h1:6aMr+4kCgzJKBpWwZwPGzKfdn0ujXObJC9Rhkg+ak1s= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.57.2/go.mod h1:4rFuWKMbzM9H39RbDvPtJfAp/fxsHydhJhKns6skmK0= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.59.0 h1:lOTqHGCcUkWqQfVlH4rqy5aTtpPkeiQS/32gIgKLpHY= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.59.0/go.mod h1:kJwfosjjegfcMAtC/p6PeHy+x3vfiQYpdP48ctv3r8c= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.59.0 h1:+DOhvw+RKnc5QwP5h0y+W55hCvsTsccHVvF3vm1ZViI= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.59.0/go.mod h1:hWJ/9y+vs86TyeTPjW1V9xicDVKWrqx+3iXT2UWKGWw= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.6.2 h1:aIihoIOHCiLZHxyoNQ+ABL4NKhFTgKLBdMLyEAh98m0= github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= 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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= 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/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -211,60 +299,73 @@ github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6 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.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= +go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.57.2 h1:/J7twI5BlIK3I4GfDfLhqPgfgSjnhiDesXf24bmrXYM= -go.opentelemetry.io/collector v0.57.2/go.mod h1:9TwWyMRhbFNzaaGLtm/6poWNDJw+etvQMS6Fy+8/8Xs= -go.opentelemetry.io/collector/pdata v0.57.2 h1:w2w3NE7/3WzHloT1xV5caRmifV3qt95gc5iJhO/Bues= -go.opentelemetry.io/collector/pdata v0.57.2/go.mod h1:RU9I8lwBUxucwOsSYzHEcHi15M9QaX78hgQ2PRdSxV0= -go.opentelemetry.io/collector/semconv v0.57.2 h1:+lcI4yi8xUzoSNZgGTs0vytZcEAH95Tb33Ig+gooBV8= -go.opentelemetry.io/collector/semconv v0.57.2/go.mod h1:84YnUjmm+nhGu4YTDLnHCbxnL74ooWpismPG79tFD7w= +go.opentelemetry.io/collector v0.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= +go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= +go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= +go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= +go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A= -go.opentelemetry.io/otel/sdk v1.8.0 h1:xwu69/fNuwbSHWe/0PGS888RmjWY181OmcXDQKu7ZQk= +go.opentelemetry.io/otel/sdk v1.9.0 h1:LNXp1vrr83fNXTHgU8eO89mhzxb/bbWAsHG6fNf3qWo= go.opentelemetry.io/otel/trace v1.9.0 h1:oZaCNJUjWcg60VXWee8lJKlqhPbXAPB51URuR47pQYc= go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= -go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= +go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= -go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= -go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= +go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= 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-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/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.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= 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-20181114220301-adae6a3d119a/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-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/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-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= 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-20201110031124-69a78807bb2b/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-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 h1:NWy5+hlRbC7HK+PmcXVUmW1IMyFce7to56IUvhUFm7Y= golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= 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= @@ -273,33 +374,51 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ 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-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/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-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/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-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/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-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 h1:v1W7bwXHsnLLloWYTVEdvGvA7BHMeBYsPcF0GLDxIRs= +golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +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 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -308,10 +427,12 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm 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-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= 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.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= 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/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -323,6 +444,7 @@ google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRn 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-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd h1:e0TwkXOdbnH/1x5rc5MZ/VYyiZ4v+RdVfrGMqEwT68I= google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= @@ -334,9 +456,10 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w= -google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw= +google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= 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= @@ -352,15 +475,20 @@ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +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/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 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.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 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.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +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-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -368,3 +496,4 @@ 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= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/logzio/exporter/logzioexporter/jsonlog_test.go b/logzio/exporter/logzioexporter/jsonlog_test.go index c89e8ab..3d42b84 100644 --- a/logzio/exporter/logzioexporter/jsonlog_test.go +++ b/logzio/exporter/logzioexporter/jsonlog_test.go @@ -17,7 +17,7 @@ package logzioexporter import ( "context" "encoding/json" - "io/ioutil" + "io" "net/http" "net/http/httptest" "strings" @@ -47,13 +47,13 @@ func GenerateLogRecordWithMultiTypeValues() plog.LogRecord { func TestConvertLogRecordToJSON(t *testing.T) { logger := hclog.NewNullLogger() - type ConvertLogRecordToJSONTest struct { + type convertLogRecordToJSONTest struct { log plog.LogRecord resource pcommon.Resource expected map[string]interface{} } - var ConvertLogRecordToJSONTests = []ConvertLogRecordToJSONTest{ + var convertLogRecordToJSONTests = []convertLogRecordToJSONTest{ {GenerateLogRecordWithNestedBody(), pcommon.NewResource(), map[string]interface{}{ @@ -82,7 +82,7 @@ func TestConvertLogRecordToJSON(t *testing.T) { }, }, } - for _, test := range ConvertLogRecordToJSONTests { + for _, test := range convertLogRecordToJSONTests { output := convertLogRecordToJSON(test.log, test.resource, logger) require.Equal(t, output, test.expected) } @@ -91,7 +91,7 @@ func TestConvertLogRecordToJSON(t *testing.T) { func TestSetTimeStamp(t *testing.T) { var recordedRequests []byte server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) { - recordedRequests, _ = ioutil.ReadAll(req.Body) + recordedRequests, _ = io.ReadAll(req.Body) rw.WriteHeader(http.StatusOK) })) ld := GenerateLogsOneEmptyTimestamp() diff --git a/logzio/exporter/logzioexporter/logger.go b/logzio/exporter/logzioexporter/logger.go index 4b9892b..16fc5e3 100644 --- a/logzio/exporter/logzioexporter/logger.go +++ b/logzio/exporter/logzioexporter/logger.go @@ -17,11 +17,9 @@ package logzioexporter // import "github.com/logzio/otel-collector-distro/logzio import ( "fmt" "io" - "io/ioutil" "log" "github.com/hashicorp/go-hclog" - "go.uber.org/zap" "go.uber.org/zap/zapcore" ) @@ -109,11 +107,11 @@ func (l *hclog2ZapLogger) SetLevel(level hclog.Level) { // StandardLogger implementation. func (l *hclog2ZapLogger) StandardLogger(opts *hclog.StandardLoggerOptions) *log.Logger { // no need to implement that as go-plugin doesn't use this method. - return log.New(ioutil.Discard, "", 0) + return log.New(io.Discard, "", 0) } func argsToFields(args ...interface{}) []zapcore.Field { - fields := []zapcore.Field{} + var fields []zapcore.Field for i := 0; i < len(args); i += 2 { fields = append(fields, zap.String(args[i].(string), fmt.Sprintf("%v", args[i+1]))) } diff --git a/logzio/exporter/logzioexporter/logzioservice.go b/logzio/exporter/logzioexporter/logzioservice.go index b28aecf..9363519 100644 --- a/logzio/exporter/logzioexporter/logzioservice.go +++ b/logzio/exporter/logzioexporter/logzioservice.go @@ -24,15 +24,15 @@ import ( const serviceLogType = "jaegerService" // LogzioService type, for query purposes -type LogzioService struct { +type logzioService struct { OperationName string `json:"operationName"` ServiceName string `json:"serviceName"` Type string `json:"type"` } // newLogzioService creates a new logzio service from a span -func newLogzioService(span *model.Span) LogzioService { - service := LogzioService{ +func newLogzioService(span *model.Span) logzioService { + service := logzioService{ ServiceName: span.Process.ServiceName, OperationName: span.OperationName, Type: serviceLogType, @@ -41,7 +41,7 @@ func newLogzioService(span *model.Span) LogzioService { } // HashCode receives a logzio service and returns a hash representation of it's service name and operation name. -func (service *LogzioService) HashCode() (string, error) { +func (service *logzioService) HashCode() (string, error) { hash := fnv.New64a() _, err := hash.Write(append([]byte(service.ServiceName), []byte(service.OperationName)...)) return fmt.Sprintf("%x", hash.Sum64()), err diff --git a/logzio/exporter/logzioexporter/logziospan.go b/logzio/exporter/logzioexporter/logziospan.go index 4497ce3..3daee8e 100644 --- a/logzio/exporter/logzioexporter/logziospan.go +++ b/logzio/exporter/logzioexporter/logziospan.go @@ -27,8 +27,8 @@ const ( TagDotReplacementCharacter = "@" ) -// LogzioSpan is same as esSpan with a few different json field names and an addition on type field. -type LogzioSpan struct { +// logzioSpan is same as esSpan with a few different json field names and an addition on type field. +type logzioSpan struct { TraceID dbmodel.TraceID `json:"traceID"` OperationName string `json:"operationName,omitempty"` SpanID dbmodel.SpanID `json:"spanID"` @@ -58,7 +58,7 @@ func getTagsValues(tags []model.KeyValue) []string { func transformToLogzioSpanBytes(span *model.Span) ([]byte, error) { spanConverter := dbmodel.NewFromDomain(true, getTagsValues(span.Tags), TagDotReplacementCharacter) jsonSpan := spanConverter.FromDomainEmbedProcess(span) - logzioSpan := LogzioSpan{ + logzSpan := logzioSpan{ TraceID: jsonSpan.TraceID, OperationName: jsonSpan.OperationName, SpanID: jsonSpan.SpanID, @@ -74,11 +74,11 @@ func transformToLogzioSpanBytes(span *model.Span) ([]byte, error) { Logs: jsonSpan.Logs, Type: spanLogType, } - return json.Marshal(logzioSpan) + return json.Marshal(logzSpan) } // transformToDbModelSpan coverts logz.io span to ElasticSearch span -func (span *LogzioSpan) transformToDbModelSpan() *dbmodel.Span { +func (span *logzioSpan) transformToDbModelSpan() *dbmodel.Span { return &dbmodel.Span{ OperationName: span.OperationName, Process: span.Process, diff --git a/logzio/exporter/logzioexporter/logziospan_test.go b/logzio/exporter/logzioexporter/logziospan_test.go index a23203d..2564963 100644 --- a/logzio/exporter/logzioexporter/logziospan_test.go +++ b/logzio/exporter/logzioexporter/logziospan_test.go @@ -17,14 +17,14 @@ package logzioexporter import ( "encoding/json" "fmt" - "io/ioutil" + "os" "testing" "github.com/jaegertracing/jaeger/model" ) func TestTransformToLogzioSpanBytes(tester *testing.T) { - inStr, err := ioutil.ReadFile("./testdata/span.json") + inStr, err := os.ReadFile("./testdata/span.json") if err != nil { tester.Fatalf(fmt.Sprintf("error opening sample span file %s", err.Error())) } @@ -34,12 +34,12 @@ func TestTransformToLogzioSpanBytes(tester *testing.T) { if err != nil { fmt.Println("json.Unmarshal") } - logzioSpan, err := transformToLogzioSpanBytes(&span) + newSpan, err := transformToLogzioSpanBytes(&span) if err != nil { tester.Fatalf(err.Error()) } m := make(map[string]interface{}) - err = json.Unmarshal(logzioSpan, &m) + err = json.Unmarshal(newSpan, &m) if err != nil { tester.Fatalf(err.Error()) } @@ -49,7 +49,7 @@ func TestTransformToLogzioSpanBytes(tester *testing.T) { } func TestTransformToDbModelSpan(tester *testing.T) { - inStr, err := ioutil.ReadFile("./testdata/span.json") + inStr, err := os.ReadFile("./testdata/span.json") if err != nil { tester.Fatalf(fmt.Sprintf("error opening sample span file %s", err.Error())) } @@ -62,7 +62,7 @@ func TestTransformToDbModelSpan(tester *testing.T) { if err != nil { tester.Fatalf(err.Error()) } - var testLogzioSpan LogzioSpan + var testLogzioSpan logzioSpan err = json.Unmarshal(newSpan, &testLogzioSpan) if err != nil { tester.Fatalf(err.Error()) From 93b9a8a141bfff4a8ee46e5c423e231f7b769ff2 Mon Sep 17 00:00:00 2001 From: yotamloe Date: Mon, 5 Sep 2022 17:15:39 +0300 Subject: [PATCH 19/25] Update otel version to 0.59.0 --- README.md | 80 +++++++++---------- otelbuilder/Makefile | 4 +- otelbuilder/otelcol-builder.yaml | 131 +++++++++++++++---------------- 3 files changed, 107 insertions(+), 108 deletions(-) diff --git a/README.md b/README.md index 53ae158..92d7c51 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ The script below will perform the following steps: - `LOGZIO_TYPE` - ```shell -curl -L https://github.com/logzio/otel-collector-distro/releases/download/v0.0.1/otelcol-logzio-darwin_amd64 > otelcol-logzio-darwin_amd64 +curl -L https://github.com/logzio/otel-collector-distro/releases/download/v0.59.0/otelcol-logzio-darwin_amd64 > otelcol-logzio-darwin_amd64 chmod +x otelcol-logzio-darwin_amd64 curl -L https://raw.githubusercontent.com/logzio/otel-collector-distro/master/otel-config/macos.yml > macos.yml export LOGS_TOKEN=<> @@ -45,7 +45,7 @@ The script below will perform the following steps: - `LOGZIO_TYPE` - ```shell -curl -L https://github.com/logzio/otel-collector-distro/releases/download/v0.0.1/otelcol-logzio-linux_amd64 > otelcol-logzio-linux_amd64 +curl -L https://github.com/logzio/otel-collector-distro/releases/download/v0.59.0/otelcol-logzio-linux_amd64 > otelcol-logzio-linux_amd64 chmod +x otelcol-logzio-linux_amd64 curl -L https://raw.githubusercontent.com/logzio/otel-collector-distro/development/otel-config/linux.yml > linux.yml export LOGS_TOKEN=ThlyYdhCHUJPlBVYZSBncSMABogmyBzK @@ -83,43 +83,43 @@ For the default and some example configs, see the [otel-config](/otel-config/) d For general configuration help, see the [openTelemetry docs](https://opentelemetry.io/docs/collector/configuration/). #### Logz.io opentelemetry collector distro components -| Receiver | Processor | Exporter | Extensions | -|-------------------------------|-------------------------------|------------------------------------|------------------------| -| otlpreceiver | attributesprocessor | `logzioexporter` | ballastextension | -| awscontainerinsightreceiver | resourceprocessor | `jsonlogexporter` | zpagesextension | -| awsecscontainermetricsreceiver | batchprocessor | loggingexporter | bearertokenauthextension| -| awsxrayreceiver | memorylimiterprocessor | otlpexporter | healthcheckextension | -| carbonreceiver | probabilisticsamplerprocessor | fileexporter | oidcauthextension | -| collectdreceiver | metricstransformprocessor | otlphttpexporter | pprofextension | -| dockerstatsreceiver | spanprocessor | prometheusexporter | | -| dotnetdiagnosticsreceiver | filterprocessor | prometheusremotewriteexporter | | -| filelogreceiver | resourcedetectionprocessor | | | -| fluentforwardreceiver | groupbyattrsprocessor | | | -| googlecloudspannerreceiver | groupbytraceprocessor | | | -| hostmetricsreceiver | routingprocessor | | | -| jaegerreceiver | spanmetricsprocessor | | | -| jmxreceiver | tailsamplingprocessor | | | -| journaldreceiver | | | | -| k8seventsreceiver | | | | -| kafkametricsreceiver | | | | -| kafkareceiver | | | | -| opencensusreceiver | | | | -| podmanreceiver | | | | -| prometheusreceiver | | | | -| receivercreator | | | | -| redisreceiver | | | | -| sapmreceiver | | | | -| signalfxreceiver | | | | -| simpleprometheusreceiver | | | | -| splunkhecreceiver | | | | -| statsdreceiver | | | | -| syslogreceiver | | | | -| tcplogreceiver | | | | -| udplogreceiver | | | | -| wavefrontreceiver | | | | -| windowsperfcountersreceiver | | | | -| windowseventlogreceiver | | | | -| zipkinreceiver | | | | -| zookeeperreceiver | | | | +| Receiver | Processor | Exporter | Extensions | +|--------------------------------|-------------------------------|-------------------------------|--------------------------| +| otlpreceiver | attributesprocessor | `logzioexporter` | ballastextension | +| awscontainerinsightreceiver | resourceprocessor | `jsonlogexporter` | zpagesextension | +| awsecscontainermetricsreceiver | batchprocessor | loggingexporter | bearertokenauthextension | +| awsxrayreceiver | memorylimiterprocessor | otlpexporter | healthcheckextension | +| carbonreceiver | probabilisticsamplerprocessor | fileexporter | oidcauthextension | +| collectdreceiver | metricstransformprocessor | otlphttpexporter | pprofextension | +| dockerstatsreceiver | spanprocessor | prometheusexporter | | +| dotnetdiagnosticsreceiver | filterprocessor | prometheusremotewriteexporter | | +| filelogreceiver | resourcedetectionprocessor | | | +| fluentforwardreceiver | groupbyattrsprocessor | | | +| googlecloudspannerreceiver | groupbytraceprocessor | | | +| hostmetricsreceiver | routingprocessor | | | +| jaegerreceiver | spanmetricsprocessor | | | +| jmxreceiver | tailsamplingprocessor | | | +| journaldreceiver | | | | +| k8seventsreceiver | | | | +| kafkametricsreceiver | | | | +| kafkareceiver | | | | +| opencensusreceiver | | | | +| podmanreceiver | | | | +| prometheusreceiver | | | | +| receivercreator | | | | +| redisreceiver | | | | +| sapmreceiver | | | | +| signalfxreceiver | | | | +| simpleprometheusreceiver | | | | +| splunkhecreceiver | | | | +| statsdreceiver | | | | +| syslogreceiver | | | | +| tcplogreceiver | | | | +| udplogreceiver | | | | +| wavefrontreceiver | | | | +| windowsperfcountersreceiver | | | | +| windowseventlogreceiver | | | | +| zipkinreceiver | | | | +| zookeeperreceiver | | | | diff --git a/otelbuilder/Makefile b/otelbuilder/Makefile index 0c90737..829699d 100644 --- a/otelbuilder/Makefile +++ b/otelbuilder/Makefile @@ -1,8 +1,8 @@ BINARY_NAME ?= otelcol-logzio -BUILDER_VERSION ?= 0.57.2 +BUILDER_VERSION ?= 0.59.0 BUILDER_REPO ?= github.com/open-telemetry/opentelemetry-collector BUILDER_BIN_NAME ?= opentelemetry-collector-builder -VERSION ?= 0.57.2 +VERSION ?= 0.59.0 GO ?= go OS ?= $(shell uname -s | tr A-Z a-z) diff --git a/otelbuilder/otelcol-builder.yaml b/otelbuilder/otelcol-builder.yaml index 8c3180e..c70ee76 100644 --- a/otelbuilder/otelcol-builder.yaml +++ b/otelbuilder/otelcol-builder.yaml @@ -2,95 +2,94 @@ dist: module: github.com/logzio/otel-collector-distro # the module name for the new distribution, following Go mod conventions. Optional, but recommended. name: otelcol-logzio description: "Logzio OpenTelemetry Collector distribution" - otelcol_version: "0.57.2" # the OpenTelemetry Collector version to use as base for the distribution. Optional. + otelcol_version: "0.59.0" # the OpenTelemetry Collector version to use as base for the distribution. Optional. output_path: ./cmd - version: "0.57.2" + version: "0.59.0" exporters: # Maintained exporters - gomod: "github.com/logzio/otel-collector-distro/logzio/exporter/logzioexporter v0.0.1" path: ./../logzio/exporter/logzioexporter # Upstream exporters - import: go.opentelemetry.io/collector/exporter/loggingexporter - gomod: go.opentelemetry.io/collector v0.57.2 + gomod: go.opentelemetry.io/collector v0.59.0 - import: go.opentelemetry.io/collector/exporter/otlpexporter - gomod: go.opentelemetry.io/collector v0.57.2 + gomod: go.opentelemetry.io/collector v0.59.0 - import: go.opentelemetry.io/collector/exporter/otlphttpexporter - gomod: go.opentelemetry.io/collector v0.57.2 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.57.2" + gomod: go.opentelemetry.io/collector v0.59.0 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.59.0" processors: # Upstream processors - import: go.opentelemetry.io/collector/processor/batchprocessor - gomod: go.opentelemetry.io/collector v0.57.2 + gomod: go.opentelemetry.io/collector v0.59.0 - import: go.opentelemetry.io/collector/processor/memorylimiterprocessor - gomod: go.opentelemetry.io/collector v0.57.2 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.57.2" + gomod: go.opentelemetry.io/collector v0.59.0 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.59.0" receivers: # Upstream receivers - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.57.2 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.57.2" + gomod: go.opentelemetry.io/collector v0.59.0 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.59.0" extensions: # Upstream extensions - import: go.opentelemetry.io/collector/extension/ballastextension - gomod: go.opentelemetry.io/collector v0.57.2 + gomod: go.opentelemetry.io/collector v0.59.0 - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.57.2 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.57.2" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.57.2" + gomod: go.opentelemetry.io/collector v0.59.0 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.59.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.59.0" replaces: # Google renamed their org from `googleapis` to `google`, and for `gnostic` this happened in v0.5.6 # However, kubernetes/client-go still uses the old name for v0.5.5, and this causes go mod to complain # Replace this here instead of modifying indirect dependencies in packages, as it's more robust - github.com/googleapis/gnostic => github.com/google/gnostic v0.5.5 - - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/newly12/opentelemetry-collector-contrib/receiver/prometheusreceiver prom_receiver_mem \ No newline at end of file From d1ebc34d231061f805be27bc22fe3ed590794b81 Mon Sep 17 00:00:00 2001 From: Yotam loewenbach Date: Sun, 2 Oct 2022 12:43:46 +0300 Subject: [PATCH 20/25] Update otel version to 0.61.0 --- otelbuilder/Makefile | 4 +- otelbuilder/otelcol-builder.yaml | 130 +++++++++++++++---------------- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/otelbuilder/Makefile b/otelbuilder/Makefile index 829699d..d02d948 100644 --- a/otelbuilder/Makefile +++ b/otelbuilder/Makefile @@ -1,8 +1,8 @@ BINARY_NAME ?= otelcol-logzio -BUILDER_VERSION ?= 0.59.0 +BUILDER_VERSION ?= 0.61.0 BUILDER_REPO ?= github.com/open-telemetry/opentelemetry-collector BUILDER_BIN_NAME ?= opentelemetry-collector-builder -VERSION ?= 0.59.0 +VERSION ?= 0.61.0 GO ?= go OS ?= $(shell uname -s | tr A-Z a-z) diff --git a/otelbuilder/otelcol-builder.yaml b/otelbuilder/otelcol-builder.yaml index c70ee76..0785c40 100644 --- a/otelbuilder/otelcol-builder.yaml +++ b/otelbuilder/otelcol-builder.yaml @@ -2,91 +2,91 @@ dist: module: github.com/logzio/otel-collector-distro # the module name for the new distribution, following Go mod conventions. Optional, but recommended. name: otelcol-logzio description: "Logzio OpenTelemetry Collector distribution" - otelcol_version: "0.59.0" # the OpenTelemetry Collector version to use as base for the distribution. Optional. + otelcol_version: "0.61.0" # the OpenTelemetry Collector version to use as base for the distribution. Optional. output_path: ./cmd - version: "0.59.0" + version: "0.61.0" exporters: # Maintained exporters - gomod: "github.com/logzio/otel-collector-distro/logzio/exporter/logzioexporter v0.0.1" path: ./../logzio/exporter/logzioexporter # Upstream exporters - import: go.opentelemetry.io/collector/exporter/loggingexporter - gomod: go.opentelemetry.io/collector v0.59.0 + gomod: go.opentelemetry.io/collector v0.61.0 - import: go.opentelemetry.io/collector/exporter/otlpexporter - gomod: go.opentelemetry.io/collector v0.59.0 + gomod: go.opentelemetry.io/collector v0.61.0 - import: go.opentelemetry.io/collector/exporter/otlphttpexporter - gomod: go.opentelemetry.io/collector v0.59.0 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.59.0" + gomod: go.opentelemetry.io/collector v0.61.0 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.61.0" processors: # Upstream processors - import: go.opentelemetry.io/collector/processor/batchprocessor - gomod: go.opentelemetry.io/collector v0.59.0 + gomod: go.opentelemetry.io/collector v0.61.0 - import: go.opentelemetry.io/collector/processor/memorylimiterprocessor - gomod: go.opentelemetry.io/collector v0.59.0 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.59.0" + gomod: go.opentelemetry.io/collector v0.61.0 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.61.0" receivers: # Upstream receivers - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.59.0 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.59.0" + gomod: go.opentelemetry.io/collector v0.61.0 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.61.0" extensions: # Upstream extensions - import: go.opentelemetry.io/collector/extension/ballastextension - gomod: go.opentelemetry.io/collector v0.59.0 + gomod: go.opentelemetry.io/collector v0.61.0 - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.59.0 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.59.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.59.0" + gomod: go.opentelemetry.io/collector v0.61.0 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.61.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.61.0" replaces: # Google renamed their org from `googleapis` to `google`, and for `gnostic` this happened in v0.5.6 From e79487f252962a7b4b71bfee2fbb1cf8deb07e78 Mon Sep 17 00:00:00 2001 From: Yotam loewenbach Date: Sun, 2 Oct 2022 13:10:36 +0300 Subject: [PATCH 21/25] Update go version 1.7 -> 1.18 --- .github/workflows/build-push-docker-multi-platform.yml | 2 +- .github/workflows/format.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/release-artifacts-windows.yml | 2 +- .github/workflows/release-artifacts.yml | 2 +- .github/workflows/test-go.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-push-docker-multi-platform.yml b/.github/workflows/build-push-docker-multi-platform.yml index ea122ca..cf52d2f 100644 --- a/.github/workflows/build-push-docker-multi-platform.yml +++ b/.github/workflows/build-push-docker-multi-platform.yml @@ -12,7 +12,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: "1.17" + go-version: "1.18" - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@v1 diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 00320f6..924ddf5 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: "1.17" + go-version: "1.18" - name: go fmt run: make format-components diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ccce918..332a5e9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: "1.17" + go-version: "1.18" - name: lint run: make lint-components diff --git a/.github/workflows/release-artifacts-windows.yml b/.github/workflows/release-artifacts-windows.yml index b173e2a..faffc52 100644 --- a/.github/workflows/release-artifacts-windows.yml +++ b/.github/workflows/release-artifacts-windows.yml @@ -15,7 +15,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: "1.17" + go-version: "1.18" - name: Install go tools run: make install-tools - name: Install builder diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 4bc6956..e5fe19e 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -15,7 +15,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: "1.17" + go-version: "1.18" - name: Install go tools run: make install-tools - name: Install builder diff --git a/.github/workflows/test-go.yml b/.github/workflows/test-go.yml index 73b5d8f..3b6b895 100644 --- a/.github/workflows/test-go.yml +++ b/.github/workflows/test-go.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: "1.17" + go-version: "1.18" # Load caches based on OS - name: Linux Cache Go Modules if: matrix.os == 'ubuntu-latest' From b6d794f86e0b7b4c26b78aedd382949c3e395abb Mon Sep 17 00:00:00 2001 From: Yotam loewenbach Date: Sun, 2 Oct 2022 13:59:00 +0300 Subject: [PATCH 22/25] Update dockerfile base go image version 1.7 -> 1.18 --- Dockerfile | 2 +- Dockerfile.arm | 2 +- Dockerfile.dev | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 14e6a71..9432057 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17.11-alpine as builder +FROM golang:1.18.6-alpine as builder ADD . /src WORKDIR /src/otelbuilder/ ENV CGO_ENABLED=0 diff --git a/Dockerfile.arm b/Dockerfile.arm index 4849558..26f498e 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -1,4 +1,4 @@ -FROM golang:1.17.11-alpine as builder +FROM golang:1.18.6-alpine as builder ADD . /src WORKDIR /src/otelbuilder/ ENV CGO_ENABLED=0 diff --git a/Dockerfile.dev b/Dockerfile.dev index 14e6a71..9432057 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM golang:1.17.11-alpine as builder +FROM golang:1.18.6-alpine as builder ADD . /src WORKDIR /src/otelbuilder/ ENV CGO_ENABLED=0 From 213d8562d5d756c090066d10f518c938c53f704d Mon Sep 17 00:00:00 2001 From: Yotam loewenbach Date: Tue, 6 Dec 2022 10:45:18 +0200 Subject: [PATCH 23/25] Update otel `0.61.0` -> `0.66.0` --- otelbuilder/Makefile | 4 +- otelbuilder/otelcol-builder.yaml | 130 +++++++++++++++---------------- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/otelbuilder/Makefile b/otelbuilder/Makefile index d02d948..7450994 100644 --- a/otelbuilder/Makefile +++ b/otelbuilder/Makefile @@ -1,8 +1,8 @@ BINARY_NAME ?= otelcol-logzio -BUILDER_VERSION ?= 0.61.0 +BUILDER_VERSION ?= 0.66.0 BUILDER_REPO ?= github.com/open-telemetry/opentelemetry-collector BUILDER_BIN_NAME ?= opentelemetry-collector-builder -VERSION ?= 0.61.0 +VERSION ?= 0.66.0 GO ?= go OS ?= $(shell uname -s | tr A-Z a-z) diff --git a/otelbuilder/otelcol-builder.yaml b/otelbuilder/otelcol-builder.yaml index 0785c40..28feda1 100644 --- a/otelbuilder/otelcol-builder.yaml +++ b/otelbuilder/otelcol-builder.yaml @@ -2,91 +2,91 @@ dist: module: github.com/logzio/otel-collector-distro # the module name for the new distribution, following Go mod conventions. Optional, but recommended. name: otelcol-logzio description: "Logzio OpenTelemetry Collector distribution" - otelcol_version: "0.61.0" # the OpenTelemetry Collector version to use as base for the distribution. Optional. + otelcol_version: "0.66.0" # the OpenTelemetry Collector version to use as base for the distribution. Optional. output_path: ./cmd - version: "0.61.0" + version: "0.66.0" exporters: # Maintained exporters - gomod: "github.com/logzio/otel-collector-distro/logzio/exporter/logzioexporter v0.0.1" path: ./../logzio/exporter/logzioexporter # Upstream exporters - import: go.opentelemetry.io/collector/exporter/loggingexporter - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.66.0 - import: go.opentelemetry.io/collector/exporter/otlpexporter - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.66.0 - import: go.opentelemetry.io/collector/exporter/otlphttpexporter - gomod: go.opentelemetry.io/collector v0.61.0 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.61.0" + gomod: go.opentelemetry.io/collector v0.66.0 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.66.0" processors: # Upstream processors - import: go.opentelemetry.io/collector/processor/batchprocessor - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.66.0 - import: go.opentelemetry.io/collector/processor/memorylimiterprocessor - gomod: go.opentelemetry.io/collector v0.61.0 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.61.0" + gomod: go.opentelemetry.io/collector v0.66.0 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.66.0" receivers: # Upstream receivers - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.61.0 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.61.0" + gomod: go.opentelemetry.io/collector v0.66.0 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dotnetdiagnosticsreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.66.0" extensions: # Upstream extensions - import: go.opentelemetry.io/collector/extension/ballastextension - gomod: go.opentelemetry.io/collector v0.61.0 + gomod: go.opentelemetry.io/collector v0.66.0 - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.61.0 - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.61.0" - - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.61.0" + gomod: go.opentelemetry.io/collector v0.66.0 + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.66.0" replaces: # Google renamed their org from `googleapis` to `google`, and for `gnostic` this happened in v0.5.6 From 30f8c4eced7edc38cbc98e067d234457deab7d13 Mon Sep 17 00:00:00 2001 From: Yotam loewenbach Date: Tue, 6 Dec 2022 10:53:13 +0200 Subject: [PATCH 24/25] Use 0.66.0 version of logzio exporter --- otelbuilder/otelcol-builder.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/otelbuilder/otelcol-builder.yaml b/otelbuilder/otelcol-builder.yaml index 28feda1..15feb20 100644 --- a/otelbuilder/otelcol-builder.yaml +++ b/otelbuilder/otelcol-builder.yaml @@ -6,9 +6,6 @@ dist: output_path: ./cmd version: "0.66.0" exporters: - # Maintained exporters - - gomod: "github.com/logzio/otel-collector-distro/logzio/exporter/logzioexporter v0.0.1" - path: ./../logzio/exporter/logzioexporter # Upstream exporters - import: go.opentelemetry.io/collector/exporter/loggingexporter gomod: go.opentelemetry.io/collector v0.66.0 @@ -18,6 +15,7 @@ exporters: gomod: go.opentelemetry.io/collector v0.66.0 - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.66.0" - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.66.0" + - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.66.0" - gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.66.0" processors: # Upstream processors From 4b6401a861baba93d3a83b1fc78df89ffd26274c Mon Sep 17 00:00:00 2001 From: Yotam loewenbach Date: Tue, 6 Dec 2022 11:09:30 +0200 Subject: [PATCH 25/25] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7eb5bcf..0ec1b12 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The script below will perform the following steps: - Configure the related environment variables and run the binary ```shell -curl -L https://github.com/logzio/otel-collector-distro/releases/download/v0.59.0/otelcol-logzio-darwin_amd64 > otelcol-logzio-darwin_amd64 +curl -L https://github.com/logzio/otel-collector-distro/releases/download/v0.66.0/otelcol-logzio-darwin_amd64 > otelcol-logzio-darwin_amd64 chmod +x otelcol-logzio-darwin_amd64 curl -L https://raw.githubusercontent.com/logzio/otel-collector-distro/master/otel-config/macos.yml > macos.yml export LOGS_TOKEN=<> @@ -36,7 +36,7 @@ The script below will perform the following steps: ```shell -curl -L https://github.com/logzio/otel-collector-distro/releases/download/v0.59.0/otelcol-logzio-linux_amd64 > otelcol-logzio-linux_amd64 +curl -L https://github.com/logzio/otel-collector-distro/releases/download/v0.66.0/otelcol-logzio-linux_amd64 > otelcol-logzio-linux_amd64 chmod +x otelcol-logzio-linux_amd64 curl -L https://raw.githubusercontent.com/logzio/otel-collector-distro/development/otel-config/linux.yml > linux.yml export LOGS_TOKEN=<>