From be6eac8b54ff8df80342da10a2578b5e73d5b1f7 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Mon, 7 Aug 2023 01:54:21 -0700 Subject: [PATCH 001/292] [chore] [pkg/translator/opencensus] Remove deprecation mark (#24973) The exported functions now only used by opencensus receiver and exporter. It's still makes sense to keep it in the pkg/translator for consistency with other formats, but deprecation mark isn't needed anymore. --- pkg/translator/opencensus/metrics_to_oc.go | 5 ++--- pkg/translator/opencensus/oc_to_metrics.go | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/translator/opencensus/metrics_to_oc.go b/pkg/translator/opencensus/metrics_to_oc.go index 05c097cf3cd9..d8e0d65e46eb 100644 --- a/pkg/translator/opencensus/metrics_to_oc.go +++ b/pkg/translator/opencensus/metrics_to_oc.go @@ -24,9 +24,8 @@ type labelKeysAndType struct { allNumberDataPointValueInt bool } -// ResourceMetricsToOC may be used only by OpenCensus receiver and exporter implementations. -// Deprecated: Use pmetric.Metrics. -// TODO: move this function to OpenCensus package. +// ResourceMetricsToOC converts pmetric.ResourceMetrics to OC data format, +// may be used only by OpenCensus receiver and exporter implementations. func ResourceMetricsToOC(rm pmetric.ResourceMetrics) (*occommon.Node, *ocresource.Resource, []*ocmetrics.Metric) { node, resource := internalResourceToOC(rm.Resource()) ilms := rm.ScopeMetrics() diff --git a/pkg/translator/opencensus/oc_to_metrics.go b/pkg/translator/opencensus/oc_to_metrics.go index 447063c69de0..4af329f24dcd 100644 --- a/pkg/translator/opencensus/oc_to_metrics.go +++ b/pkg/translator/opencensus/oc_to_metrics.go @@ -11,9 +11,8 @@ import ( "go.opentelemetry.io/collector/pdata/pmetric" ) -// OCToMetrics converts OC data format to data.MetricData. -// Deprecated: use pmetric.Metrics instead. OCToMetrics may be used only by OpenCensus -// receiver and exporter implementations. +// OCToMetrics converts OC data format to pmetric.Metrics, +// may be used only by OpenCensus receiver and exporter implementations. func OCToMetrics(node *occommon.Node, resource *ocresource.Resource, metrics []*ocmetrics.Metric) pmetric.Metrics { dest := pmetric.NewMetrics() if node == nil && resource == nil && len(metrics) == 0 { From f60c806b6df9f8ac1fdb5d881d920bf5c956afba Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Mon, 7 Aug 2023 01:55:04 -0700 Subject: [PATCH 002/292] [chore] use context when making a http request (#24928) No context object is available in dimclient, so passing context.Background() for now. --- exporter/signalfxexporter/internal/dimensions/dimclient.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/exporter/signalfxexporter/internal/dimensions/dimclient.go b/exporter/signalfxexporter/internal/dimensions/dimclient.go index 0be6338809eb..8010013b29a0 100644 --- a/exporter/signalfxexporter/internal/dimensions/dimclient.go +++ b/exporter/signalfxexporter/internal/dimensions/dimclient.go @@ -317,7 +317,8 @@ func (dc *DimensionClient) makePatchRequest(dim *DimensionUpdate) (*http.Request return nil, err } - req, err := http.NewRequest( + req, err := http.NewRequestWithContext( + context.Background(), "PATCH", strings.TrimRight(url.String(), "/")+"/_/sfxagent", bytes.NewReader(json)) From 99aa1534ec165cc143a9358b796094b835121a5b Mon Sep 17 00:00:00 2001 From: gord02 <53834349+gord02@users.noreply.github.com> Date: Mon, 7 Aug 2023 05:25:28 -0400 Subject: [PATCH 003/292] Proposed Internal Datadog Module Component (#24650) Component(s): processor/datadog The Datadog processor is a component the needs to be deprecated in favor of the Datadog connector. The migration from one component to the other will take effect after two minor releases. Therefore, during the deprecation process, code that is used by the Datadog processor and connector can be shared instead of duplicated. [Link to relevant issue](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/19740) --------- Co-authored-by: Yang Song --- .github/CODEOWNERS | 1 + .github/ISSUE_TEMPLATE/bug_report.yaml | 1 + .github/ISSUE_TEMPLATE/feature_request.yaml | 1 + .github/ISSUE_TEMPLATE/other.yaml | 1 + .github/dependabot.yml | 10 +- cmd/configschema/go.mod | 3 + cmd/otelcontribcol/builder-config.yaml | 1 + cmd/otelcontribcol/go.mod | 3 + go.mod | 3 + internal/datadog/Makefile | 1 + .../datadog}/agent.go | 30 +- .../datadog}/agent_test.go | 6 +- internal/datadog/go.mod | 72 ++++ internal/datadog/go.sum | 317 ++++++++++++++++++ internal/datadog/metadata.yaml | 3 + processor/datadogprocessor/go.mod | 9 +- processor/datadogprocessor/go.sum | 14 +- processor/datadogprocessor/processor.go | 6 +- processor/datadogprocessor/processor_test.go | 4 +- versions.yaml | 1 + 20 files changed, 451 insertions(+), 36 deletions(-) create mode 100644 internal/datadog/Makefile rename {processor/datadogprocessor => internal/datadog}/agent.go (87%) rename {processor/datadogprocessor => internal/datadog}/agent_test.go (92%) create mode 100644 internal/datadog/go.mod create mode 100644 internal/datadog/go.sum create mode 100644 internal/datadog/metadata.yaml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 8f395607e0ce..9f06a49200eb 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -112,6 +112,7 @@ extension/storage/filestorage/ @open-telemetry/collect internal/aws/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia internal/coreinternal/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers +internal/datadog/ @open-telemetry/collector-contrib-approvers @mx-psi @gbbr @dineshg13 internal/docker/ @open-telemetry/collector-contrib-approvers @rmfitzpatrick @jamesmoessis internal/filter/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers internal/k8sconfig/ @open-telemetry/collector-contrib-approvers @dmitryax diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 7fd7ae48d6b0..3d7403570edd 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -103,6 +103,7 @@ body: - extension/storage/filestorage - internal/aws - internal/core + - internal/datadog - internal/docker - internal/filter - internal/k8sconfig diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index b507e57f92bf..025975e05cdb 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -97,6 +97,7 @@ body: - extension/storage/filestorage - internal/aws - internal/core + - internal/datadog - internal/docker - internal/filter - internal/k8sconfig diff --git a/.github/ISSUE_TEMPLATE/other.yaml b/.github/ISSUE_TEMPLATE/other.yaml index 661abfedbefe..8bc113297fed 100644 --- a/.github/ISSUE_TEMPLATE/other.yaml +++ b/.github/ISSUE_TEMPLATE/other.yaml @@ -97,6 +97,7 @@ body: - extension/storage/filestorage - internal/aws - internal/core + - internal/datadog - internal/docker - internal/filter - internal/k8sconfig diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 634cb25bfa13..d586d5684724 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -472,6 +472,11 @@ updates: schedule: interval: "weekly" day: "wednesday" + - package-ecosystem: "gomod" + directory: "/internal/datadog" + schedule: + interval: "weekly" + day: "wednesday" - package-ecosystem: "gomod" directory: "/internal/docker" schedule: @@ -1097,8 +1102,3 @@ updates: schedule: interval: "weekly" day: "wednesday" - - package-ecosystem: "gomod" - directory: "/receiver/sqlqueryreceiver" - schedule: - interval: "weekly" - day: "wednesday" diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 1feadb3cb32d..c49c7c8c3e3b 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -509,6 +509,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.82.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.82.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.82.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.82.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.82.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.82.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.82.0 // indirect @@ -1119,4 +1120,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/obse replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest => ../../internal/k8stest +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../internal/datadog + replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling => ../../extension/jaegerremotesampling diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index 651bfaee94ad..88da6dc023af 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -241,6 +241,7 @@ replaces: - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/cassandraexporter => ../../exporter/cassandraexporter - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver => ../../receiver/udplogreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => ../../internal/splunk + - github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../internal/datadog - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver => ../../receiver/podmanreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver => ../../receiver/flinkmetricsreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver => ../../receiver/awsecscontainermetricsreceiver diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 81c8514f1fe4..23836f5f8aa6 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -518,6 +518,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.82.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.82.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.82.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.82.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.82.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.82.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.82.0 // indirect @@ -782,6 +783,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplo replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => ../../internal/splunk +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../internal/datadog + replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/podmanreceiver => ../../receiver/podmanreceiver replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver => ../../receiver/flinkmetricsreceiver diff --git a/go.mod b/go.mod index 1c8744807544..1480ec095fa6 100644 --- a/go.mod +++ b/go.mod @@ -499,6 +499,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.82.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.82.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.82.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.82.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.82.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.82.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.82.0 // indirect @@ -1093,6 +1094,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zooke replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver => ./extension/observer/dockerobserver +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ./internal/datadog + replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling => ./extension/jaegerremotesampling // see https://github.com/google/gnostic/issues/262 diff --git a/internal/datadog/Makefile b/internal/datadog/Makefile new file mode 100644 index 000000000000..ded7a36092dc --- /dev/null +++ b/internal/datadog/Makefile @@ -0,0 +1 @@ +include ../../Makefile.Common diff --git a/processor/datadogprocessor/agent.go b/internal/datadog/agent.go similarity index 87% rename from processor/datadogprocessor/agent.go rename to internal/datadog/agent.go index 8d7ce6354026..9373646fca7d 100644 --- a/processor/datadogprocessor/agent.go +++ b/internal/datadog/agent.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package datadogprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/datadogprocessor" +package datadog // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog" import ( "context" @@ -24,8 +24,8 @@ import ( // computed for the resource spans. const keyStatsComputed = "_dd.stats_computed" -// traceagent specifies a minimal trace agent instance that is able to process traces and output stats. -type traceagent struct { +// TraceAgent specifies a minimal trace agent instance that is able to process traces and output stats. +type TraceAgent struct { *agent.Agent // pchan specifies the channel that will be used to output Datadog Trace Agent API Payloads @@ -41,12 +41,12 @@ type traceagent struct { // newAgent creates a new unstarted traceagent using the given context. Call Start to start the traceagent. // The out channel will receive outoing stats payloads resulting from spans ingested using the Ingest method. -func newAgent(ctx context.Context, out chan pb.StatsPayload) *traceagent { - return newAgentWithConfig(ctx, traceconfig.New(), out) +func NewAgent(ctx context.Context, out chan pb.StatsPayload) *TraceAgent { + return NewAgentWithConfig(ctx, traceconfig.New(), out) } // newAgentWithConfig creates a new traceagent with the given config cfg. Used in tests; use newAgent instead. -func newAgentWithConfig(ctx context.Context, cfg *traceconfig.AgentConfig, out chan pb.StatsPayload) *traceagent { +func NewAgentWithConfig(ctx context.Context, cfg *traceconfig.AgentConfig, out chan pb.StatsPayload) *TraceAgent { // disable the HTTP receiver cfg.ReceiverPort = 0 // set the API key to succeed startup; it is never used nor needed @@ -68,7 +68,7 @@ func newAgentWithConfig(ctx context.Context, cfg *traceconfig.AgentConfig, out c // lastly, start the OTLP receiver, which will be used to introduce ResourceSpans into the traceagent, // so that we can transform them to Datadog spans and receive stats. a.OTLPReceiver = api.NewOTLPReceiver(pchan, cfg) - return &traceagent{ + return &TraceAgent{ Agent: a, exit: make(chan struct{}), pchan: pchan, @@ -76,7 +76,7 @@ func newAgentWithConfig(ctx context.Context, cfg *traceconfig.AgentConfig, out c } // Start starts the traceagent, making it ready to ingest spans. -func (p *traceagent) Start() { +func (p *TraceAgent) Start() { // we don't need to start the full agent, so we only start a set of minimal // components needed to compute stats: for _, starter := range []interface{ Start() }{ @@ -98,7 +98,7 @@ func (p *traceagent) Start() { } // Stop stops the traceagent, making it unable to ingest spans. Do not call Ingest after Stop. -func (p *traceagent) Stop() { +func (p *TraceAgent) Stop() { for _, stopper := range []interface{ Stop() }{ p.Concentrator, p.ClientStatsAggregator, @@ -115,7 +115,7 @@ func (p *traceagent) Stop() { // goDrain drains the TraceWriter channel, ensuring it won't block. We don't need the traces, // nor do we have a running TraceWrite. We just want the outgoing stats. -func (p *traceagent) goDrain() { +func (p *TraceAgent) goDrain() { p.wg.Add(1) go func() { defer p.wg.Done() @@ -132,7 +132,7 @@ func (p *traceagent) goDrain() { // Ingest processes the given spans within the traceagent and outputs stats through the output channel // provided to newAgent. Do not call Ingest on an unstarted or stopped traceagent. -func (p *traceagent) Ingest(ctx context.Context, traces ptrace.Traces) { +func (p *TraceAgent) Ingest(ctx context.Context, traces ptrace.Traces) { rspanss := traces.ResourceSpans() for i := 0; i < rspanss.Len(); i++ { rspans := rspanss.At(i) @@ -148,7 +148,7 @@ func (p *traceagent) Ingest(ctx context.Context, traces ptrace.Traces) { // goProcesses runs the main loop which takes incoming payloads, processes them and generates stats. // It then picks up those stats and converts them to metrics. -func (p *traceagent) goProcess() { +func (p *TraceAgent) goProcess() { for i := 0; i < runtime.NumCPU(); i++ { p.wg.Add(1) go func() { @@ -167,10 +167,10 @@ func (p *traceagent) goProcess() { } } -var _ ingester = (*traceagent)(nil) +var _ Ingester = (*TraceAgent)(nil) -// An ingester is able to ingest traces. Implemented by traceagent. -type ingester interface { +// An Ingester is able to ingest traces. Implemented by traceagent. +type Ingester interface { // Start starts the ingester. Start() diff --git a/processor/datadogprocessor/agent_test.go b/internal/datadog/agent_test.go similarity index 92% rename from processor/datadogprocessor/agent_test.go rename to internal/datadog/agent_test.go index 6d373fd44110..8c338137974b 100644 --- a/processor/datadogprocessor/agent_test.go +++ b/internal/datadog/agent_test.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package datadogprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/datadogprocessor" +package datadog // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/datadog" import ( "context" @@ -21,7 +21,7 @@ func TestTraceAgentConfig(t *testing.T) { require.NotZero(t, cfg.ReceiverPort) out := make(chan pb.StatsPayload) - agnt := newAgentWithConfig(context.Background(), cfg, out) + agnt := NewAgentWithConfig(context.Background(), cfg, out) require.Zero(t, cfg.ReceiverPort) require.NotEmpty(t, cfg.Endpoints[0].APIKey) require.Equal(t, metrics.UnsetHostnamePlaceholder, cfg.Hostname) @@ -33,7 +33,7 @@ func TestTraceAgent(t *testing.T) { cfg.BucketInterval = 50 * time.Millisecond out := make(chan pb.StatsPayload, 10) ctx := context.Background() - a := newAgentWithConfig(ctx, cfg, out) + a := NewAgentWithConfig(ctx, cfg, out) a.Start() defer a.Stop() diff --git a/internal/datadog/go.mod b/internal/datadog/go.mod new file mode 100644 index 000000000000..895fa3352860 --- /dev/null +++ b/internal/datadog/go.mod @@ -0,0 +1,72 @@ +module github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog + +go 1.19 + +require ( + github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2 + github.com/stretchr/testify v1.8.4 + go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 +) + +require ( + github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3 // indirect + github.com/DataDog/datadog-go/v5 v5.1.1 // indirect + github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2 // indirect + github.com/DataDog/sketches-go v1.4.2 // indirect + github.com/Microsoft/go-winio v0.6.0 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect + github.com/containerd/cgroups v1.0.4 // indirect + github.com/coreos/go-systemd/v22 v22.3.2 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/docker/go-units v0.4.0 // indirect + github.com/dustin/go-humanize v1.0.1 // indirect + github.com/go-ole/go-ole v1.2.6 // indirect + github.com/godbus/dbus/v5 v5.0.6 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/mock v1.6.0 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/karrick/godirwalk v1.17.0 // indirect + github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect + github.com/outcaste-io/ristretto v0.2.1 // indirect + github.com/patrickmn/go-cache v2.1.0+incompatible // indirect + github.com/philhofer/fwd v1.1.2 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect + github.com/secure-systems-lab/go-securesystemslib v0.5.0 // indirect + github.com/shirou/gopsutil/v3 v3.23.2 // indirect + github.com/tinylib/msgp v1.1.8 // indirect + github.com/tklauser/go-sysconf v0.3.11 // indirect + github.com/tklauser/numcpus v0.6.0 // indirect + github.com/yusufpapurcu/wmi v1.2.2 // indirect + go.opentelemetry.io/collector/semconv v0.82.0 // indirect + go.uber.org/atomic v1.11.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.24.0 // indirect + golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect + golang.org/x/mod v0.10.0 // indirect + golang.org/x/net v0.12.0 // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect + golang.org/x/time v0.3.0 // indirect + golang.org/x/tools v0.9.1 // indirect + google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect + google.golang.org/grpc v1.56.2 // indirect + google.golang.org/protobuf v1.31.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/internal/datadog/go.sum b/internal/datadog/go.sum new file mode 100644 index 000000000000..c93257b8b1e1 --- /dev/null +++ b/internal/datadog/go.sum @@ -0,0 +1,317 @@ +github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3 h1:imU7+gtggz9YPG/wJdrtLmL+bvafq+08oivQ8VRO4g8= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3 h1:LFckPfptq8yevWp5TSAbHxGv4LqaEWyRyEQAj+ioKl0= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3/go.mod h1:7uPrckBTIabtHAuoJnQes2XuDmopCImBPhM+o66DvA0= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel h1:sC2wq2fuI1r3U6FmUsn4clsrFOql5XBfs1EG15LPDEc= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel/go.mod h1:CmdN7Zrj+S+2hOSGW5hFT2LC2FVIF/avJTyvhUjaueI= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3 h1:thSia6kXdVcSozdPQOAzSDCpcPBF91ScafOzETLbJP8= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= +github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3 h1:Pb223YrOHuT2io1nDzToc+bSDoikxAITjTl9kZvjFSY= +github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3 h1:CPrsO0OU+MkjvNQhW153DQF4zuHvGkdkxGOp2M2/y34= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3 h1:gAL3HM+Tg5S0MLBjv5K8+elDJS6COf+9Io9dVh7EwYc= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= +github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5TltWcLMU= +github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= +github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork h1:yBq5PrAtrM4yVeSzQ+bn050+Ysp++RKF1QmtkL4VqvU= +github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork/go.mod h1:yA5JwkZsHTLuqq3zaRgUQf35DfDkpOZqgtBqHKpwrBs= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.5.2 h1:W47xIROVye+D6WxkZcy8ETomfZlTNWoVZODwAh4LdeE= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2 h1:JRVQga0KlFCMyuKF/ghrZtRpmYL3XWRGXpSB5Qdk5Ko= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2/go.mod h1:6x6OujLzkt7Wwlu/6kYO5+8FNRBi1HEw8Qm6/qvTOQA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2 h1:FbQSZ6uXhuHzgwC73MUxqvHwV0uxKiGAeAAZIMrfUAc= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2/go.mod h1:oPpGMNpwga8zTGUJfLy3Z/u4l6bvEYuRatJkgSUazr4= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2 h1:C0uzQwHCKubfmbvaZF/Qi6ernigbcoWt9A+U+s0iQGg= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2/go.mod h1:RT78x34OmVb0wuZLtmzzRRy43+7pCCA6ZEOGQ9mA5w0= +github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= +github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= +github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= +github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= +github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 h1:kHaBemcxl8o/pQ5VM1c8PVE1PubbNx3mjUr09OqWGCs= +github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575/go.mod h1:9d6lWj8KzO/fd/NrVaLscBKmPigpZpn5YawRPw+e3Yo= +github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4= +github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= +github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= +github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= +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/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= +github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= +github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/flynn/go-docopt v0.0.0-20140912013429-f6dd2ebbb31e/go.mod h1:HyVoz1Mz5Co8TFO8EupIdlcpwShBmY98dkT2xeHkvEI= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro= +github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +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= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +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/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI= +github.com/karrick/godirwalk v1.17.0/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= +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/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +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/lightstep/go-expohisto v1.0.0 h1:UPtTS1rGdtehbbAF7o/dhkWLTDI73UifG8LbfQI7cA4= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c h1:VtwQ41oftZwlMnOEbMWQtSEUgU64U4s+GHk7hZK+jtY= +github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c/go.mod h1:JKx41uQRwqlTZabZc+kILPrO/3jlKnQ2Z8b7YiVw5cE= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= +github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 h1:3snG66yBm59tKhhSPQrQ/0bCrv1LQbKt40LnUPiUxdc= +github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/outcaste-io/ristretto v0.2.1 h1:KCItuNIGJZcursqHr3ghO7fc5ddZLEHspL9UR0cQM64= +github.com/outcaste-io/ristretto v0.2.1/go.mod h1:W8HywhmtlopSB1jeMg3JtdIhf+DYkLAr0VN/s4+MHac= +github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= +github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= +github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw= +github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0= +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/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI= +github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/secure-systems-lab/go-securesystemslib v0.3.1/go.mod h1:o8hhjkbNl2gOamKUA/eNW3xUrntHT9L4W89W1nfj43U= +github.com/secure-systems-lab/go-securesystemslib v0.5.0 h1:oTiNu0QnulMQgN/hLK124wJD/r2f9ZhIUuKIeBsCBT8= +github.com/secure-systems-lab/go-securesystemslib v0.5.0/go.mod h1:uoCqUC0Ap7jrBSEanxT+SdACYJTVplRXWLkGMuDjXqk= +github.com/shirou/gopsutil/v3 v3.23.2 h1:PAWSuiAszn7IhPMBtXsbSCafej7PqUOvY6YywlQUExU= +github.com/shirou/gopsutil/v3 v3.23.2/go.mod h1:gv0aQw33GLo3pG8SiWKiQrbDzbRY1K80RyZJ7V4Th1M= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +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.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= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= +github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0= +github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw= +github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= +github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= +github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvCazn8G65U= +github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc= +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= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= +github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L58t6CaWGL378DEo2QY= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= +go.opentelemetry.io/collector/semconv v0.82.0 h1:WUeT2a+uZjI6kLvwcBaJnGvo7KSQ/9dIFRcxOQdXucc= +go.opentelemetry.io/collector/semconv v0.82.0/go.mod h1:TlYPtzvsXyHOgr5eATi43qEMqwSmIziivJB2uctKswo= +go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= +golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +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/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= +golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/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-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= +golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +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-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/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-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +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.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= +golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= +golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +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= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= +google.golang.org/grpc v1.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI= +google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +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.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +k8s.io/apimachinery v0.25.5 h1:SQomYHvv+aO43qdu3QKRf9YuI0oI8w3RrOQ1qPbAUGY= diff --git a/internal/datadog/metadata.yaml b/internal/datadog/metadata.yaml new file mode 100644 index 000000000000..29f84019cb99 --- /dev/null +++ b/internal/datadog/metadata.yaml @@ -0,0 +1,3 @@ +status: + codeowners: + active: [mx-psi, gbbr, dineshg13] \ No newline at end of file diff --git a/processor/datadogprocessor/go.mod b/processor/datadogprocessor/go.mod index 155c2c65c234..6a9b7f6edb61 100644 --- a/processor/datadogprocessor/go.mod +++ b/processor/datadogprocessor/go.mod @@ -4,8 +4,9 @@ go 1.19 require ( github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.1 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2 github.com/DataDog/sketches-go v1.4.2 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.82.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/component v0.82.0 go.opentelemetry.io/collector/consumer v0.82.0 @@ -26,8 +27,8 @@ require ( github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3 // indirect github.com/DataDog/datadog-go/v5 v5.1.1 // indirect github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2 // indirect github.com/Microsoft/go-winio v0.6.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect @@ -91,6 +92,8 @@ require ( // It appears that the v0.2.0 tag was modified. Replacing with v0.2.1 replace github.com/outcaste-io/ristretto v0.2.0 => github.com/outcaste-io/ristretto v0.2.1 +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../internal/datadog + retract ( v0.76.2 v0.76.1 diff --git a/processor/datadogprocessor/go.sum b/processor/datadogprocessor/go.sum index e584780ffe88..9d099428b7a3 100644 --- a/processor/datadogprocessor/go.sum +++ b/processor/datadogprocessor/go.sum @@ -19,13 +19,13 @@ github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5Tl github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork h1:yBq5PrAtrM4yVeSzQ+bn050+Ysp++RKF1QmtkL4VqvU= github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork/go.mod h1:yA5JwkZsHTLuqq3zaRgUQf35DfDkpOZqgtBqHKpwrBs= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.5.1 h1:YlfHREq38G3WyUHWL4IodFy0gcZ1j5y3I4YISIKN4NA= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.1 h1:7l5/t7vgEFERAqSM8mXX42dmLDipeomFi111nFAcxUk= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.1/go.mod h1:sviba3HW4OM6td+9NL6/qav9fX76JZ7Z/nhCQpaFvuE= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.1 h1:NkXp/f+/wXApC5scaWNdkN3+7w+D2UhQMd25D/1UP2s= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.1/go.mod h1:Jnhj/DpMWWD9J4xb9ys4EMtrnZL+Tp4KiE52To8wEu4= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.1 h1:vpUa9/iyJDkAUg7fg4GG/MwzpiELe1qM6YAeOuwKoqQ= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.1/go.mod h1:Hvp6Dds9xgXkbouPFThQ30OZXoKgO3C+8ojRdwQxtVQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.5.2 h1:W47xIROVye+D6WxkZcy8ETomfZlTNWoVZODwAh4LdeE= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2 h1:JRVQga0KlFCMyuKF/ghrZtRpmYL3XWRGXpSB5Qdk5Ko= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2/go.mod h1:6x6OujLzkt7Wwlu/6kYO5+8FNRBi1HEw8Qm6/qvTOQA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2 h1:FbQSZ6uXhuHzgwC73MUxqvHwV0uxKiGAeAAZIMrfUAc= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2/go.mod h1:oPpGMNpwga8zTGUJfLy3Z/u4l6bvEYuRatJkgSUazr4= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2 h1:C0uzQwHCKubfmbvaZF/Qi6ernigbcoWt9A+U+s0iQGg= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2/go.mod h1:RT78x34OmVb0wuZLtmzzRRy43+7pCCA6ZEOGQ9mA5w0= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= diff --git a/processor/datadogprocessor/processor.go b/processor/datadogprocessor/processor.go index 26b5d4a24aa6..5e604de68990 100644 --- a/processor/datadogprocessor/processor.go +++ b/processor/datadogprocessor/processor.go @@ -14,6 +14,8 @@ import ( "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/zap" + + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog" ) type datadogProcessor struct { @@ -28,7 +30,7 @@ type datadogProcessor struct { // agent specifies the agent used to ingest traces and output APM Stats. // It is implemented by the traceagent structure; replaced in tests. - agent ingester + agent datadog.Ingester // translator specifies the translator used to transform APM Stats Payloads // from the agent to OTLP Metrics. @@ -52,7 +54,7 @@ func newProcessor(ctx context.Context, logger *zap.Logger, config component.Conf return &datadogProcessor{ logger: logger, nextConsumer: nextConsumer, - agent: newAgent(ctx, in), + agent: datadog.NewAgent(ctx, in), translator: trans, in: in, cfg: cfg, diff --git a/processor/datadogprocessor/processor_test.go b/processor/datadogprocessor/processor_test.go index 9ff845e422af..967c0386dc21 100644 --- a/processor/datadogprocessor/processor_test.go +++ b/processor/datadogprocessor/processor_test.go @@ -21,6 +21,8 @@ import ( "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/zap" "google.golang.org/protobuf/proto" + + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog" ) func TestProcessorStart(t *testing.T) { @@ -252,7 +254,7 @@ type mockTracesExporter struct { mockTracesConsumer } -var _ ingester = (*mockIngester)(nil) +var _ datadog.Ingester = (*mockIngester)(nil) // mockIngester implements ingester. type mockIngester struct { diff --git a/versions.yaml b/versions.yaml index 01d5d33f9d4b..57332bd226f5 100644 --- a/versions.yaml +++ b/versions.yaml @@ -104,6 +104,7 @@ module-sets: - github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent - github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk + - github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata From cf98af21cdb0dd6df170d284cce40e07a890dc8f Mon Sep 17 00:00:00 2001 From: Murphy Chen Date: Mon, 7 Aug 2023 17:27:26 +0800 Subject: [PATCH 004/292] [exporter/awsemfexporter] enable exhaustive for awsemfexporter (#24812) relate: https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/23266 --- exporter/awsemfexporter/datapoint.go | 1 + 1 file changed, 1 insertion(+) diff --git a/exporter/awsemfexporter/datapoint.go b/exporter/awsemfexporter/datapoint.go index a3b1ccdd08d0..1ed167b70b12 100644 --- a/exporter/awsemfexporter/datapoint.go +++ b/exporter/awsemfexporter/datapoint.go @@ -333,6 +333,7 @@ func getDataPoints(pmd pmetric.Metric, metadata cWMetricMetadata, logger *zap.Lo var dps dataPoints + //exhaustive:enforce switch pmd.Type() { case pmetric.MetricTypeGauge: metric := pmd.Gauge() From ce454b5181269091d4ae84840a6825bdeec2357e Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Mon, 7 Aug 2023 05:33:25 -0400 Subject: [PATCH 005/292] [cmd/telemetrygen] Improvements and fixes to telemetrygen traces (#21629) **Description:** - Adds new option to disable the batchspanprocessor for testing large trace sizes (enabled by default) - Adds new option to configure size in MB of each trace generated for load testing - Fixes issue where large trace payloads (>2000) wouldn't generate the correct number of traces, needed to add delay after each trace is generated --------- Co-authored-by: Pablo Baeyens --- ...elemetrygen-traces-batch-size-options.yaml | 16 ++++++++++++++ cmd/telemetrygen/internal/traces/config.go | 4 ++++ cmd/telemetrygen/internal/traces/traces.go | 22 ++++++++++++------- cmd/telemetrygen/internal/traces/worker.go | 8 +++++++ 4 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 .chloggen/telemetrygen-traces-batch-size-options.yaml diff --git a/.chloggen/telemetrygen-traces-batch-size-options.yaml b/.chloggen/telemetrygen-traces-batch-size-options.yaml new file mode 100644 index 000000000000..c09da9ee8424 --- /dev/null +++ b/.chloggen/telemetrygen-traces-batch-size-options.yaml @@ -0,0 +1,16 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: telemetrygen + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Adds batch option to configure whether to batch traces, and size option to configure minimum size in MB of each trace for load testing. + +# One or more tracking issues related to the change +issues: [9597] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: diff --git a/cmd/telemetrygen/internal/traces/config.go b/cmd/telemetrygen/internal/traces/config.go index 8bd33663ff3b..0579175e1ebf 100644 --- a/cmd/telemetrygen/internal/traces/config.go +++ b/cmd/telemetrygen/internal/traces/config.go @@ -15,6 +15,8 @@ type Config struct { NumTraces int PropagateContext bool ServiceName string + Batch bool + LoadSize int } // Flags registers config flags. @@ -23,4 +25,6 @@ func (c *Config) Flags(fs *pflag.FlagSet) { fs.IntVar(&c.NumTraces, "traces", 1, "Number of traces to generate in each worker (ignored if duration is provided)") fs.BoolVar(&c.PropagateContext, "marshal", false, "Whether to marshal trace context via HTTP headers") fs.StringVar(&c.ServiceName, "service", "telemetrygen", "Service name to use") + fs.BoolVar(&c.Batch, "batch", true, "Whether to batch traces") + fs.IntVar(&c.LoadSize, "size", 0, "Desired minimum size in MB of string data for each trace generated. This can be used to test traces with large payloads, i.e. when testing the OTLP receiver endpoint max receive size.") } diff --git a/cmd/telemetrygen/internal/traces/traces.go b/cmd/telemetrygen/internal/traces/traces.go index 78aaf627d948..5b6011fd6457 100644 --- a/cmd/telemetrygen/internal/traces/traces.go +++ b/cmd/telemetrygen/internal/traces/traces.go @@ -72,13 +72,16 @@ func Start(cfg *Config) error { } }() - ssp := sdktrace.NewBatchSpanProcessor(exp, sdktrace.WithBatchTimeout(time.Second)) - defer func() { - logger.Info("stop the batch span processor") - if tempError := ssp.Shutdown(context.Background()); tempError != nil { - logger.Error("failed to stop the batch span processor", zap.Error(err)) - } - }() + var ssp sdktrace.SpanProcessor + if cfg.Batch { + ssp = sdktrace.NewBatchSpanProcessor(exp, sdktrace.WithBatchTimeout(time.Second)) + defer func() { + logger.Info("stop the batch span processor") + if tempError := ssp.Shutdown(context.Background()); tempError != nil { + logger.Error("failed to stop the batch span processor", zap.Error(err)) + } + }() + } var attributes []attribute.KeyValue // may be overridden by `-otlp-attributes service.name="foo"` @@ -89,7 +92,9 @@ func Start(cfg *Config) error { sdktrace.WithResource(resource.NewWithAttributes(semconv.SchemaURL, attributes...)), ) - tracerProvider.RegisterSpanProcessor(ssp) + if cfg.Batch { + tracerProvider.RegisterSpanProcessor(ssp) + } otel.SetTracerProvider(tracerProvider) if err = Run(cfg, logger); err != nil { @@ -131,6 +136,7 @@ func Run(c *Config, logger *zap.Logger) error { running: running, wg: &wg, logger: logger.With(zap.Int("worker", i)), + loadSize: c.LoadSize, } go w.simulateTraces() diff --git a/cmd/telemetrygen/internal/traces/worker.go b/cmd/telemetrygen/internal/traces/worker.go index d02b34cf384e..4921c8ffd24f 100644 --- a/cmd/telemetrygen/internal/traces/worker.go +++ b/cmd/telemetrygen/internal/traces/worker.go @@ -5,11 +5,13 @@ package traces // import "github.com/open-telemetry/opentelemetry-collector-cont import ( "context" + "fmt" "sync" "sync/atomic" "time" "go.opentelemetry.io/otel" + "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" semconv "go.opentelemetry.io/otel/semconv/v1.4.0" "go.opentelemetry.io/otel/trace" @@ -25,12 +27,15 @@ type worker struct { limitPerSecond rate.Limit // how many spans per second to generate wg *sync.WaitGroup // notify when done logger *zap.Logger + loadSize int } const ( fakeIP string = "1.2.3.4" fakeSpanDuration = 123 * time.Microsecond + + charactersPerMB = 1024 * 1024 // One character takes up one byte of space, so this number comes from the number of bytes in a megabyte ) func (w worker) simulateTraces() { @@ -44,6 +49,9 @@ func (w worker) simulateTraces() { ), trace.WithSpanKind(trace.SpanKindClient), ) + for j := 0; j < w.loadSize; j++ { + sp.SetAttributes(attribute.String(fmt.Sprintf("load-%v", j), string(make([]byte, charactersPerMB)))) + } childCtx := ctx if w.propagateContext { From 74cffb53bead5dd364342772d9b8b58508c7bc3a Mon Sep 17 00:00:00 2001 From: Adam Boguszewski Date: Mon, 7 Aug 2023 02:33:49 -0700 Subject: [PATCH 006/292] [awss3exporter]: add Sumo Logic marshaler for logs in Installed Collector format (#23649) **Description:** This PR adds a new marshaller for `awss3` exporter. It exports logs in the format of Sumo Logic Installed Collector. Metrics and traces are not supported - creating an exporter for them will result in an error. Currently, nested typed (eg. map inside a map) might not be supported correctly - I have to confirm the IC's behavior with them, but I wanted to create the PR so that it can be reviewed early. **Link to tracking Issue:** #23212 **Testing:** Unit tests and manual e2e tests. Some automatic e2e tests will come later, but they will not be part of this repo, they will be a test for integrating the ingest with Sumo Logic's backend. **Documentation:** Readme updated. --------- Signed-off-by: Katarzyna Kujawa Co-authored-by: Katarzyna Kujawa --- .chloggen/awss3-sumologic-ic-marshaller.yaml | 20 ++ exporter/awss3exporter/README.md | 10 +- exporter/awss3exporter/config.go | 1 + exporter/awss3exporter/config_test.go | 26 +++ exporter/awss3exporter/factory.go | 9 + exporter/awss3exporter/factory_test.go | 18 ++ exporter/awss3exporter/marshaler.go | 4 + exporter/awss3exporter/marshaler_test.go | 6 + exporter/awss3exporter/sumo_marshaler.go | 162 +++++++++++++++ exporter/awss3exporter/sumo_marshaler_test.go | 192 ++++++++++++++++++ .../awss3exporter/testdata/marshaler.yaml | 18 ++ 11 files changed, 465 insertions(+), 1 deletion(-) create mode 100644 .chloggen/awss3-sumologic-ic-marshaller.yaml create mode 100644 exporter/awss3exporter/sumo_marshaler.go create mode 100644 exporter/awss3exporter/sumo_marshaler_test.go create mode 100644 exporter/awss3exporter/testdata/marshaler.yaml diff --git a/.chloggen/awss3-sumologic-ic-marshaller.yaml b/.chloggen/awss3-sumologic-ic-marshaller.yaml new file mode 100644 index 000000000000..996d93cc0aea --- /dev/null +++ b/.chloggen/awss3-sumologic-ic-marshaller.yaml @@ -0,0 +1,20 @@ +# Use this changelog template to create an entry for release notes. +# If your change doesn't affect end users, such as a test fix or a tooling change, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: awss3exporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: add Sumo Logic Installed Collector marshaler + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [23212] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: diff --git a/exporter/awss3exporter/README.md b/exporter/awss3exporter/README.md index d9d7dfc50a1f..f1af0f270c38 100644 --- a/exporter/awss3exporter/README.md +++ b/exporter/awss3exporter/README.md @@ -28,9 +28,17 @@ The following exporter configuration parameters are supported. | `s3_prefix` | prefix for the S3 key (root directory inside bucket). | | | `s3_partition` | time granularity of S3 key: hour or minute | "minute" | | `file_prefix` | file prefix defined by user | | -| `marshaler` | marshaler used to produce output data otlp_json | | +| `marshaler` | marshaler used to produce output data | `otlp_json` | | `endpoint` | overrides the endpoint used by the exporter instead of constructing it from `region` and `s3_bucket` | | +### Marshaler + +Marshaler determines the format of data sent to AWS S3. Currently, the following marshalers are implemented: + +- `otlp_json` (default): the [OpenTelemetry Protocol format](https://github.com/open-telemetry/opentelemetry-proto), represented as json. +- `sumo_ic`: the [Sumo Logic Installed Collector Archive format](https://help.sumologic.com/docs/manage/data-archiving/archive/). + **This format is supported only for logs.** + # Example Configuration Following example configuration defines to store output in 'eu-central' region and bucket named 'databucket'. diff --git a/exporter/awss3exporter/config.go b/exporter/awss3exporter/config.go index 008f63996288..e54d0eb72201 100644 --- a/exporter/awss3exporter/config.go +++ b/exporter/awss3exporter/config.go @@ -24,6 +24,7 @@ type MarshalerType string const ( OtlpJSON MarshalerType = "otlp_json" + SumoIC MarshalerType = "sumo_ic" ) // Config contains the main configuration options for the s3 exporter diff --git a/exporter/awss3exporter/config_test.go b/exporter/awss3exporter/config_test.go index 3d21888ec428..b4d9013ab0e0 100644 --- a/exporter/awss3exporter/config_test.go +++ b/exporter/awss3exporter/config_test.go @@ -124,3 +124,29 @@ func TestConfig_Validate(t *testing.T) { }) } } + +func TestMarshallerName(t *testing.T) { + factories, err := otelcoltest.NopFactories() + assert.Nil(t, err) + + factory := NewFactory() + factories.Exporters[factory.Type()] = factory + cfg, err := otelcoltest.LoadConfigAndValidate( + filepath.Join("testdata", "marshaler.yaml"), factories) + + require.NoError(t, err) + require.NotNil(t, cfg) + + e := cfg.Exporters[component.NewID("awss3")].(*Config) + + assert.Equal(t, e, + &Config{ + S3Uploader: S3UploaderConfig{ + Region: "us-east-1", + S3Bucket: "foo", + S3Partition: "minute", + }, + MarshalerName: "sumo_ic", + }, + ) +} diff --git a/exporter/awss3exporter/factory.go b/exporter/awss3exporter/factory.go index 355c371cef0a..61c64807f483 100644 --- a/exporter/awss3exporter/factory.go +++ b/exporter/awss3exporter/factory.go @@ -5,6 +5,7 @@ package awss3exporter // import "github.com/open-telemetry/opentelemetry-collect import ( "context" + "fmt" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/exporter" @@ -57,6 +58,10 @@ func createMetricsExporter(ctx context.Context, return nil, err } + if config.(*Config).MarshalerName == SumoIC { + return nil, fmt.Errorf("metrics are not supported by sumo_ic output format") + } + return exporterhelper.NewMetricsExporter(ctx, params, config, s3Exporter.ConsumeMetrics) @@ -71,6 +76,10 @@ func createTracesExporter(ctx context.Context, return nil, err } + if config.(*Config).MarshalerName == SumoIC { + return nil, fmt.Errorf("traces are not supported by sumo_ic output format") + } + return exporterhelper.NewTracesExporter(ctx, params, config, diff --git a/exporter/awss3exporter/factory_test.go b/exporter/awss3exporter/factory_test.go index 56ecbfb706a0..c8fc0ec1faea 100644 --- a/exporter/awss3exporter/factory_test.go +++ b/exporter/awss3exporter/factory_test.go @@ -48,3 +48,21 @@ func TestCreateLogsExporter(t *testing.T) { assert.NoError(t, err) require.NotNil(t, exp) } + +func TestUnsupportedMarshalerOptions(t *testing.T) { + cfg := createDefaultConfig() + cfg.(*Config).MarshalerName = SumoIC + exp, err := createMetricsExporter( + context.Background(), + exportertest.NewNopCreateSettings(), + cfg) + assert.Error(t, err) + require.Nil(t, exp) + + exp2, err := createTracesExporter( + context.Background(), + exportertest.NewNopCreateSettings(), + cfg) + assert.Error(t, err) + require.Nil(t, exp2) +} diff --git a/exporter/awss3exporter/marshaler.go b/exporter/awss3exporter/marshaler.go index 1478306b5705..686ca49d6dfe 100644 --- a/exporter/awss3exporter/marshaler.go +++ b/exporter/awss3exporter/marshaler.go @@ -31,6 +31,10 @@ func NewMarshaler(mType MarshalerType, logger *zap.Logger) (marshaler, error) { marshaler.tracesMarshaler = &ptrace.JSONMarshaler{} marshaler.metricsMarshaler = &pmetric.JSONMarshaler{} marshaler.fileFormat = "json" + case SumoIC: + sumomarshaler := newSumoICMarshaler() + marshaler.logsMarshaler = &sumomarshaler + marshaler.fileFormat = "json.gz" default: return nil, ErrUnknownMarshaler } diff --git a/exporter/awss3exporter/marshaler_test.go b/exporter/awss3exporter/marshaler_test.go index 60d814493546..791a31bc8903 100644 --- a/exporter/awss3exporter/marshaler_test.go +++ b/exporter/awss3exporter/marshaler_test.go @@ -18,6 +18,12 @@ func TestMarshaler(t *testing.T) { require.NotNil(t, m) assert.Equal(t, m.format(), "json") } + { + m, err := NewMarshaler("sumo_ic", zap.NewNop()) + assert.NoError(t, err) + require.NotNil(t, m) + assert.Equal(t, m.format(), "json.gz") + } { m, err := NewMarshaler("unknown", zap.NewNop()) assert.Error(t, err) diff --git a/exporter/awss3exporter/sumo_marshaler.go b/exporter/awss3exporter/sumo_marshaler.go new file mode 100644 index 000000000000..1828b136dfb5 --- /dev/null +++ b/exporter/awss3exporter/sumo_marshaler.go @@ -0,0 +1,162 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package awss3exporter // import "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter" + +import ( + "bytes" + "encoding/json" + "errors" + "fmt" + "strconv" + "strings" + + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/pdata/ptrace" +) + +const ( + logBodyKey = "log" +) + +type sumoMarshaler struct{} + +func (*sumoMarshaler) format() string { + return string(SumoIC) +} + +func newSumoICMarshaler() sumoMarshaler { + return sumoMarshaler{} +} + +func logEntry(buf *bytes.Buffer, format string, a ...interface{}) { + buf.WriteString(fmt.Sprintf(format, a...)) + buf.WriteString("\n") +} + +func attributeValueToString(v pcommon.Value) (string, error) { + switch v.Type() { + case pcommon.ValueTypeStr: + return v.Str(), nil + case pcommon.ValueTypeBool: + return strconv.FormatBool(v.Bool()), nil + case pcommon.ValueTypeBytes: + return valueToJSON(v.Bytes().AsRaw()) + case pcommon.ValueTypeDouble: + return strconv.FormatFloat(v.Double(), 'f', -1, 64), nil + case pcommon.ValueTypeInt: + return strconv.FormatInt(v.Int(), 10), nil + case pcommon.ValueTypeSlice: + return valueToJSON(v.Slice().AsRaw()) + case pcommon.ValueTypeMap: + return valueToJSON(v.Map().AsRaw()) + case pcommon.ValueTypeEmpty: + return "", nil + default: + return "", fmt.Errorf("unknown OpenTelemetry attribute value type: %q", v.Type()) + } +} + +func valueToJSON(m any) (string, error) { + jsonString := new(bytes.Buffer) + enc := json.NewEncoder(jsonString) + err := enc.Encode(m) + + return strings.Trim(jsonString.String(), "\n"), err +} + +const ( + SourceCategoryKey = "_sourceCategory" + SourceHostKey = "_sourceHost" + SourceNameKey = "_sourceName" +) + +func (sumoMarshaler) MarshalLogs(ld plog.Logs) ([]byte, error) { + buf := bytes.Buffer{} + rls := ld.ResourceLogs() + for i := 0; i < rls.Len(); i++ { + rl := rls.At(i) + ra := rl.Resource().Attributes() + sourceCategory, exists := ra.Get(SourceCategoryKey) + if !exists { + return nil, errors.New("_sourceCategory attribute does not exist") + } + sourceHost, exists := ra.Get(SourceHostKey) + if !exists { + return nil, errors.New("_sourceHost attribute does not exist") + } + sourceName, exists := ra.Get(SourceNameKey) + if !exists { + return nil, errors.New("_sourceName attribute does not exist") + } + + sc, err := attributeValueToString(sourceCategory) + if err != nil { + return nil, err + } + sh, err := attributeValueToString(sourceHost) + if err != nil { + return nil, err + } + sn, err := attributeValueToString(sourceName) + if err != nil { + return nil, err + } + sc = strconv.Quote(sc) + sh = strconv.Quote(sh) + sn = strconv.Quote(sn) + + // Remove the source attributes so that they won't be included in "fields" value. + ra.Remove(SourceCategoryKey) + ra.Remove(SourceHostKey) + ra.Remove(SourceNameKey) + + fields, err := valueToJSON(ra.AsRaw()) + if err != nil { + return nil, err + } + + ills := rl.ScopeLogs() + for j := 0; j < ills.Len(); j++ { + ils := ills.At(j) + logs := ils.LogRecords() + for k := 0; k < logs.Len(); k++ { + lr := logs.At(k) + dateVal := lr.ObservedTimestamp() + + message, err := getMessageJSON(lr) + if err != nil { + return nil, err + } + + logEntry(&buf, "{\"date\": \"%s\",\"sourceName\":%s,\"sourceHost\":%s,\"sourceCategory\":%s,\"fields\":%s,\"message\":%s}", + dateVal, sn, sh, sc, fields, message) + } + } + } + return buf.Bytes(), nil +} + +func getMessageJSON(lr plog.LogRecord) (string, error) { + // The "message" fields is a JSON created from combining the actual log body and log-level attributes, + // where the log body is stored under "log" key. + // More info: + // https://help.sumologic.com/docs/send-data/opentelemetry-collector/data-source-configurations/additional-configurations-reference/#mapping-opentelemetry-concepts-to-sumo-logic + message := new(bytes.Buffer) + enc := json.NewEncoder(message) + + lr.Body().CopyTo(lr.Attributes().PutEmpty(logBodyKey)) + err := enc.Encode(lr.Attributes().AsRaw()) + + return strings.Trim(message.String(), "\n"), err +} + +func (s sumoMarshaler) MarshalTraces(_ ptrace.Traces) ([]byte, error) { + return nil, fmt.Errorf("traces can't be marshaled into %s format", s.format()) +} + +func (s sumoMarshaler) MarshalMetrics(_ pmetric.Metrics) ([]byte, error) { + return nil, fmt.Errorf("metrics can't be marshaled into %s format", s.format()) +} diff --git a/exporter/awss3exporter/sumo_marshaler_test.go b/exporter/awss3exporter/sumo_marshaler_test.go new file mode 100644 index 000000000000..aa6f656e1a73 --- /dev/null +++ b/exporter/awss3exporter/sumo_marshaler_test.go @@ -0,0 +1,192 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package awss3exporter + +import ( + "testing" + "time" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/plog" +) + +func TestMarshalerMissingAttributes(t *testing.T) { + logs := plog.NewLogs() + rl := logs.ResourceLogs().AppendEmpty() + rl.ScopeLogs().AppendEmpty() + marshaler := &sumoMarshaler{} + require.NotNil(t, marshaler) + _, err := marshaler.MarshalLogs(logs) + assert.Error(t, err) +} + +func TestMarshalerMissingSourceHost(t *testing.T) { + logs := plog.NewLogs() + rls := logs.ResourceLogs().AppendEmpty() + rls.Resource().Attributes().PutStr("_sourceCategory", "testcategory") + + marshaler := &sumoMarshaler{} + require.NotNil(t, marshaler) + _, err := marshaler.MarshalLogs(logs) + assert.Error(t, err) +} + +func TestMarshalerMissingScopedLogs(t *testing.T) { + logs := plog.NewLogs() + rls := logs.ResourceLogs().AppendEmpty() + rls.Resource().Attributes().PutStr("_sourceCategory", "testcategory") + rls.Resource().Attributes().PutStr("_sourceHost", "testHost") + rls.Resource().Attributes().PutStr("_sourceName", "testName") + + marshaler := &sumoMarshaler{} + require.NotNil(t, marshaler) + _, err := marshaler.MarshalLogs(logs) + assert.NoError(t, err) +} + +func TestMarshalerMissingSourceName(t *testing.T) { + logs := plog.NewLogs() + rls := logs.ResourceLogs().AppendEmpty() + rls.Resource().Attributes().PutStr("_sourceCategory", "testcategory") + rls.Resource().Attributes().PutStr("_sourceHost", "testHost") + + sl := rls.ScopeLogs().AppendEmpty() + const recordNum = 0 + + ts := pcommon.Timestamp(int64(recordNum) * time.Millisecond.Nanoseconds()) + logRecord := sl.LogRecords().AppendEmpty() + logRecord.Body().SetStr("entry1") + logRecord.SetTimestamp(ts) + + marshaler := &sumoMarshaler{} + require.NotNil(t, marshaler) + _, err := marshaler.MarshalLogs(logs) + assert.Error(t, err) +} + +func TestMarshalerOkStructure(t *testing.T) { + logs := plog.NewLogs() + rls := logs.ResourceLogs().AppendEmpty() + rls.Resource().Attributes().PutStr("_sourceCategory", "testcategory") + rls.Resource().Attributes().PutStr("_sourceHost", "testHost") + rls.Resource().Attributes().PutStr("_sourceName", "testSourceName") + rls.Resource().Attributes().PutStr("42", "the question") + slice := rls.Resource().Attributes().PutEmptySlice("slice") + pcommon.NewValueInt(13).CopyTo(slice.AppendEmpty()) + m := pcommon.NewValueMap() + m.Map().PutBool("b", true) + m.CopyTo(slice.AppendEmpty()) + + sl := rls.ScopeLogs().AppendEmpty() + const recordNum = 0 + + ts := pcommon.Timestamp(int64(recordNum) * time.Millisecond.Nanoseconds()) + logRecord := sl.LogRecords().AppendEmpty() + logRecord.Body().SetStr("entry1") + logRecord.SetTimestamp(ts) + logRecord.Attributes().PutStr("key", "value") + + marshaler := &sumoMarshaler{} + require.NotNil(t, marshaler) + buf, err := marshaler.MarshalLogs(logs) + assert.NoError(t, err) + expectedEntry := "{\"date\": \"1970-01-01 00:00:00 +0000 UTC\",\"sourceName\":\"testSourceName\",\"sourceHost\":\"testHost\"" + expectedEntry += ",\"sourceCategory\":\"testcategory\",\"fields\":{\"42\":\"the question\",\"slice\":[13,{\"b\":true}]},\"message\":{\"key\":\"value\",\"log\":\"entry1\"}}\n" + assert.Equal(t, expectedEntry, string(buf)) +} + +func TestMarshalerQuotes(t *testing.T) { + logs := plog.NewLogs() + rls := logs.ResourceLogs().AppendEmpty() + rls.Resource().Attributes().PutStr("_sourceCategory", `"foo"bar"`) + rls.Resource().Attributes().PutStr("_sourceHost", "testHost") + rls.Resource().Attributes().PutStr("_sourceName", "testSourceName") + + sl := rls.ScopeLogs().AppendEmpty() + const recordNum = 0 + + ts := pcommon.Timestamp(int64(recordNum) * time.Millisecond.Nanoseconds()) + logRecord := sl.LogRecords().AppendEmpty() + logRecord.Body().SetStr("entry1") + logRecord.SetTimestamp(ts) + + marshaler := &sumoMarshaler{} + require.NotNil(t, marshaler) + buf, err := marshaler.MarshalLogs(logs) + assert.NoError(t, err) + expectedEntry := "{\"date\": \"1970-01-01 00:00:00 +0000 UTC\",\"sourceName\":\"testSourceName\",\"sourceHost\":\"testHost\"" + expectedEntry += ",\"sourceCategory\":\"\\\"foo\\\"bar\\\"\",\"fields\":{},\"message\":{\"log\":\"entry1\"}}\n" + assert.Equal(t, expectedEntry, string(buf)) +} + +func TestAttributeValueToString(t *testing.T) { + testCases := []struct { + value pcommon.Value + result string + init func(pcommon.Value) + }{ + { + value: pcommon.NewValueBool(true), + result: "true", + }, + { + value: pcommon.NewValueBytes(), + result: "\"KiFN/wA=\"", + init: func(v pcommon.Value) { + v.Bytes().Append(42, 33, 77, 255, 0) + }, + }, + { + value: pcommon.NewValueDouble(1.69), + result: "1.69", + }, + { + value: pcommon.NewValueInt(42), + result: "42", + }, + { + // Format of a map entry: + // " -> : ()\n" + // Type names: https://github.com/open-telemetry/opentelemetry-collector/blob/ed8547a8e5d6ed527e6d54136cb2e137b954f888/pdata/pcommon/value.go#L32 + value: pcommon.NewValueMap(), + result: "{" + + "\"bool\":false," + + "\"map\":{}," + + "\"string\":\"abc\"" + + "}", + init: func(v pcommon.Value) { + m := v.Map() + m.PutBool("bool", false) + m.PutEmptyMap("map") + m.PutStr("string", "abc") + }, + }, + { + value: pcommon.NewValueSlice(), + result: "[110.37,[true],\"YWJj\",\"asdfg\"]", + init: func(v pcommon.Value) { + s := v.Slice() + s.AppendEmpty().SetDouble(110.37) + s.AppendEmpty().SetEmptySlice().AppendEmpty().SetBool(true) + s.AppendEmpty().SetEmptyBytes().Append(97, 98, 99) + s.AppendEmpty().SetStr("asdfg") + }, + }, + { + value: pcommon.NewValueStr("qwerty"), + result: "qwerty", + }, + } + + for _, testCase := range testCases { + if testCase.init != nil { + testCase.init(testCase.value) + } + val, err := attributeValueToString(testCase.value) + assert.NoError(t, err) + assert.Equal(t, testCase.result, val) + } +} diff --git a/exporter/awss3exporter/testdata/marshaler.yaml b/exporter/awss3exporter/testdata/marshaler.yaml new file mode 100644 index 000000000000..fcbcba6be079 --- /dev/null +++ b/exporter/awss3exporter/testdata/marshaler.yaml @@ -0,0 +1,18 @@ +receivers: + nop: + +exporters: + awss3: + s3uploader: + s3_bucket: "foo" + marshaler: sumo_ic + +processors: + nop: + +service: + pipelines: + traces: + receivers: [nop] + processors: [nop] + exporters: [awss3] From 37cc6aa04e4803f182bfb1a1a46891cbb943fd32 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Mon, 7 Aug 2023 05:46:10 -0700 Subject: [PATCH 007/292] [chore] preallocate slice (#24949) --- pkg/ottl/parser.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/ottl/parser.go b/pkg/ottl/parser.go index d60626180451..1b6335cbd43f 100644 --- a/pkg/ottl/parser.go +++ b/pkg/ottl/parser.go @@ -102,7 +102,7 @@ func WithEnumParser[K any](parser EnumParser) Option[K] { // If parsing fails, returns an empty slice with a multierr error containing // an error per failed statement. func (p *Parser[K]) ParseStatements(statements []string) ([]*Statement[K], error) { - var parsedStatements []*Statement[K] + parsedStatements := make([]*Statement[K], 0, len(statements)) var parseErr error for _, statement := range statements { From 1c00b6e45cb8a66ca506f66d380c387afc0dee95 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Mon, 7 Aug 2023 06:32:47 -0700 Subject: [PATCH 008/292] [chore] preallocate slice (#24960) --- receiver/awscloudwatchreceiver/integration_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/receiver/awscloudwatchreceiver/integration_test.go b/receiver/awscloudwatchreceiver/integration_test.go index 8cfb5a1c0ceb..fb1a78128418 100644 --- a/receiver/awscloudwatchreceiver/integration_test.go +++ b/receiver/awscloudwatchreceiver/integration_test.go @@ -78,14 +78,14 @@ var ( ) func loadLogGroups(t *testing.T) *cloudwatchlogs.DescribeLogGroupsOutput { - var output []*cloudwatchlogs.LogGroup - for _, lg := range logGroupFiles { + output := make([]*cloudwatchlogs.LogGroup, len(logGroupFiles)) + for i, lg := range logGroupFiles { bytes, err := os.ReadFile(lg) require.NoError(t, err) var logGroup cloudwatchlogs.LogGroup err = json.Unmarshal(bytes, &logGroup) require.NoError(t, err) - output = append(output, &logGroup) + output[i] = &logGroup } return &cloudwatchlogs.DescribeLogGroupsOutput{ @@ -95,14 +95,14 @@ func loadLogGroups(t *testing.T) *cloudwatchlogs.DescribeLogGroupsOutput { } func loadLogEvents(t *testing.T) *cloudwatchlogs.FilterLogEventsOutput { - var output []*cloudwatchlogs.FilteredLogEvent - for _, lg := range logEventsFiles { + output := make([]*cloudwatchlogs.FilteredLogEvent, len(logEventsFiles)) + for i, lg := range logEventsFiles { bytes, err := os.ReadFile(lg) require.NoError(t, err) var event cloudwatchlogs.FilteredLogEvent err = json.Unmarshal(bytes, &event) require.NoError(t, err) - output = append(output, &event) + output[i] = &event } return &cloudwatchlogs.FilterLogEventsOutput{ From 46849dd08c33b21cf4fa4672091e18cdccd8529e Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Mon, 7 Aug 2023 06:39:04 -0700 Subject: [PATCH 009/292] [chore] preallocate slice (#24951) --- pkg/translator/prometheusremotewrite/testutils_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/translator/prometheusremotewrite/testutils_test.go b/pkg/translator/prometheusremotewrite/testutils_test.go index f130e6349c70..bdc6fa594648 100644 --- a/pkg/translator/prometheusremotewrite/testutils_test.go +++ b/pkg/translator/prometheusremotewrite/testutils_test.go @@ -302,10 +302,10 @@ func getSummaryMetric(name string, attributes pcommon.Map, ts uint64, sum float6 } func getBucketBoundsData(values []float64) []bucketBoundsData { - var b []bucketBoundsData + b := make([]bucketBoundsData, len(values)) - for _, value := range values { - b = append(b, bucketBoundsData{sig: lb1Sig, bound: value}) + for i, value := range values { + b[i] = bucketBoundsData{sig: lb1Sig, bound: value} } return b From 4f2f4166d462d92f0ca94d8254efbe26dff48d67 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Mon, 7 Aug 2023 15:44:54 +0200 Subject: [PATCH 010/292] [exporter/datadog] Set Capabilities on metrics exporter (#24979) **Description:** Correctly set `MutatesData` to `true` on the Datadog metrics exporter. This was leading to panics when using multiple exporters. **Link to tracking Issue:** Fixes #24908 --- .chloggen/mx-psi_fix-panics.yaml | 28 ++++++++++++++++++++++++++++ exporter/datadogexporter/factory.go | 2 ++ 2 files changed, 30 insertions(+) create mode 100755 .chloggen/mx-psi_fix-panics.yaml diff --git a/.chloggen/mx-psi_fix-panics.yaml b/.chloggen/mx-psi_fix-panics.yaml new file mode 100755 index 000000000000..b2917647541d --- /dev/null +++ b/.chloggen/mx-psi_fix-panics.yaml @@ -0,0 +1,28 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: datadogexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Correctly set metrics exporter capabilities to state that it mutates data + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [24908] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + This could lead to random panics if using more than one metrics exporter. + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/exporter/datadogexporter/factory.go b/exporter/datadogexporter/factory.go index df0423b2688d..7beee5bdce53 100644 --- a/exporter/datadogexporter/factory.go +++ b/exporter/datadogexporter/factory.go @@ -275,6 +275,8 @@ func (f *factory) createMetricsExporter( exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0 * time.Second}), // We use our own custom mechanism for retries, since we hit several endpoints. exporterhelper.WithRetry(exporterhelper.RetrySettings{Enabled: false}), + // The metrics remapping code mutates data + exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: true}), exporterhelper.WithQueue(cfg.QueueSettings), exporterhelper.WithShutdown(func(context.Context) error { cancel() From 7267f8e73ea907e58d9349dac096dfce612aa1ca Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Mon, 7 Aug 2023 10:04:19 -0400 Subject: [PATCH 011/292] [chore] Update recombine example and add corresponding test (#23605) Changes to readme: - Escape `\s` in match expression - Switch stacktrace example to combine on `body`. This example has no reason to demonstrate `body.message`, but the other example does. Added tests: - Exactly the stacktrace example - Previous version of the example - Exactly the "logtag" example --- pkg/stanza/docs/operators/recombine.md | 16 +-- .../transformer/recombine/recombine_test.go | 120 ++++++++++++++++++ 2 files changed, 125 insertions(+), 11 deletions(-) diff --git a/pkg/stanza/docs/operators/recombine.md b/pkg/stanza/docs/operators/recombine.md index 9f85a79eea9d..56b483fb914a 100644 --- a/pkg/stanza/docs/operators/recombine.md +++ b/pkg/stanza/docs/operators/recombine.md @@ -101,8 +101,8 @@ This can be expressed with the following configuration: ```yaml - type: recombine - combine_field: body.message - is_first_entry: body.message matches "^[^\s]" + combine_field: body + is_first_entry: body matches "^[^\\s]" ``` Given the following input file: @@ -126,23 +126,17 @@ The following logs will be output: { "timestamp": "2020-12-04T13:03:38.41149-05:00", "severity": 0, - "body": { - "message": "Log message 1", - } + "body": "Log message 1" }, { "timestamp": "2020-12-04T13:03:38.41149-05:00", "severity": 0, - "body": { - "message": "Error: java.lang.Exception: Stack trace\n at java.lang.Thread.dumpStack(Thread.java:1336)\n at Main.demo3(Main.java:15)\n at Main.demo2(Main.java:12)\n at Main.demo1(Main.java:9)\n at Main.demo(Main.java:6)\n at Main.main(Main.java:3)", - } + "body": "Error: java.lang.Exception: Stack trace\n at java.lang.Thread.dumpStack(Thread.java:1336)\n at Main.demo3(Main.java:15)\n at Main.demo2(Main.java:12)\n at Main.demo1(Main.java:9)\n at Main.demo(Main.java:6)\n at Main.main(Main.java:3)" }, { "timestamp": "2020-12-04T13:03:38.41149-05:00", "severity": 0, - "body": { - "message": "Another log message", - } + "body": "Another log message", }, ] ``` diff --git a/pkg/stanza/operator/transformer/recombine/recombine_test.go b/pkg/stanza/operator/transformer/recombine/recombine_test.go index f28512dee39a..0445d92c414d 100644 --- a/pkg/stanza/operator/transformer/recombine/recombine_test.go +++ b/pkg/stanza/operator/transformer/recombine/recombine_test.go @@ -194,6 +194,125 @@ func TestTransformer(t *testing.T) { }, []*entry.Entry{entryWithBody(t1, "test1test2")}, }, + { + "Stacktrace", + func() *Config { + cfg := NewConfig() + cfg.CombineField = entry.NewBodyField() + cfg.IsFirstEntry = `body matches "^[^\\s]"` + cfg.ForceFlushTimeout = 100 * time.Millisecond + cfg.OutputIDs = []string{"fake"} + return cfg + }(), + []*entry.Entry{ + entryWithBody(t1, "Log message 1"), + entryWithBody(t1, "Error: java.lang.Exception: Stack trace"), + entryWithBody(t1, " at java.lang.Thread.dumpStack(Thread.java:1336)"), + entryWithBody(t1, " at Main.demo3(Main.java:15)"), + entryWithBody(t1, " at Main.demo2(Main.java:12)"), + entryWithBody(t1, " at Main.demo1(Main.java:9)"), + entryWithBody(t1, " at Main.demo(Main.java:6)"), + entryWithBody(t1, " at Main.main(Main.java:3)"), + entryWithBody(t1, "Another log message"), + }, + []*entry.Entry{ + entryWithBody(t1, "Log message 1"), + entryWithBody(t1, "Error: java.lang.Exception: Stack trace\n"+ + " at java.lang.Thread.dumpStack(Thread.java:1336)\n"+ + " at Main.demo3(Main.java:15)\n"+ + " at Main.demo2(Main.java:12)\n"+ + " at Main.demo1(Main.java:9)\n"+ + " at Main.demo(Main.java:6)\n"+ + " at Main.main(Main.java:3)"), + entryWithBody(t1, "Another log message"), + }, + }, + { + "StacktraceSubfield", + func() *Config { + cfg := NewConfig() + cfg.CombineField = entry.NewBodyField("message") + cfg.IsFirstEntry = `body.message matches "^[^\\s]"` + cfg.ForceFlushTimeout = 100 * time.Millisecond + cfg.OutputIDs = []string{"fake"} + return cfg + }(), + []*entry.Entry{ + entryWithBody(t1, map[string]any{"message": "Log message 1"}), + entryWithBody(t1, map[string]any{"message": "Error: java.lang.Exception: Stack trace"}), + entryWithBody(t1, map[string]any{"message": " at java.lang.Thread.dumpStack(Thread.java:1336)"}), + entryWithBody(t1, map[string]any{"message": " at Main.demo3(Main.java:15)"}), + entryWithBody(t1, map[string]any{"message": " at Main.demo2(Main.java:12)"}), + entryWithBody(t1, map[string]any{"message": " at Main.demo1(Main.java:9)"}), + entryWithBody(t1, map[string]any{"message": " at Main.demo(Main.java:6)"}), + entryWithBody(t1, map[string]any{"message": " at Main.main(Main.java:3)"}), + entryWithBody(t1, map[string]any{"message": "Another log message"}), + }, + []*entry.Entry{ + entryWithBody(t1, map[string]any{"message": "Log message 1"}), + entryWithBody(t1, map[string]any{"message": "Error: java.lang.Exception: Stack trace\n" + + " at java.lang.Thread.dumpStack(Thread.java:1336)\n" + + " at Main.demo3(Main.java:15)\n" + + " at Main.demo2(Main.java:12)\n" + + " at Main.demo1(Main.java:9)\n" + + " at Main.demo(Main.java:6)\n" + + " at Main.main(Main.java:3)"}), + entryWithBody(t1, map[string]any{"message": "Another log message"}), + }, + }, + { + "CombineOtherThanCondition", + func() *Config { + cfg := NewConfig() + cfg.CombineField = entry.NewBodyField("message") + cfg.CombineWith = "" + cfg.IsLastEntry = "body.logtag == 'F'" + cfg.OverwriteWith = "newest" + cfg.ForceFlushTimeout = 100 * time.Millisecond + cfg.OutputIDs = []string{"fake"} + return cfg + }(), + []*entry.Entry{ + entryWithBody(t1, map[string]any{ + "message": "Single entry log 1", + "logtag": "F", + "stream": "stdout", + "timestamp": "2016-10-06T00:17:09.669794202Z", + }), + entryWithBody(t1, map[string]any{ + "message": "This is a very very long line th", + "logtag": "P", + "stream": "stdout", + "timestamp": "2016-10-06T00:17:10.113242941Z", + }), + entryWithBody(t1, map[string]any{ + "message": "at is really really long and spa", + "logtag": "P", + "stream": "stdout", + "timestamp": "2016-10-06T00:17:10.113242941Z", + }), + entryWithBody(t1, map[string]any{ + "message": "ns across multiple log entries", + "logtag": "F", + "stream": "stdout", + "timestamp": "2016-10-06T00:17:10.113242941Z", + }), + }, + []*entry.Entry{ + entryWithBody(t1, map[string]any{ + "message": "Single entry log 1", + "logtag": "F", + "stream": "stdout", + "timestamp": "2016-10-06T00:17:09.669794202Z", + }), + entryWithBody(t1, map[string]any{ + "message": "This is a very very long line that is really really long and spans across multiple log entries", + "logtag": "F", + "stream": "stdout", + "timestamp": "2016-10-06T00:17:10.113242941Z", + }), + }, + }, { "TestDefaultSourceIdentifier", func() *Config { @@ -358,6 +477,7 @@ func TestTransformer(t *testing.T) { t.Run(tc.name, func(t *testing.T) { op, err := tc.config.Build(testutil.Logger(t)) require.NoError(t, err) + require.NoError(t, op.Start(testutil.NewMockPersister("test"))) recombine := op.(*Transformer) fake := testutil.NewFakeOutput(t) From ff6085870e78ec6b10f8b1b8abd5e4bea536a6f8 Mon Sep 17 00:00:00 2001 From: Yang Song Date: Mon, 7 Aug 2023 12:14:02 -0400 Subject: [PATCH 012/292] [chore] Upgrade datadog-agent and mapping go versions and fix breaking changes (#24674) **Description:** Roll forward https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/24552 with stable versions of dependencies. > Upgrade dependency versions of github.com/DataDog/opentelemetry-mapping-go and github.com/DataDog/datadog-agent and fix breaking changes in protobuf (context: https://github.com/DataDog/datadog-agent/pull/10650, https://github.com/DataDog/opentelemetry-mapping-go/pull/126). --- .chloggen/datadogexporter-deps.yaml | 27 ++++ cmd/configschema/go.mod | 31 ++-- cmd/configschema/go.sum | 72 ++++----- cmd/otelcontribcol/go.mod | 31 ++-- cmd/otelcontribcol/go.sum | 72 ++++----- exporter/datadogexporter/go.mod | 33 ++-- exporter/datadogexporter/go.sum | 97 +++++------- .../internal/metrics/consumer.go | 8 +- .../internal/metrics/consumer_deprecated.go | 8 +- .../metrics/consumer_deprecated_test.go | 4 +- .../internal/metrics/consumer_test.go | 4 +- .../internal/testutil/test_utils.go | 18 +-- exporter/datadogexporter/logs_exporter.go | 16 +- .../datadogexporter/logs_exporter_test.go | 7 + exporter/datadogexporter/metrics_exporter.go | 4 +- .../datadogexporter/metrics_exporter_test.go | 8 +- go.mod | 31 ++-- go.sum | 72 ++++----- internal/datadog/agent.go | 6 +- internal/datadog/agent_test.go | 8 +- internal/datadog/go.mod | 35 +++-- internal/datadog/go.sum | 145 +++++------------- processor/datadogprocessor/go.mod | 33 ++-- processor/datadogprocessor/go.sum | 112 +++++--------- processor/datadogprocessor/processor.go | 6 +- processor/datadogprocessor/processor_test.go | 18 +-- receiver/datadogreceiver/go.mod | 2 +- receiver/datadogreceiver/go.sum | 4 +- receiver/datadogreceiver/receiver.go | 2 +- receiver/datadogreceiver/translator.go | 2 +- receiver/datadogreceiver/translator_test.go | 2 +- testbed/go.mod | 4 +- testbed/go.sum | 8 +- 33 files changed, 412 insertions(+), 518 deletions(-) create mode 100644 .chloggen/datadogexporter-deps.yaml diff --git a/.chloggen/datadogexporter-deps.yaml b/.chloggen/datadogexporter-deps.yaml new file mode 100644 index 000000000000..53f7d74f946c --- /dev/null +++ b/.chloggen/datadogexporter-deps.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: 'bug_fix' + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: datadogexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Populate OTLP resource attributes in Datadog logs. Changes mapping for `jvm.loaded_classes` from `process.runtime.jvm.classes.loaded` to `process.runtime.jvm.classes.current_loaded`." + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [24674] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index c49c7c8c3e3b..94b558314aff 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -22,8 +22,8 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.8.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.0.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.6.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.6.0 // indirect github.com/gocql/gocql v1.3.1 // indirect github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.82.0 // indirect @@ -234,20 +234,21 @@ require ( github.com/ClickHouse/ch-go v0.52.1 // indirect github.com/ClickHouse/clickhouse-go/v2 v2.12.1 // indirect github.com/DataDog/agent-payload/v5 v5.0.89 // indirect - github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel // indirect - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 // indirect github.com/DataDog/datadog-api-client-go/v2 v2.14.0 // indirect github.com/DataDog/datadog-go/v5 v5.1.1 // indirect - github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork // indirect + github.com/DataDog/go-tuf v1.0.1-0.5.2 // indirect github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.5.2 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.5.2 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.6.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.6.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.6.0 // indirect github.com/DataDog/sketches-go v1.4.2 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect @@ -526,7 +527,7 @@ require ( github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc2 // indirect github.com/opencontainers/runc v1.1.5 // indirect - github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect + github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect github.com/opencontainers/selinux v1.10.1 // indirect github.com/openshift/api v3.9.0+incompatible // indirect github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect @@ -560,7 +561,7 @@ require ( github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15 // indirect github.com/scalyr/dataset-go v0.12.1 // indirect github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect - github.com/secure-systems-lab/go-securesystemslib v0.5.0 // indirect + github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect github.com/segmentio/asm v1.2.0 // indirect github.com/shirou/gopsutil/v3 v3.23.6 // indirect github.com/shopspring/decimal v1.3.1 // indirect diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index c59133a94090..d5cf878eac4b 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -721,40 +721,42 @@ github.com/ClickHouse/clickhouse-go/v2 v2.12.1/go.mod h1:W/UQ/GchOF+Q0k5iv6ZanLK github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DataDog/agent-payload/v5 v5.0.89 h1:uuLWf/exyNYBnheG9OH2dOWZpCJvaEHX3W9CAd8KarU= github.com/DataDog/agent-payload/v5 v5.0.89/go.mod h1:oQZi1VZp1e3QvlSUX4iphZCpJaFepUxWq0hNXxihKBM= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3 h1:imU7+gtggz9YPG/wJdrtLmL+bvafq+08oivQ8VRO4g8= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3 h1:LFckPfptq8yevWp5TSAbHxGv4LqaEWyRyEQAj+ioKl0= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3/go.mod h1:7uPrckBTIabtHAuoJnQes2XuDmopCImBPhM+o66DvA0= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel h1:sC2wq2fuI1r3U6FmUsn4clsrFOql5XBfs1EG15LPDEc= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel/go.mod h1:CmdN7Zrj+S+2hOSGW5hFT2LC2FVIF/avJTyvhUjaueI= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3 h1:thSia6kXdVcSozdPQOAzSDCpcPBF91ScafOzETLbJP8= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= -github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3 h1:Pb223YrOHuT2io1nDzToc+bSDoikxAITjTl9kZvjFSY= -github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3 h1:CPrsO0OU+MkjvNQhW153DQF4zuHvGkdkxGOp2M2/y34= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3 h1:gAL3HM+Tg5S0MLBjv5K8+elDJS6COf+9Io9dVh7EwYc= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 h1:g7kb8NGjApkncwuXjkEpYHjYj08hqklvjqB3Gs2uPpQ= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 h1:Htxj/RE55AeDZ+OE6+x+kJQz3toGWzR40Baq0Dknv8U= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1/go.mod h1:O3WwGRPZxs4BpB2ccUvIIPprhscWBRpudJT6mC+7sr8= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 h1:We9Y6+kwCnSOQilk2koeADjbZgMHFDl6iHBaobU5nAw= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1/go.mod h1:5Q39ZOIOwZMnFyRadp+5gH1bFdjmb+Pgxe+j5XOwaTg= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 h1:usLCrmPm2wuNedbcuArxN37E/e7UaCJ66i1tuEq7E/M= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1/go.mod h1:kxBOu4ZSem1E0JdhxjeI2jAQ7nxeRxuhjU4r9LKnRkU= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 h1:9iyw6jSwJwsFe8TooU8mqMhMfFiW6N/05OnNMg91kBY= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 h1:k4tcg077NsPJRxtuGdYEm9kge+zq5QO5x6Yv3R5BwpE= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 h1:detMhMfwchco20v12RjjRisxP3V0mtLEjcgJZGk2cmg= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 h1:EOrKgyyubncuS4LpF8aCj/12i1+GmPV+PCfj8mDaF2c= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= github.com/DataDog/datadog-api-client-go/v2 v2.14.0 h1:cLkqg/D63I6BAxIIg6g8xMWjrAMXcvb5vbD8ixOVVyo= github.com/DataDog/datadog-api-client-go/v2 v2.14.0/go.mod h1:kntOqXEh1SmjwSDzW/eJkr9kS7EqttvEkelglWtJRbg= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5TltWcLMU= github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= -github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork h1:yBq5PrAtrM4yVeSzQ+bn050+Ysp++RKF1QmtkL4VqvU= -github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork/go.mod h1:yA5JwkZsHTLuqq3zaRgUQf35DfDkpOZqgtBqHKpwrBs= +github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9lyd9I= +github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc h1:gtlKB6B50/UEuFm1LeMn0R5a+tubx69OecPqxfXJDmU= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc/go.mod h1:oyPC4jWHHjVVNjslDAKp8EqfQBaSmODjHt4HCX+C+9Q= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.5.2 h1:nwZgSRQb8edVTVcFj5tkl3u3BaP6XrFxSw+tEv9A0hY= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.5.2/go.mod h1:u+DVO6wIQjBFuz2YzDhxOhHB5vf9CTKxB+9cJYs8SRk= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.5.2 h1:W47xIROVye+D6WxkZcy8ETomfZlTNWoVZODwAh4LdeE= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2 h1:JRVQga0KlFCMyuKF/ghrZtRpmYL3XWRGXpSB5Qdk5Ko= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2/go.mod h1:6x6OujLzkt7Wwlu/6kYO5+8FNRBi1HEw8Qm6/qvTOQA= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.5.2 h1:xY5LVtbmcm3zZ8Ccxc8+mzkEmlOdeNQnXPDdZiXiXq4= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.5.2/go.mod h1:Ge92/UCQeo8i0RQgSnowR9uto3VhyxM6YS3W6xJD8rc= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2 h1:FbQSZ6uXhuHzgwC73MUxqvHwV0uxKiGAeAAZIMrfUAc= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2/go.mod h1:oPpGMNpwga8zTGUJfLy3Z/u4l6bvEYuRatJkgSUazr4= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2 h1:C0uzQwHCKubfmbvaZF/Qi6ernigbcoWt9A+U+s0iQGg= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2/go.mod h1:RT78x34OmVb0wuZLtmzzRRy43+7pCCA6ZEOGQ9mA5w0= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.6.0 h1:6nueMcvYoTJ52m21J/gUGVZqCTVpVbT7ORBne+4hMz8= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.6.0/go.mod h1:bKb9myv0VLfiRUjrbzcruMl6q+9BuFaasYbR1FyJRQY= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.6.0 h1:ApW5lG/fuofa2G9B0N4dk6GsnDEUbEm/rjaP9yqDnYA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.6.0 h1:WTLaCgzMa+rbmqArn4ctZ/uX59FdyDTQQFx0jeYEy6w= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.6.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.6.0 h1:6ZcIsN4UPyhN/oQavUtOA/rgs2J/LCOTSTQUF6DPkCQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.6.0/go.mod h1:43N05Pmj4pUAOcROMvthfM8ot3OhLUbRvMPzwf+br2k= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.6.0 h1:sTsPObsNiL1B+XmflDqsvdjr7D3j17ITLfEVNHje8ss= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.6.0/go.mod h1:Y9LznMt9ITC3Y6c/QdN4Wgi0ZR7J6KQHomzcV4jrJ6s= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.6.0 h1:xSKBuZlJdEYfiiRLuSSgjK+x+27qwmpSLVd4ZA09Uww= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.6.0/go.mod h1:RVfXtkRqg/wiDqIo7Pr7L/bxie8jiEVM9wIOXYPbJKk= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= @@ -1105,7 +1107,6 @@ github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4= github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= @@ -1401,7 +1402,6 @@ github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw 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/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= -github.com/flynn/go-docopt v0.0.0-20140912013429-f6dd2ebbb31e/go.mod h1:HyVoz1Mz5Co8TFO8EupIdlcpwShBmY98dkT2xeHkvEI= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -2475,7 +2475,6 @@ github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.9.7 h1:06xGQy5www2oN160RtEZoTvnP2sPhEfePYmCDc2szss= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -2491,7 +2490,6 @@ github.com/onsi/gomega v1.10.4/go.mod h1:g/HbgYopi++010VEqkFgJHKC09uJiW9UkXvMUuK github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -2524,8 +2522,9 @@ github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.m github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 h1:R5M2qXZiK/mWPMT4VldCOiSL9HIAMuxQZWdG0CSM5+4= github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.1.0-rc.3 h1:l04uafi6kxByhbxev7OWiuUv0LZxEsYUfDWZ6bztAuU= +github.com/opencontainers/runtime-spec v1.1.0-rc.3/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE= github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= @@ -2775,9 +2774,8 @@ github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvW github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 h1:RpforrEYXWkmGwJHIGnLZ3tTWStkjVVstwzNGqxX2Ds= github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= -github.com/secure-systems-lab/go-securesystemslib v0.3.1/go.mod h1:o8hhjkbNl2gOamKUA/eNW3xUrntHT9L4W89W1nfj43U= -github.com/secure-systems-lab/go-securesystemslib v0.5.0 h1:oTiNu0QnulMQgN/hLK124wJD/r2f9ZhIUuKIeBsCBT8= -github.com/secure-systems-lab/go-securesystemslib v0.5.0/go.mod h1:uoCqUC0Ap7jrBSEanxT+SdACYJTVplRXWLkGMuDjXqk= +github.com/secure-systems-lab/go-securesystemslib v0.7.0 h1:OwvJ5jQf9LnIAS83waAjPbcMsODrTQUpJ02eNLUoxBg= +github.com/secure-systems-lab/go-securesystemslib v0.7.0/go.mod h1:/2gYnlnHVQ6xeGtfIqFy7Do03K4cdCY0A/GlJLDKLHI= github.com/securego/gosec v0.0.0-20200203094520-d13bb6d2420c/go.mod h1:gp0gaHj0WlmPh9BdsTmo1aq6C27yIPWdxCKGFGdVKBE= github.com/securego/gosec/v2 v2.6.1/go.mod h1:I76p3NTHBXsGhybUW+cEQ692q2Vp+A0Z6ZLzDIZy+Ao= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= @@ -2926,7 +2924,6 @@ github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= @@ -3347,7 +3344,6 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -3477,7 +3473,6 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -3671,7 +3666,6 @@ golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 23836f5f8aa6..92348cb01800 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -252,22 +252,23 @@ require ( github.com/ClickHouse/ch-go v0.52.1 // indirect github.com/ClickHouse/clickhouse-go/v2 v2.12.1 // indirect github.com/DataDog/agent-payload/v5 v5.0.89 // indirect - github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel // indirect - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 // indirect github.com/DataDog/datadog-api-client-go/v2 v2.14.0 // indirect github.com/DataDog/datadog-go/v5 v5.1.1 // indirect - github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork // indirect + github.com/DataDog/go-tuf v1.0.1-0.5.2 // indirect github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.5.2 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.5.2 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.6.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.6.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.6.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.6.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.6.0 // indirect github.com/DataDog/sketches-go v1.4.2 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect @@ -543,7 +544,7 @@ require ( github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc2 // indirect github.com/opencontainers/runc v1.1.5 // indirect - github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect + github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect github.com/opencontainers/selinux v1.10.1 // indirect github.com/openshift/api v3.9.0+incompatible // indirect github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect @@ -577,7 +578,7 @@ require ( github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15 // indirect github.com/scalyr/dataset-go v0.12.1 // indirect github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect - github.com/secure-systems-lab/go-securesystemslib v0.5.0 // indirect + github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect github.com/segmentio/asm v1.2.0 // indirect github.com/shirou/gopsutil/v3 v3.23.6 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 1cb78d80c198..6dbc5c562786 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -667,40 +667,42 @@ github.com/ClickHouse/clickhouse-go/v2 v2.12.1/go.mod h1:W/UQ/GchOF+Q0k5iv6ZanLK github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DataDog/agent-payload/v5 v5.0.89 h1:uuLWf/exyNYBnheG9OH2dOWZpCJvaEHX3W9CAd8KarU= github.com/DataDog/agent-payload/v5 v5.0.89/go.mod h1:oQZi1VZp1e3QvlSUX4iphZCpJaFepUxWq0hNXxihKBM= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3 h1:imU7+gtggz9YPG/wJdrtLmL+bvafq+08oivQ8VRO4g8= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3 h1:LFckPfptq8yevWp5TSAbHxGv4LqaEWyRyEQAj+ioKl0= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3/go.mod h1:7uPrckBTIabtHAuoJnQes2XuDmopCImBPhM+o66DvA0= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel h1:sC2wq2fuI1r3U6FmUsn4clsrFOql5XBfs1EG15LPDEc= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel/go.mod h1:CmdN7Zrj+S+2hOSGW5hFT2LC2FVIF/avJTyvhUjaueI= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3 h1:thSia6kXdVcSozdPQOAzSDCpcPBF91ScafOzETLbJP8= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= -github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3 h1:Pb223YrOHuT2io1nDzToc+bSDoikxAITjTl9kZvjFSY= -github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3 h1:CPrsO0OU+MkjvNQhW153DQF4zuHvGkdkxGOp2M2/y34= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3 h1:gAL3HM+Tg5S0MLBjv5K8+elDJS6COf+9Io9dVh7EwYc= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 h1:g7kb8NGjApkncwuXjkEpYHjYj08hqklvjqB3Gs2uPpQ= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 h1:Htxj/RE55AeDZ+OE6+x+kJQz3toGWzR40Baq0Dknv8U= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1/go.mod h1:O3WwGRPZxs4BpB2ccUvIIPprhscWBRpudJT6mC+7sr8= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 h1:We9Y6+kwCnSOQilk2koeADjbZgMHFDl6iHBaobU5nAw= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1/go.mod h1:5Q39ZOIOwZMnFyRadp+5gH1bFdjmb+Pgxe+j5XOwaTg= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 h1:usLCrmPm2wuNedbcuArxN37E/e7UaCJ66i1tuEq7E/M= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1/go.mod h1:kxBOu4ZSem1E0JdhxjeI2jAQ7nxeRxuhjU4r9LKnRkU= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 h1:9iyw6jSwJwsFe8TooU8mqMhMfFiW6N/05OnNMg91kBY= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 h1:k4tcg077NsPJRxtuGdYEm9kge+zq5QO5x6Yv3R5BwpE= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 h1:detMhMfwchco20v12RjjRisxP3V0mtLEjcgJZGk2cmg= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 h1:EOrKgyyubncuS4LpF8aCj/12i1+GmPV+PCfj8mDaF2c= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= github.com/DataDog/datadog-api-client-go/v2 v2.14.0 h1:cLkqg/D63I6BAxIIg6g8xMWjrAMXcvb5vbD8ixOVVyo= github.com/DataDog/datadog-api-client-go/v2 v2.14.0/go.mod h1:kntOqXEh1SmjwSDzW/eJkr9kS7EqttvEkelglWtJRbg= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5TltWcLMU= github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= -github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork h1:yBq5PrAtrM4yVeSzQ+bn050+Ysp++RKF1QmtkL4VqvU= -github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork/go.mod h1:yA5JwkZsHTLuqq3zaRgUQf35DfDkpOZqgtBqHKpwrBs= +github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9lyd9I= +github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc h1:gtlKB6B50/UEuFm1LeMn0R5a+tubx69OecPqxfXJDmU= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc/go.mod h1:oyPC4jWHHjVVNjslDAKp8EqfQBaSmODjHt4HCX+C+9Q= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.5.2 h1:nwZgSRQb8edVTVcFj5tkl3u3BaP6XrFxSw+tEv9A0hY= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.5.2/go.mod h1:u+DVO6wIQjBFuz2YzDhxOhHB5vf9CTKxB+9cJYs8SRk= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.5.2 h1:W47xIROVye+D6WxkZcy8ETomfZlTNWoVZODwAh4LdeE= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2 h1:JRVQga0KlFCMyuKF/ghrZtRpmYL3XWRGXpSB5Qdk5Ko= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2/go.mod h1:6x6OujLzkt7Wwlu/6kYO5+8FNRBi1HEw8Qm6/qvTOQA= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.5.2 h1:xY5LVtbmcm3zZ8Ccxc8+mzkEmlOdeNQnXPDdZiXiXq4= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.5.2/go.mod h1:Ge92/UCQeo8i0RQgSnowR9uto3VhyxM6YS3W6xJD8rc= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2 h1:FbQSZ6uXhuHzgwC73MUxqvHwV0uxKiGAeAAZIMrfUAc= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2/go.mod h1:oPpGMNpwga8zTGUJfLy3Z/u4l6bvEYuRatJkgSUazr4= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2 h1:C0uzQwHCKubfmbvaZF/Qi6ernigbcoWt9A+U+s0iQGg= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2/go.mod h1:RT78x34OmVb0wuZLtmzzRRy43+7pCCA6ZEOGQ9mA5w0= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.6.0 h1:6nueMcvYoTJ52m21J/gUGVZqCTVpVbT7ORBne+4hMz8= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.6.0/go.mod h1:bKb9myv0VLfiRUjrbzcruMl6q+9BuFaasYbR1FyJRQY= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.6.0 h1:ApW5lG/fuofa2G9B0N4dk6GsnDEUbEm/rjaP9yqDnYA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.6.0 h1:WTLaCgzMa+rbmqArn4ctZ/uX59FdyDTQQFx0jeYEy6w= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.6.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.6.0 h1:6ZcIsN4UPyhN/oQavUtOA/rgs2J/LCOTSTQUF6DPkCQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.6.0/go.mod h1:43N05Pmj4pUAOcROMvthfM8ot3OhLUbRvMPzwf+br2k= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.6.0 h1:sTsPObsNiL1B+XmflDqsvdjr7D3j17ITLfEVNHje8ss= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.6.0/go.mod h1:Y9LznMt9ITC3Y6c/QdN4Wgi0ZR7J6KQHomzcV4jrJ6s= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.6.0 h1:xSKBuZlJdEYfiiRLuSSgjK+x+27qwmpSLVd4ZA09Uww= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.6.0/go.mod h1:RVfXtkRqg/wiDqIo7Pr7L/bxie8jiEVM9wIOXYPbJKk= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= @@ -1050,7 +1052,6 @@ github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4= github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= @@ -1345,7 +1346,6 @@ github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw 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/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= -github.com/flynn/go-docopt v0.0.0-20140912013429-f6dd2ebbb31e/go.mod h1:HyVoz1Mz5Co8TFO8EupIdlcpwShBmY98dkT2xeHkvEI= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -2392,7 +2392,6 @@ github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.9.7 h1:06xGQy5www2oN160RtEZoTvnP2sPhEfePYmCDc2szss= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -2408,7 +2407,6 @@ github.com/onsi/gomega v1.10.4/go.mod h1:g/HbgYopi++010VEqkFgJHKC09uJiW9UkXvMUuK github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -2441,8 +2439,9 @@ github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.m github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 h1:R5M2qXZiK/mWPMT4VldCOiSL9HIAMuxQZWdG0CSM5+4= github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.1.0-rc.3 h1:l04uafi6kxByhbxev7OWiuUv0LZxEsYUfDWZ6bztAuU= +github.com/opencontainers/runtime-spec v1.1.0-rc.3/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE= github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= @@ -2692,9 +2691,8 @@ github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvW github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 h1:RpforrEYXWkmGwJHIGnLZ3tTWStkjVVstwzNGqxX2Ds= github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= -github.com/secure-systems-lab/go-securesystemslib v0.3.1/go.mod h1:o8hhjkbNl2gOamKUA/eNW3xUrntHT9L4W89W1nfj43U= -github.com/secure-systems-lab/go-securesystemslib v0.5.0 h1:oTiNu0QnulMQgN/hLK124wJD/r2f9ZhIUuKIeBsCBT8= -github.com/secure-systems-lab/go-securesystemslib v0.5.0/go.mod h1:uoCqUC0Ap7jrBSEanxT+SdACYJTVplRXWLkGMuDjXqk= +github.com/secure-systems-lab/go-securesystemslib v0.7.0 h1:OwvJ5jQf9LnIAS83waAjPbcMsODrTQUpJ02eNLUoxBg= +github.com/secure-systems-lab/go-securesystemslib v0.7.0/go.mod h1:/2gYnlnHVQ6xeGtfIqFy7Do03K4cdCY0A/GlJLDKLHI= github.com/securego/gosec v0.0.0-20200203094520-d13bb6d2420c/go.mod h1:gp0gaHj0WlmPh9BdsTmo1aq6C27yIPWdxCKGFGdVKBE= github.com/securego/gosec/v2 v2.6.1/go.mod h1:I76p3NTHBXsGhybUW+cEQ692q2Vp+A0Z6ZLzDIZy+Ao= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= @@ -2842,7 +2840,6 @@ github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= @@ -3263,7 +3260,6 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -3376,7 +3372,6 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -3553,7 +3548,6 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 9fb9bd2deb8c..c631fb1241f0 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -4,14 +4,15 @@ go 1.19 require ( github.com/DataDog/agent-payload/v5 v5.0.89 - github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel + github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 + github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 github.com/DataDog/datadog-api-client-go/v2 v2.14.0 github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc - github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.5.2 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.5.2 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2 - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2 + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.6.0 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.6.0 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.6.0 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.6.0 + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.6.0 github.com/DataDog/sketches-go v1.4.2 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.18.0 github.com/aws/aws-sdk-go v1.44.316 @@ -54,14 +55,14 @@ require ( cloud.google.com/go/compute v1.20.1 // indirect cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect - github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 // indirect github.com/DataDog/datadog-go/v5 v5.1.1 // indirect - github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork // indirect + github.com/DataDog/go-tuf v1.0.1-0.5.2 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/Showmax/go-fqdn v1.0.0 // indirect @@ -74,7 +75,7 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/containerd/cgroups v1.0.4 // indirect - github.com/coreos/go-systemd/v22 v22.3.2 // indirect + github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/docker/distribution v2.8.2+incompatible // indirect github.com/docker/docker v24.0.5+incompatible // indirect @@ -143,7 +144,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.82.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc2 // indirect - github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect + github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect github.com/openshift/api v3.9.0+incompatible // indirect github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect github.com/outcaste-io/ristretto v0.2.1 // indirect @@ -158,7 +159,7 @@ require ( github.com/prometheus/procfs v0.10.1 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rs/cors v1.9.0 // indirect - github.com/secure-systems-lab/go-securesystemslib v0.5.0 // indirect + github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect github.com/shirou/gopsutil/v3 v3.23.6 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/spf13/cobra v1.7.0 // indirect diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 92c22a09618d..66d57afec232 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -49,40 +49,42 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/agent-payload/v5 v5.0.89 h1:uuLWf/exyNYBnheG9OH2dOWZpCJvaEHX3W9CAd8KarU= github.com/DataDog/agent-payload/v5 v5.0.89/go.mod h1:oQZi1VZp1e3QvlSUX4iphZCpJaFepUxWq0hNXxihKBM= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3 h1:imU7+gtggz9YPG/wJdrtLmL+bvafq+08oivQ8VRO4g8= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3 h1:LFckPfptq8yevWp5TSAbHxGv4LqaEWyRyEQAj+ioKl0= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3/go.mod h1:7uPrckBTIabtHAuoJnQes2XuDmopCImBPhM+o66DvA0= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel h1:sC2wq2fuI1r3U6FmUsn4clsrFOql5XBfs1EG15LPDEc= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel/go.mod h1:CmdN7Zrj+S+2hOSGW5hFT2LC2FVIF/avJTyvhUjaueI= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3 h1:thSia6kXdVcSozdPQOAzSDCpcPBF91ScafOzETLbJP8= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= -github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3 h1:Pb223YrOHuT2io1nDzToc+bSDoikxAITjTl9kZvjFSY= -github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3 h1:CPrsO0OU+MkjvNQhW153DQF4zuHvGkdkxGOp2M2/y34= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3 h1:gAL3HM+Tg5S0MLBjv5K8+elDJS6COf+9Io9dVh7EwYc= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 h1:g7kb8NGjApkncwuXjkEpYHjYj08hqklvjqB3Gs2uPpQ= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 h1:Htxj/RE55AeDZ+OE6+x+kJQz3toGWzR40Baq0Dknv8U= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1/go.mod h1:O3WwGRPZxs4BpB2ccUvIIPprhscWBRpudJT6mC+7sr8= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 h1:We9Y6+kwCnSOQilk2koeADjbZgMHFDl6iHBaobU5nAw= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1/go.mod h1:5Q39ZOIOwZMnFyRadp+5gH1bFdjmb+Pgxe+j5XOwaTg= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 h1:usLCrmPm2wuNedbcuArxN37E/e7UaCJ66i1tuEq7E/M= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1/go.mod h1:kxBOu4ZSem1E0JdhxjeI2jAQ7nxeRxuhjU4r9LKnRkU= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 h1:9iyw6jSwJwsFe8TooU8mqMhMfFiW6N/05OnNMg91kBY= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 h1:k4tcg077NsPJRxtuGdYEm9kge+zq5QO5x6Yv3R5BwpE= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 h1:detMhMfwchco20v12RjjRisxP3V0mtLEjcgJZGk2cmg= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 h1:EOrKgyyubncuS4LpF8aCj/12i1+GmPV+PCfj8mDaF2c= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= github.com/DataDog/datadog-api-client-go/v2 v2.14.0 h1:cLkqg/D63I6BAxIIg6g8xMWjrAMXcvb5vbD8ixOVVyo= github.com/DataDog/datadog-api-client-go/v2 v2.14.0/go.mod h1:kntOqXEh1SmjwSDzW/eJkr9kS7EqttvEkelglWtJRbg= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5TltWcLMU= github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= -github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork h1:yBq5PrAtrM4yVeSzQ+bn050+Ysp++RKF1QmtkL4VqvU= -github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork/go.mod h1:yA5JwkZsHTLuqq3zaRgUQf35DfDkpOZqgtBqHKpwrBs= +github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9lyd9I= +github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc h1:gtlKB6B50/UEuFm1LeMn0R5a+tubx69OecPqxfXJDmU= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc/go.mod h1:oyPC4jWHHjVVNjslDAKp8EqfQBaSmODjHt4HCX+C+9Q= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.5.2 h1:nwZgSRQb8edVTVcFj5tkl3u3BaP6XrFxSw+tEv9A0hY= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.5.2/go.mod h1:u+DVO6wIQjBFuz2YzDhxOhHB5vf9CTKxB+9cJYs8SRk= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.5.2 h1:W47xIROVye+D6WxkZcy8ETomfZlTNWoVZODwAh4LdeE= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2 h1:JRVQga0KlFCMyuKF/ghrZtRpmYL3XWRGXpSB5Qdk5Ko= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2/go.mod h1:6x6OujLzkt7Wwlu/6kYO5+8FNRBi1HEw8Qm6/qvTOQA= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.5.2 h1:xY5LVtbmcm3zZ8Ccxc8+mzkEmlOdeNQnXPDdZiXiXq4= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.5.2/go.mod h1:Ge92/UCQeo8i0RQgSnowR9uto3VhyxM6YS3W6xJD8rc= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2 h1:FbQSZ6uXhuHzgwC73MUxqvHwV0uxKiGAeAAZIMrfUAc= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2/go.mod h1:oPpGMNpwga8zTGUJfLy3Z/u4l6bvEYuRatJkgSUazr4= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2 h1:C0uzQwHCKubfmbvaZF/Qi6ernigbcoWt9A+U+s0iQGg= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2/go.mod h1:RT78x34OmVb0wuZLtmzzRRy43+7pCCA6ZEOGQ9mA5w0= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.6.0 h1:6nueMcvYoTJ52m21J/gUGVZqCTVpVbT7ORBne+4hMz8= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.6.0/go.mod h1:bKb9myv0VLfiRUjrbzcruMl6q+9BuFaasYbR1FyJRQY= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.6.0 h1:ApW5lG/fuofa2G9B0N4dk6GsnDEUbEm/rjaP9yqDnYA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.6.0 h1:WTLaCgzMa+rbmqArn4ctZ/uX59FdyDTQQFx0jeYEy6w= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.6.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.6.0 h1:6ZcIsN4UPyhN/oQavUtOA/rgs2J/LCOTSTQUF6DPkCQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.6.0/go.mod h1:43N05Pmj4pUAOcROMvthfM8ot3OhLUbRvMPzwf+br2k= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.6.0 h1:sTsPObsNiL1B+XmflDqsvdjr7D3j17ITLfEVNHje8ss= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.6.0/go.mod h1:Y9LznMt9ITC3Y6c/QdN4Wgi0ZR7J6KQHomzcV4jrJ6s= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.6.0 h1:xSKBuZlJdEYfiiRLuSSgjK+x+27qwmpSLVd4ZA09Uww= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.6.0/go.mod h1:RVfXtkRqg/wiDqIo7Pr7L/bxie8jiEVM9wIOXYPbJKk= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= @@ -163,13 +165,13 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k= -github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4= github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= github.com/containerd/containerd v1.6.19 h1:F0qgQPrG0P2JPgwpxWxYavrVeXAG0ezUIB9Z/4FTUAU= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/dockercfg v0.3.1 h1:/FpZ+JaygUR/lZP2NlFI2DVfrOEMAIKP5wWEJdoYe9E= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -215,7 +217,6 @@ github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8Wlg github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= 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/flynn/go-docopt v0.0.0-20140912013429-f6dd2ebbb31e/go.mod h1:HyVoz1Mz5Co8TFO8EupIdlcpwShBmY98dkT2xeHkvEI= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -264,7 +265,6 @@ github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= @@ -346,7 +346,6 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -424,7 +423,6 @@ github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKe github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM= github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= @@ -544,33 +542,23 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/observiq/nanojack v0.0.0-20201106172433-343928847ebc h1:49ewVBwLcy+eYqI4R0ICilCI4dPjddpFXWv3liXzUxM= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= -github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ= github.com/opencontainers/runc v1.1.5 h1:L44KXEpKmfWDcS02aeGm8QNTFXTo2D+8MYGDIJ/GDEs= -github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 h1:3snG66yBm59tKhhSPQrQ/0bCrv1LQbKt40LnUPiUxdc= -github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.1.0-rc.3 h1:l04uafi6kxByhbxev7OWiuUv0LZxEsYUfDWZ6bztAuU= +github.com/opencontainers/runtime-spec v1.1.0-rc.3/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/openshift/api v0.0.0-20180801171038-322a19404e37 h1:05irGU4HK4IauGGDbsk+ZHrm1wOzMLYjMlfaiqMrBYc= github.com/openshift/api v0.0.0-20180801171038-322a19404e37/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= github.com/openshift/api v0.0.0-20210521075222-e273a339932a/go.mod h1:izBmoXbUu3z5kUa4FjZhvekTsyzIWiOoaIgJiZBBMQs= @@ -651,9 +639,8 @@ github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFo github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/secure-systems-lab/go-securesystemslib v0.3.1/go.mod h1:o8hhjkbNl2gOamKUA/eNW3xUrntHT9L4W89W1nfj43U= -github.com/secure-systems-lab/go-securesystemslib v0.5.0 h1:oTiNu0QnulMQgN/hLK124wJD/r2f9ZhIUuKIeBsCBT8= -github.com/secure-systems-lab/go-securesystemslib v0.5.0/go.mod h1:uoCqUC0Ap7jrBSEanxT+SdACYJTVplRXWLkGMuDjXqk= +github.com/secure-systems-lab/go-securesystemslib v0.7.0 h1:OwvJ5jQf9LnIAS83waAjPbcMsODrTQUpJ02eNLUoxBg= +github.com/secure-systems-lab/go-securesystemslib v0.7.0/go.mod h1:/2gYnlnHVQ6xeGtfIqFy7Do03K4cdCY0A/GlJLDKLHI= github.com/shirou/gopsutil/v3 v3.22.2/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY= github.com/shirou/gopsutil/v3 v3.23.6 h1:5y46WPI9QBKBbK7EEccUPNXpJpNrvPuTD0O2zHEHT08= github.com/shirou/gopsutil/v3 v3.23.6/go.mod h1:j7QX50DrXYggrpN30W0Mo+I4/8U2UUIQrnrhqUeWrAU= @@ -693,7 +680,6 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= -github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/testcontainers/testcontainers-go v0.21.0 h1:syePAxdeTzfkap+RrJaQZpJQ/s/fsUgn11xIvHrOE9U= github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0= github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw= @@ -836,7 +822,6 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -904,11 +889,9 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/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= @@ -916,9 +899,7 @@ golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v 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-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= @@ -969,7 +950,6 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/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= @@ -977,7 +957,6 @@ golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7w 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-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -994,16 +973,13 @@ golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/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-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/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-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/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-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1106,7 +1082,6 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= diff --git a/exporter/datadogexporter/internal/metrics/consumer.go b/exporter/datadogexporter/internal/metrics/consumer.go index 18bf67868369..0f7ad4602b2d 100644 --- a/exporter/datadogexporter/internal/metrics/consumer.go +++ b/exporter/datadogexporter/internal/metrics/consumer.go @@ -6,7 +6,7 @@ package metrics // import "github.com/open-telemetry/opentelemetry-collector-con import ( "context" - "github.com/DataDog/datadog-agent/pkg/trace/pb" + pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace" "github.com/DataDog/datadog-api-client-go/v2/api/datadog" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV2" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics" @@ -26,7 +26,7 @@ var _ metrics.APMStatsConsumer = (*Consumer)(nil) type Consumer struct { ms []datadogV2.MetricSeries sl sketches.SketchSeriesList - as []pb.ClientStatsPayload + as []*pb.ClientStatsPayload seenHosts map[string]struct{} seenTags map[string]struct{} } @@ -80,7 +80,7 @@ func (c *Consumer) runningMetrics(timestamp uint64, buildInfo component.BuildInf } // All gets all metrics (consumed metrics and running metrics). -func (c *Consumer) All(timestamp uint64, buildInfo component.BuildInfo, tags []string, metadata metrics.Metadata) ([]datadogV2.MetricSeries, sketches.SketchSeriesList, []pb.ClientStatsPayload) { +func (c *Consumer) All(timestamp uint64, buildInfo component.BuildInfo, tags []string, metadata metrics.Metadata) ([]datadogV2.MetricSeries, sketches.SketchSeriesList, []*pb.ClientStatsPayload) { series := c.ms series = append(series, c.runningMetrics(timestamp, buildInfo, metadata)...) if len(tags) == 0 { @@ -99,7 +99,7 @@ func (c *Consumer) All(timestamp uint64, buildInfo component.BuildInfo, tags []s } // ConsumeAPMStats implements metrics.APMStatsConsumer. -func (c *Consumer) ConsumeAPMStats(s pb.ClientStatsPayload) { +func (c *Consumer) ConsumeAPMStats(s *pb.ClientStatsPayload) { c.as = append(c.as, s) } diff --git a/exporter/datadogexporter/internal/metrics/consumer_deprecated.go b/exporter/datadogexporter/internal/metrics/consumer_deprecated.go index 72f291cc9fac..a22db4b0671f 100644 --- a/exporter/datadogexporter/internal/metrics/consumer_deprecated.go +++ b/exporter/datadogexporter/internal/metrics/consumer_deprecated.go @@ -6,7 +6,7 @@ package metrics // import "github.com/open-telemetry/opentelemetry-collector-con import ( "context" - "github.com/DataDog/datadog-agent/pkg/trace/pb" + pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics" "github.com/DataDog/opentelemetry-mapping-go/pkg/quantile" "go.opentelemetry.io/collector/component" @@ -25,7 +25,7 @@ var _ metrics.APMStatsConsumer = (*ZorkianConsumer)(nil) type ZorkianConsumer struct { ms []zorkian.Metric sl sketches.SketchSeriesList - as []pb.ClientStatsPayload + as []*pb.ClientStatsPayload seenHosts map[string]struct{} seenTags map[string]struct{} } @@ -72,7 +72,7 @@ func (c *ZorkianConsumer) runningMetrics(timestamp uint64, buildInfo component.B } // All gets all metrics (consumed metrics and running metrics). -func (c *ZorkianConsumer) All(timestamp uint64, buildInfo component.BuildInfo, tags []string) ([]zorkian.Metric, sketches.SketchSeriesList, []pb.ClientStatsPayload) { +func (c *ZorkianConsumer) All(timestamp uint64, buildInfo component.BuildInfo, tags []string) ([]zorkian.Metric, sketches.SketchSeriesList, []*pb.ClientStatsPayload) { series := c.ms series = append(series, c.runningMetrics(timestamp, buildInfo)...) if len(tags) == 0 { @@ -91,7 +91,7 @@ func (c *ZorkianConsumer) All(timestamp uint64, buildInfo component.BuildInfo, t } // ConsumeAPMStats implements metrics.APMStatsConsumer. -func (c *ZorkianConsumer) ConsumeAPMStats(s pb.ClientStatsPayload) { +func (c *ZorkianConsumer) ConsumeAPMStats(s *pb.ClientStatsPayload) { c.as = append(c.as, s) } diff --git a/exporter/datadogexporter/internal/metrics/consumer_deprecated_test.go b/exporter/datadogexporter/internal/metrics/consumer_deprecated_test.go index fff7f4f2eaff..aa7434059ca1 100644 --- a/exporter/datadogexporter/internal/metrics/consumer_deprecated_test.go +++ b/exporter/datadogexporter/internal/metrics/consumer_deprecated_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "github.com/DataDog/datadog-agent/pkg/trace/pb" + pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -115,7 +115,7 @@ func TestZorkianConsumeAPMStats(t *testing.T) { _, _, out := c.All(0, component.BuildInfo{}, []string{}) require.ElementsMatch(t, out, testutil.StatsPayloads) _, _, out = c.All(0, component.BuildInfo{}, []string{"extra:key"}) - var copies []pb.ClientStatsPayload + var copies []*pb.ClientStatsPayload for _, sp := range testutil.StatsPayloads { sp.Tags = append(sp.Tags, "extra:key") copies = append(copies, sp) diff --git a/exporter/datadogexporter/internal/metrics/consumer_test.go b/exporter/datadogexporter/internal/metrics/consumer_test.go index cc193ae6037a..37bceedf1861 100644 --- a/exporter/datadogexporter/internal/metrics/consumer_test.go +++ b/exporter/datadogexporter/internal/metrics/consumer_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "github.com/DataDog/datadog-agent/pkg/trace/pb" + pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes/source" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics" @@ -133,7 +133,7 @@ func TestConsumeAPMStats(t *testing.T) { _, _, out := c.All(0, component.BuildInfo{}, []string{}, md) require.ElementsMatch(t, out, testutil.StatsPayloads) _, _, out = c.All(0, component.BuildInfo{}, []string{"extra:key"}, md) - var copies []pb.ClientStatsPayload + var copies []*pb.ClientStatsPayload for _, sp := range testutil.StatsPayloads { sp.Tags = append(sp.Tags, "extra:key") copies = append(copies, sp) diff --git a/exporter/datadogexporter/internal/testutil/test_utils.go b/exporter/datadogexporter/internal/testutil/test_utils.go index 0661282b0f79..b23fc2024a2a 100644 --- a/exporter/datadogexporter/internal/testutil/test_utils.go +++ b/exporter/datadogexporter/internal/testutil/test_utils.go @@ -12,7 +12,7 @@ import ( "net/http" "net/http/httptest" - "github.com/DataDog/datadog-agent/pkg/trace/pb" + pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes/source" "github.com/DataDog/sketches-go/ddsketch" "go.opentelemetry.io/collector/pdata/pcommon" @@ -223,15 +223,15 @@ func (s *MockSourceProvider) Source(_ context.Context) (source.Source, error) { } type MockStatsProcessor struct { - In []pb.ClientStatsPayload + In []*pb.ClientStatsPayload } -func (s *MockStatsProcessor) ProcessStats(in pb.ClientStatsPayload, _, _ string) { +func (s *MockStatsProcessor) ProcessStats(in *pb.ClientStatsPayload, _, _ string) { s.In = append(s.In, in) } -// StatsPayloads contains a couple of pb.ClientStatsPayloads used for testing. -var StatsPayloads = []pb.ClientStatsPayload{ +// StatsPayloads contains a couple of *pb.ClientStatsPayloads used for testing. +var StatsPayloads = []*pb.ClientStatsPayload{ { Hostname: "host", Env: "prod", @@ -244,11 +244,11 @@ var StatsPayloads = []pb.ClientStatsPayload{ Service: "mysql", ContainerID: "abcdef123456", Tags: []string{"a:b", "c:d"}, - Stats: []pb.ClientStatsBucket{ + Stats: []*pb.ClientStatsBucket{ { Start: 10, Duration: 1, - Stats: []pb.ClientGroupedStats{ + Stats: []*pb.ClientGroupedStats{ { Service: "kafka", Name: "queue.add", @@ -278,11 +278,11 @@ var StatsPayloads = []pb.ClientStatsPayload{ Service: "mysql2", ContainerID: "abcdef1234562", Tags: []string{"a:b2", "c:d2"}, - Stats: []pb.ClientStatsBucket{ + Stats: []*pb.ClientStatsBucket{ { Start: 102, Duration: 12, - Stats: []pb.ClientGroupedStats{ + Stats: []*pb.ClientGroupedStats{ { Service: "kafka2", Name: "queue.add2", diff --git a/exporter/datadogexporter/logs_exporter.go b/exporter/datadogexporter/logs_exporter.go index 94881e9bbb86..ae775a78e067 100644 --- a/exporter/datadogexporter/logs_exporter.go +++ b/exporter/datadogexporter/logs_exporter.go @@ -22,6 +22,9 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/scrub" ) +// otelTag specifies a tag to be added to all logs sent from the Datadog exporter +const otelTag = "otel_source:datadog_exporter" + type logsExporter struct { params exporter.CreateSettings cfg *Config @@ -101,7 +104,7 @@ func (exp *logsExporter) consumeLogs(_ context.Context, ld plog.Logs) (err error } rsl := ld.ResourceLogs() - var payload []datadogV2.HTTPLogItem + var payloads []datadogV2.HTTPLogItem // Iterate over resource logs for i := 0; i < rsl.Len(); i++ { rl := rsl.At(i) @@ -113,9 +116,16 @@ func (exp *logsExporter) consumeLogs(_ context.Context, ld plog.Logs) (err error // iterate over Logs for k := 0; k < lsl.Len(); k++ { log := lsl.At(k) - payload = append(payload, logsmapping.Transform(log, res, exp.params.Logger)) + payload := logsmapping.Transform(log, res, exp.params.Logger) + ddtags := payload.GetDdtags() + if ddtags != "" { + payload.SetDdtags(ddtags + "," + otelTag) + } else { + payload.SetDdtags(otelTag) + } + payloads = append(payloads, payload) } } } - return exp.sender.SubmitLogs(exp.ctx, payload) + return exp.sender.SubmitLogs(exp.ctx, payloads) } diff --git a/exporter/datadogexporter/logs_exporter_test.go b/exporter/datadogexporter/logs_exporter_test.go index 0c17f2e23427..7f01c3629af9 100644 --- a/exporter/datadogexporter/logs_exporter_test.go +++ b/exporter/datadogexporter/logs_exporter_test.go @@ -54,6 +54,7 @@ func TestLogsExporter(t *testing.T) { "otel.span_id": traceutil.SpanIDToHexOrEmptyString(ld.SpanID()), "otel.trace_id": traceutil.TraceIDToHexOrEmptyString(ld.TraceID()), "otel.timestamp": fmt.Sprintf("%d", testdata.TestLogTime.UnixNano()), + "resource-attr": "resource-attr-val-1", }, }, }, @@ -83,6 +84,7 @@ func TestLogsExporter(t *testing.T) { "otel.span_id": traceutil.SpanIDToHexOrEmptyString(ld.SpanID()), "otel.trace_id": traceutil.TraceIDToHexOrEmptyString(ld.TraceID()), "otel.timestamp": fmt.Sprintf("%d", testdata.TestLogTime.UnixNano()), + "resource-attr": "resource-attr-val-1", }, }, }, @@ -112,6 +114,7 @@ func TestLogsExporter(t *testing.T) { "otel.span_id": traceutil.SpanIDToHexOrEmptyString(ld.SpanID()), "otel.trace_id": traceutil.TraceIDToHexOrEmptyString(ld.TraceID()), "otel.timestamp": fmt.Sprintf("%d", testdata.TestLogTime.UnixNano()), + "resource-attr": "resource-attr-val-1", }, }, }, @@ -143,6 +146,7 @@ func TestLogsExporter(t *testing.T) { "otel.span_id": traceutil.SpanIDToHexOrEmptyString(ld.SpanID()), "otel.trace_id": traceutil.TraceIDToHexOrEmptyString(ld.TraceID()), "otel.timestamp": fmt.Sprintf("%d", testdata.TestLogTime.UnixNano()), + "resource-attr": "resource-attr-val-1", }, { "message": "something happened", @@ -154,6 +158,7 @@ func TestLogsExporter(t *testing.T) { "otel.severity_text": "Info", "otel.severity_number": "9", "otel.timestamp": fmt.Sprintf("%d", testdata.TestLogTime.UnixNano()), + "resource-attr": "resource-attr-val-1", }, }, }, @@ -185,6 +190,7 @@ func TestLogsExporter(t *testing.T) { "otel.span_id": traceutil.SpanIDToHexOrEmptyString(ld.SpanID()), "otel.trace_id": traceutil.TraceIDToHexOrEmptyString(ld.TraceID()), "otel.timestamp": fmt.Sprintf("%d", testdata.TestLogTime.UnixNano()), + "resource-attr": "resource-attr-val-1", }, { "message": "something happened", @@ -196,6 +202,7 @@ func TestLogsExporter(t *testing.T) { "otel.severity_text": "Info", "otel.severity_number": "9", "otel.timestamp": fmt.Sprintf("%d", testdata.TestLogTime.UnixNano()), + "resource-attr": "resource-attr-val-1", }, }, }, diff --git a/exporter/datadogexporter/metrics_exporter.go b/exporter/datadogexporter/metrics_exporter.go index 67a2c1dde470..8f2445e51820 100644 --- a/exporter/datadogexporter/metrics_exporter.go +++ b/exporter/datadogexporter/metrics_exporter.go @@ -11,8 +11,8 @@ import ( "sync" "time" + pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace" "github.com/DataDog/datadog-agent/pkg/trace/api" - "github.com/DataDog/datadog-agent/pkg/trace/pb" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV2" "github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes/source" @@ -219,7 +219,7 @@ func (exp *metricsExporter) PushMetricsData(ctx context.Context, md pmetric.Metr } var sl sketches.SketchSeriesList - var sp []pb.ClientStatsPayload + var sp []*pb.ClientStatsPayload if isMetricExportV2Enabled() { var ms []datadogV2.MetricSeries ms, sl, sp = consumer.(*metrics.Consumer).All(exp.getPushTime(), exp.params.BuildInfo, tags, metadata) diff --git a/exporter/datadogexporter/metrics_exporter_test.go b/exporter/datadogexporter/metrics_exporter_test.go index 19d893f76403..1d5f20d7b25f 100644 --- a/exporter/datadogexporter/metrics_exporter_test.go +++ b/exporter/datadogexporter/metrics_exporter_test.go @@ -15,7 +15,7 @@ import ( "time" "github.com/DataDog/agent-payload/v5/gogen" - "github.com/DataDog/datadog-agent/pkg/trace/pb" + pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV2" "github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata" "github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata/payload" @@ -102,7 +102,7 @@ func Test_metricsExporter_PushMetricsData(t *testing.T) { expectedSeries map[string]interface{} expectedSketchPayload *gogen.SketchPayload expectedErr error - expectedStats []pb.ClientStatsPayload + expectedStats []*pb.ClientStatsPayload }{ { metrics: createTestMetrics(attrs), @@ -430,7 +430,7 @@ func Test_metricsExporter_PushMetricsData_Zorkian(t *testing.T) { expectedSeries map[string]interface{} expectedSketchPayload *gogen.SketchPayload expectedErr error - expectedStats []pb.ClientStatsPayload + expectedStats []*pb.ClientStatsPayload }{ { metrics: createTestMetrics(attrs), @@ -756,7 +756,7 @@ func createTestMetricsWithStats() pmetric.Metrics { panic(err) } src := trans. - StatsPayloadToMetrics(pb.StatsPayload{Stats: testutil.StatsPayloads}). + StatsPayloadToMetrics(&pb.StatsPayload{Stats: testutil.StatsPayloads}). ResourceMetrics() src.MoveAndAppendTo(dest) return md diff --git a/go.mod b/go.mod index 1480ec095fa6..1b3b6e352329 100644 --- a/go.mod +++ b/go.mod @@ -229,22 +229,23 @@ require ( github.com/ClickHouse/ch-go v0.52.1 // indirect github.com/ClickHouse/clickhouse-go/v2 v2.12.1 // indirect github.com/DataDog/agent-payload/v5 v5.0.89 // indirect - github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel // indirect - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 // indirect github.com/DataDog/datadog-api-client-go/v2 v2.14.0 // indirect github.com/DataDog/datadog-go/v5 v5.1.1 // indirect - github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork // indirect + github.com/DataDog/go-tuf v1.0.1-0.5.2 // indirect github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.5.2 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.5.2 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.6.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.6.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.6.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.6.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.6.0 // indirect github.com/DataDog/sketches-go v1.4.2 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect @@ -525,7 +526,7 @@ require ( github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc2 // indirect github.com/opencontainers/runc v1.1.5 // indirect - github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect + github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect github.com/opencontainers/selinux v1.10.1 // indirect github.com/openshift/api v3.9.0+incompatible // indirect github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect @@ -560,7 +561,7 @@ require ( github.com/scaleway/scaleway-sdk-go v1.0.0-beta.15 // indirect github.com/scalyr/dataset-go v0.12.1 // indirect github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect - github.com/secure-systems-lab/go-securesystemslib v0.5.0 // indirect + github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect github.com/segmentio/asm v1.2.0 // indirect github.com/shirou/gopsutil/v3 v3.23.6 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect diff --git a/go.sum b/go.sum index ee42e9b60237..f3bd5f760bf3 100644 --- a/go.sum +++ b/go.sum @@ -724,40 +724,42 @@ github.com/ClickHouse/clickhouse-go/v2 v2.12.1/go.mod h1:W/UQ/GchOF+Q0k5iv6ZanLK github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DataDog/agent-payload/v5 v5.0.89 h1:uuLWf/exyNYBnheG9OH2dOWZpCJvaEHX3W9CAd8KarU= github.com/DataDog/agent-payload/v5 v5.0.89/go.mod h1:oQZi1VZp1e3QvlSUX4iphZCpJaFepUxWq0hNXxihKBM= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3 h1:imU7+gtggz9YPG/wJdrtLmL+bvafq+08oivQ8VRO4g8= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3 h1:LFckPfptq8yevWp5TSAbHxGv4LqaEWyRyEQAj+ioKl0= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3/go.mod h1:7uPrckBTIabtHAuoJnQes2XuDmopCImBPhM+o66DvA0= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel h1:sC2wq2fuI1r3U6FmUsn4clsrFOql5XBfs1EG15LPDEc= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel/go.mod h1:CmdN7Zrj+S+2hOSGW5hFT2LC2FVIF/avJTyvhUjaueI= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3 h1:thSia6kXdVcSozdPQOAzSDCpcPBF91ScafOzETLbJP8= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= -github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3 h1:Pb223YrOHuT2io1nDzToc+bSDoikxAITjTl9kZvjFSY= -github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3 h1:CPrsO0OU+MkjvNQhW153DQF4zuHvGkdkxGOp2M2/y34= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3 h1:gAL3HM+Tg5S0MLBjv5K8+elDJS6COf+9Io9dVh7EwYc= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 h1:g7kb8NGjApkncwuXjkEpYHjYj08hqklvjqB3Gs2uPpQ= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 h1:Htxj/RE55AeDZ+OE6+x+kJQz3toGWzR40Baq0Dknv8U= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1/go.mod h1:O3WwGRPZxs4BpB2ccUvIIPprhscWBRpudJT6mC+7sr8= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 h1:We9Y6+kwCnSOQilk2koeADjbZgMHFDl6iHBaobU5nAw= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1/go.mod h1:5Q39ZOIOwZMnFyRadp+5gH1bFdjmb+Pgxe+j5XOwaTg= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 h1:usLCrmPm2wuNedbcuArxN37E/e7UaCJ66i1tuEq7E/M= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1/go.mod h1:kxBOu4ZSem1E0JdhxjeI2jAQ7nxeRxuhjU4r9LKnRkU= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 h1:9iyw6jSwJwsFe8TooU8mqMhMfFiW6N/05OnNMg91kBY= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 h1:k4tcg077NsPJRxtuGdYEm9kge+zq5QO5x6Yv3R5BwpE= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 h1:detMhMfwchco20v12RjjRisxP3V0mtLEjcgJZGk2cmg= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 h1:EOrKgyyubncuS4LpF8aCj/12i1+GmPV+PCfj8mDaF2c= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= github.com/DataDog/datadog-api-client-go/v2 v2.14.0 h1:cLkqg/D63I6BAxIIg6g8xMWjrAMXcvb5vbD8ixOVVyo= github.com/DataDog/datadog-api-client-go/v2 v2.14.0/go.mod h1:kntOqXEh1SmjwSDzW/eJkr9kS7EqttvEkelglWtJRbg= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5TltWcLMU= github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= -github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork h1:yBq5PrAtrM4yVeSzQ+bn050+Ysp++RKF1QmtkL4VqvU= -github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork/go.mod h1:yA5JwkZsHTLuqq3zaRgUQf35DfDkpOZqgtBqHKpwrBs= +github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9lyd9I= +github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc h1:gtlKB6B50/UEuFm1LeMn0R5a+tubx69OecPqxfXJDmU= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc/go.mod h1:oyPC4jWHHjVVNjslDAKp8EqfQBaSmODjHt4HCX+C+9Q= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.5.2 h1:nwZgSRQb8edVTVcFj5tkl3u3BaP6XrFxSw+tEv9A0hY= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.5.2/go.mod h1:u+DVO6wIQjBFuz2YzDhxOhHB5vf9CTKxB+9cJYs8SRk= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.5.2 h1:W47xIROVye+D6WxkZcy8ETomfZlTNWoVZODwAh4LdeE= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2 h1:JRVQga0KlFCMyuKF/ghrZtRpmYL3XWRGXpSB5Qdk5Ko= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2/go.mod h1:6x6OujLzkt7Wwlu/6kYO5+8FNRBi1HEw8Qm6/qvTOQA= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.5.2 h1:xY5LVtbmcm3zZ8Ccxc8+mzkEmlOdeNQnXPDdZiXiXq4= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.5.2/go.mod h1:Ge92/UCQeo8i0RQgSnowR9uto3VhyxM6YS3W6xJD8rc= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2 h1:FbQSZ6uXhuHzgwC73MUxqvHwV0uxKiGAeAAZIMrfUAc= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2/go.mod h1:oPpGMNpwga8zTGUJfLy3Z/u4l6bvEYuRatJkgSUazr4= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2 h1:C0uzQwHCKubfmbvaZF/Qi6ernigbcoWt9A+U+s0iQGg= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2/go.mod h1:RT78x34OmVb0wuZLtmzzRRy43+7pCCA6ZEOGQ9mA5w0= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.6.0 h1:6nueMcvYoTJ52m21J/gUGVZqCTVpVbT7ORBne+4hMz8= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.6.0/go.mod h1:bKb9myv0VLfiRUjrbzcruMl6q+9BuFaasYbR1FyJRQY= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.6.0 h1:ApW5lG/fuofa2G9B0N4dk6GsnDEUbEm/rjaP9yqDnYA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.6.0 h1:WTLaCgzMa+rbmqArn4ctZ/uX59FdyDTQQFx0jeYEy6w= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.6.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.6.0 h1:6ZcIsN4UPyhN/oQavUtOA/rgs2J/LCOTSTQUF6DPkCQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.6.0/go.mod h1:43N05Pmj4pUAOcROMvthfM8ot3OhLUbRvMPzwf+br2k= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.6.0 h1:sTsPObsNiL1B+XmflDqsvdjr7D3j17ITLfEVNHje8ss= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.6.0/go.mod h1:Y9LznMt9ITC3Y6c/QdN4Wgi0ZR7J6KQHomzcV4jrJ6s= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.6.0 h1:xSKBuZlJdEYfiiRLuSSgjK+x+27qwmpSLVd4ZA09Uww= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.6.0/go.mod h1:RVfXtkRqg/wiDqIo7Pr7L/bxie8jiEVM9wIOXYPbJKk= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= @@ -1108,7 +1110,6 @@ github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4= github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= @@ -1403,7 +1404,6 @@ github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw 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/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= -github.com/flynn/go-docopt v0.0.0-20140912013429-f6dd2ebbb31e/go.mod h1:HyVoz1Mz5Co8TFO8EupIdlcpwShBmY98dkT2xeHkvEI= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -2478,7 +2478,6 @@ github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= github.com/onsi/ginkgo/v2 v2.9.7 h1:06xGQy5www2oN160RtEZoTvnP2sPhEfePYmCDc2szss= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -2494,7 +2493,6 @@ github.com/onsi/gomega v1.10.4/go.mod h1:g/HbgYopi++010VEqkFgJHKC09uJiW9UkXvMUuK github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -2527,8 +2525,9 @@ github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.m github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 h1:R5M2qXZiK/mWPMT4VldCOiSL9HIAMuxQZWdG0CSM5+4= github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.1.0-rc.3 h1:l04uafi6kxByhbxev7OWiuUv0LZxEsYUfDWZ6bztAuU= +github.com/opencontainers/runtime-spec v1.1.0-rc.3/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE= github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= @@ -2778,9 +2777,8 @@ github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvW github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 h1:RpforrEYXWkmGwJHIGnLZ3tTWStkjVVstwzNGqxX2Ds= github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= -github.com/secure-systems-lab/go-securesystemslib v0.3.1/go.mod h1:o8hhjkbNl2gOamKUA/eNW3xUrntHT9L4W89W1nfj43U= -github.com/secure-systems-lab/go-securesystemslib v0.5.0 h1:oTiNu0QnulMQgN/hLK124wJD/r2f9ZhIUuKIeBsCBT8= -github.com/secure-systems-lab/go-securesystemslib v0.5.0/go.mod h1:uoCqUC0Ap7jrBSEanxT+SdACYJTVplRXWLkGMuDjXqk= +github.com/secure-systems-lab/go-securesystemslib v0.7.0 h1:OwvJ5jQf9LnIAS83waAjPbcMsODrTQUpJ02eNLUoxBg= +github.com/secure-systems-lab/go-securesystemslib v0.7.0/go.mod h1:/2gYnlnHVQ6xeGtfIqFy7Do03K4cdCY0A/GlJLDKLHI= github.com/securego/gosec v0.0.0-20200203094520-d13bb6d2420c/go.mod h1:gp0gaHj0WlmPh9BdsTmo1aq6C27yIPWdxCKGFGdVKBE= github.com/securego/gosec/v2 v2.6.1/go.mod h1:I76p3NTHBXsGhybUW+cEQ692q2Vp+A0Z6ZLzDIZy+Ao= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= @@ -2929,7 +2927,6 @@ github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= @@ -3350,7 +3347,6 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210915214749-c084706c2272/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -3480,7 +3476,6 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -3674,7 +3669,6 @@ golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/internal/datadog/agent.go b/internal/datadog/agent.go index 9373646fca7d..43656a6a7528 100644 --- a/internal/datadog/agent.go +++ b/internal/datadog/agent.go @@ -10,10 +10,10 @@ import ( "sync" "time" + pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace" "github.com/DataDog/datadog-agent/pkg/trace/agent" "github.com/DataDog/datadog-agent/pkg/trace/api" traceconfig "github.com/DataDog/datadog-agent/pkg/trace/config" - "github.com/DataDog/datadog-agent/pkg/trace/pb" "github.com/DataDog/datadog-agent/pkg/trace/stats" "github.com/DataDog/datadog-agent/pkg/trace/telemetry" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics" @@ -41,12 +41,12 @@ type TraceAgent struct { // newAgent creates a new unstarted traceagent using the given context. Call Start to start the traceagent. // The out channel will receive outoing stats payloads resulting from spans ingested using the Ingest method. -func NewAgent(ctx context.Context, out chan pb.StatsPayload) *TraceAgent { +func NewAgent(ctx context.Context, out chan *pb.StatsPayload) *TraceAgent { return NewAgentWithConfig(ctx, traceconfig.New(), out) } // newAgentWithConfig creates a new traceagent with the given config cfg. Used in tests; use newAgent instead. -func NewAgentWithConfig(ctx context.Context, cfg *traceconfig.AgentConfig, out chan pb.StatsPayload) *TraceAgent { +func NewAgentWithConfig(ctx context.Context, cfg *traceconfig.AgentConfig, out chan *pb.StatsPayload) *TraceAgent { // disable the HTTP receiver cfg.ReceiverPort = 0 // set the API key to succeed startup; it is never used nor needed diff --git a/internal/datadog/agent_test.go b/internal/datadog/agent_test.go index 8c338137974b..de754786417c 100644 --- a/internal/datadog/agent_test.go +++ b/internal/datadog/agent_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" + pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace" traceconfig "github.com/DataDog/datadog-agent/pkg/trace/config" - "github.com/DataDog/datadog-agent/pkg/trace/pb" "github.com/DataDog/datadog-agent/pkg/trace/testutil" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics" "github.com/stretchr/testify/require" @@ -20,7 +20,7 @@ func TestTraceAgentConfig(t *testing.T) { cfg := traceconfig.New() require.NotZero(t, cfg.ReceiverPort) - out := make(chan pb.StatsPayload) + out := make(chan *pb.StatsPayload) agnt := NewAgentWithConfig(context.Background(), cfg, out) require.Zero(t, cfg.ReceiverPort) require.NotEmpty(t, cfg.Endpoints[0].APIKey) @@ -31,7 +31,7 @@ func TestTraceAgentConfig(t *testing.T) { func TestTraceAgent(t *testing.T) { cfg := traceconfig.New() cfg.BucketInterval = 50 * time.Millisecond - out := make(chan pb.StatsPayload, 10) + out := make(chan *pb.StatsPayload, 10) ctx := context.Background() a := NewAgentWithConfig(ctx, cfg, out) a.Start() @@ -60,7 +60,7 @@ func TestTraceAgent(t *testing.T) { }).Traces() a.Ingest(ctx, traces) - var stats pb.StatsPayload + var stats *pb.StatsPayload timeout := time.After(500 * time.Millisecond) loop: for { diff --git a/internal/datadog/go.mod b/internal/datadog/go.mod index 895fa3352860..774c1e570a1c 100644 --- a/internal/datadog/go.mod +++ b/internal/datadog/go.mod @@ -3,31 +3,32 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/datado go 1.19 require ( - github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2 + github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 + github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.6.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 ) require ( - github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 // indirect github.com/DataDog/datadog-go/v5 v5.1.1 // indirect - github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2 // indirect + github.com/DataDog/go-tuf v1.0.1-0.5.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.6.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.6.0 // indirect github.com/DataDog/sketches-go v1.4.2 // indirect - github.com/Microsoft/go-winio v0.6.0 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/containerd/cgroups v1.0.4 // indirect - github.com/coreos/go-systemd/v22 v22.3.2 // indirect + github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/docker/go-units v0.4.0 // indirect + github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/godbus/dbus/v5 v5.0.6 // indirect @@ -40,14 +41,14 @@ require ( github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect + github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect github.com/outcaste-io/ristretto v0.2.1 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/philhofer/fwd v1.1.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect - github.com/secure-systems-lab/go-securesystemslib v0.5.0 // indirect + github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect github.com/shirou/gopsutil/v3 v3.23.2 // indirect github.com/tinylib/msgp v1.1.8 // indirect github.com/tklauser/go-sysconf v0.3.11 // indirect @@ -58,7 +59,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.24.0 // indirect golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect - golang.org/x/mod v0.10.0 // indirect + golang.org/x/mod v0.11.0 // indirect golang.org/x/net v0.12.0 // indirect golang.org/x/sys v0.10.0 // indirect golang.org/x/text v0.11.0 // indirect diff --git a/internal/datadog/go.sum b/internal/datadog/go.sum index c93257b8b1e1..eae82f77fc93 100644 --- a/internal/datadog/go.sum +++ b/internal/datadog/go.sum @@ -1,64 +1,58 @@ -github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3 h1:imU7+gtggz9YPG/wJdrtLmL+bvafq+08oivQ8VRO4g8= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3 h1:LFckPfptq8yevWp5TSAbHxGv4LqaEWyRyEQAj+ioKl0= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3/go.mod h1:7uPrckBTIabtHAuoJnQes2XuDmopCImBPhM+o66DvA0= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel h1:sC2wq2fuI1r3U6FmUsn4clsrFOql5XBfs1EG15LPDEc= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel/go.mod h1:CmdN7Zrj+S+2hOSGW5hFT2LC2FVIF/avJTyvhUjaueI= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3 h1:thSia6kXdVcSozdPQOAzSDCpcPBF91ScafOzETLbJP8= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= -github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3 h1:Pb223YrOHuT2io1nDzToc+bSDoikxAITjTl9kZvjFSY= -github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3 h1:CPrsO0OU+MkjvNQhW153DQF4zuHvGkdkxGOp2M2/y34= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3 h1:gAL3HM+Tg5S0MLBjv5K8+elDJS6COf+9Io9dVh7EwYc= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 h1:g7kb8NGjApkncwuXjkEpYHjYj08hqklvjqB3Gs2uPpQ= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 h1:Htxj/RE55AeDZ+OE6+x+kJQz3toGWzR40Baq0Dknv8U= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1/go.mod h1:O3WwGRPZxs4BpB2ccUvIIPprhscWBRpudJT6mC+7sr8= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 h1:We9Y6+kwCnSOQilk2koeADjbZgMHFDl6iHBaobU5nAw= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1/go.mod h1:5Q39ZOIOwZMnFyRadp+5gH1bFdjmb+Pgxe+j5XOwaTg= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 h1:usLCrmPm2wuNedbcuArxN37E/e7UaCJ66i1tuEq7E/M= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1/go.mod h1:kxBOu4ZSem1E0JdhxjeI2jAQ7nxeRxuhjU4r9LKnRkU= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 h1:9iyw6jSwJwsFe8TooU8mqMhMfFiW6N/05OnNMg91kBY= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 h1:k4tcg077NsPJRxtuGdYEm9kge+zq5QO5x6Yv3R5BwpE= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 h1:detMhMfwchco20v12RjjRisxP3V0mtLEjcgJZGk2cmg= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 h1:EOrKgyyubncuS4LpF8aCj/12i1+GmPV+PCfj8mDaF2c= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5TltWcLMU= github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= -github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork h1:yBq5PrAtrM4yVeSzQ+bn050+Ysp++RKF1QmtkL4VqvU= -github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork/go.mod h1:yA5JwkZsHTLuqq3zaRgUQf35DfDkpOZqgtBqHKpwrBs= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.5.2 h1:W47xIROVye+D6WxkZcy8ETomfZlTNWoVZODwAh4LdeE= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2 h1:JRVQga0KlFCMyuKF/ghrZtRpmYL3XWRGXpSB5Qdk5Ko= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2/go.mod h1:6x6OujLzkt7Wwlu/6kYO5+8FNRBi1HEw8Qm6/qvTOQA= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2 h1:FbQSZ6uXhuHzgwC73MUxqvHwV0uxKiGAeAAZIMrfUAc= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2/go.mod h1:oPpGMNpwga8zTGUJfLy3Z/u4l6bvEYuRatJkgSUazr4= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2 h1:C0uzQwHCKubfmbvaZF/Qi6ernigbcoWt9A+U+s0iQGg= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2/go.mod h1:RT78x34OmVb0wuZLtmzzRRy43+7pCCA6ZEOGQ9mA5w0= +github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9lyd9I= +github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.6.0 h1:ApW5lG/fuofa2G9B0N4dk6GsnDEUbEm/rjaP9yqDnYA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.6.0 h1:WTLaCgzMa+rbmqArn4ctZ/uX59FdyDTQQFx0jeYEy6w= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.6.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.6.0 h1:sTsPObsNiL1B+XmflDqsvdjr7D3j17ITLfEVNHje8ss= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.6.0/go.mod h1:Y9LznMt9ITC3Y6c/QdN4Wgi0ZR7J6KQHomzcV4jrJ6s= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.6.0 h1:xSKBuZlJdEYfiiRLuSSgjK+x+27qwmpSLVd4ZA09Uww= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.6.0/go.mod h1:RVfXtkRqg/wiDqIo7Pr7L/bxie8jiEVM9wIOXYPbJKk= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= -github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 h1:kHaBemcxl8o/pQ5VM1c8PVE1PubbNx3mjUr09OqWGCs= github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575/go.mod h1:9d6lWj8KzO/fd/NrVaLscBKmPigpZpn5YawRPw+e3Yo= -github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4= github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= -github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= +github.com/coreos/go-systemd/v22 v22.5.0/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/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= -github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -github.com/flynn/go-docopt v0.0.0-20140912013429-f6dd2ebbb31e/go.mod h1:HyVoz1Mz5Co8TFO8EupIdlcpwShBmY98dkT2xeHkvEI= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro= github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -66,21 +60,10 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -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= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= @@ -88,21 +71,15 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= 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/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI= github.com/karrick/godirwalk v1.17.0/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= 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/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -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/lightstep/go-expohisto v1.0.0 h1:UPtTS1rGdtehbbAF7o/dhkWLTDI73UifG8LbfQI7cA4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= @@ -113,19 +90,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= -github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 h1:3snG66yBm59tKhhSPQrQ/0bCrv1LQbKt40LnUPiUxdc= -github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.1.0-rc.3 h1:l04uafi6kxByhbxev7OWiuUv0LZxEsYUfDWZ6bztAuU= +github.com/opencontainers/runtime-spec v1.1.0-rc.3/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/outcaste-io/ristretto v0.2.1 h1:KCItuNIGJZcursqHr3ghO7fc5ddZLEHspL9UR0cQM64= github.com/outcaste-io/ristretto v0.2.1/go.mod h1:W8HywhmtlopSB1jeMg3JtdIhf+DYkLAr0VN/s4+MHac= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= @@ -140,9 +106,8 @@ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:Om github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI= github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/secure-systems-lab/go-securesystemslib v0.3.1/go.mod h1:o8hhjkbNl2gOamKUA/eNW3xUrntHT9L4W89W1nfj43U= -github.com/secure-systems-lab/go-securesystemslib v0.5.0 h1:oTiNu0QnulMQgN/hLK124wJD/r2f9ZhIUuKIeBsCBT8= -github.com/secure-systems-lab/go-securesystemslib v0.5.0/go.mod h1:uoCqUC0Ap7jrBSEanxT+SdACYJTVplRXWLkGMuDjXqk= +github.com/secure-systems-lab/go-securesystemslib v0.7.0 h1:OwvJ5jQf9LnIAS83waAjPbcMsODrTQUpJ02eNLUoxBg= +github.com/secure-systems-lab/go-securesystemslib v0.7.0/go.mod h1:/2gYnlnHVQ6xeGtfIqFy7Do03K4cdCY0A/GlJLDKLHI= github.com/shirou/gopsutil/v3 v3.23.2 h1:PAWSuiAszn7IhPMBtXsbSCafej7PqUOvY6YywlQUExU= github.com/shirou/gopsutil/v3 v3.23.2/go.mod h1:gv0aQw33GLo3pG8SiWKiQrbDzbRY1K80RyZJ7V4Th1M= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= @@ -152,7 +117,6 @@ github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= 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.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= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -161,7 +125,6 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0= github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw= github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= @@ -193,7 +156,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk 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/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= @@ -202,25 +164,18 @@ 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/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= -golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= +golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/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-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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= @@ -228,28 +183,17 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/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-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -262,9 +206,7 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -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.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= @@ -274,7 +216,6 @@ golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= @@ -290,12 +231,6 @@ google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= google.golang.org/grpc v1.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI= google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= 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.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= @@ -303,12 +238,6 @@ google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/processor/datadogprocessor/go.mod b/processor/datadogprocessor/go.mod index 6a9b7f6edb61..bb2029172da0 100644 --- a/processor/datadogprocessor/go.mod +++ b/processor/datadogprocessor/go.mod @@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/datad go 1.19 require ( - github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2 + github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.6.0 github.com/DataDog/sketches-go v1.4.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.82.0 github.com/stretchr/testify v1.8.4 @@ -19,23 +19,24 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 // indirect github.com/DataDog/datadog-go/v5 v5.1.1 // indirect - github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2 // indirect - github.com/Microsoft/go-winio v0.6.0 // indirect + github.com/DataDog/go-tuf v1.0.1-0.5.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.6.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.6.0 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/containerd/cgroups v1.0.4 // indirect - github.com/coreos/go-systemd/v22 v22.3.2 // indirect + github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/docker/go-units v0.4.0 // indirect + github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/godbus/dbus/v5 v5.0.6 // indirect @@ -53,14 +54,14 @@ 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/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect + github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect github.com/outcaste-io/ristretto v0.2.1 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/philhofer/fwd v1.1.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect - github.com/secure-systems-lab/go-securesystemslib v0.5.0 // indirect + github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect github.com/shirou/gopsutil/v3 v3.23.6 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/tinylib/msgp v1.1.8 // indirect diff --git a/processor/datadogprocessor/go.sum b/processor/datadogprocessor/go.sum index 9d099428b7a3..f77a88303726 100644 --- a/processor/datadogprocessor/go.sum +++ b/processor/datadogprocessor/go.sum @@ -1,37 +1,39 @@ 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/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3 h1:imU7+gtggz9YPG/wJdrtLmL+bvafq+08oivQ8VRO4g8= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.47.0-rc.3/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3 h1:LFckPfptq8yevWp5TSAbHxGv4LqaEWyRyEQAj+ioKl0= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.47.0-rc.3/go.mod h1:7uPrckBTIabtHAuoJnQes2XuDmopCImBPhM+o66DvA0= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel h1:sC2wq2fuI1r3U6FmUsn4clsrFOql5XBfs1EG15LPDEc= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel/go.mod h1:CmdN7Zrj+S+2hOSGW5hFT2LC2FVIF/avJTyvhUjaueI= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3 h1:thSia6kXdVcSozdPQOAzSDCpcPBF91ScafOzETLbJP8= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.47.0-rc.3/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= -github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3 h1:Pb223YrOHuT2io1nDzToc+bSDoikxAITjTl9kZvjFSY= -github.com/DataDog/datadog-agent/pkg/util/log v0.47.0-rc.3/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3 h1:CPrsO0OU+MkjvNQhW153DQF4zuHvGkdkxGOp2M2/y34= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.47.0-rc.3/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3 h1:gAL3HM+Tg5S0MLBjv5K8+elDJS6COf+9Io9dVh7EwYc= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.47.0-rc.3/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 h1:g7kb8NGjApkncwuXjkEpYHjYj08hqklvjqB3Gs2uPpQ= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1/go.mod h1:e933RWa4kAWuHi5jpzEuOiULlv21HcCFEVIYegmaB5c= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 h1:Htxj/RE55AeDZ+OE6+x+kJQz3toGWzR40Baq0Dknv8U= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1/go.mod h1:O3WwGRPZxs4BpB2ccUvIIPprhscWBRpudJT6mC+7sr8= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 h1:We9Y6+kwCnSOQilk2koeADjbZgMHFDl6iHBaobU5nAw= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1/go.mod h1:5Q39ZOIOwZMnFyRadp+5gH1bFdjmb+Pgxe+j5XOwaTg= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 h1:usLCrmPm2wuNedbcuArxN37E/e7UaCJ66i1tuEq7E/M= +github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1/go.mod h1:kxBOu4ZSem1E0JdhxjeI2jAQ7nxeRxuhjU4r9LKnRkU= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 h1:9iyw6jSwJwsFe8TooU8mqMhMfFiW6N/05OnNMg91kBY= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1/go.mod h1:TmxM8Pe+1QBWfM1JisS3xjvX1/kk655XY/IjqA36g6s= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 h1:k4tcg077NsPJRxtuGdYEm9kge+zq5QO5x6Yv3R5BwpE= +github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1/go.mod h1:Ci+eWLEPbZsqy9/eNBMN1FNJUqiPx+HrLcGGpVmujJ8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 h1:detMhMfwchco20v12RjjRisxP3V0mtLEjcgJZGk2cmg= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1/go.mod h1:HMpYpkuxDFYuYLjDTKoG0NjtPoAwIymvBEhlA3pJbJk= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 h1:EOrKgyyubncuS4LpF8aCj/12i1+GmPV+PCfj8mDaF2c= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1/go.mod h1:Whfh1SJOwtp2YvDUNzqw/jmSbGOOso+HJHOEJULh1+M= github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5TltWcLMU= github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= -github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork h1:yBq5PrAtrM4yVeSzQ+bn050+Ysp++RKF1QmtkL4VqvU= -github.com/DataDog/go-tuf v0.3.0--fix-localmeta-fork/go.mod h1:yA5JwkZsHTLuqq3zaRgUQf35DfDkpOZqgtBqHKpwrBs= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.5.2 h1:W47xIROVye+D6WxkZcy8ETomfZlTNWoVZODwAh4LdeE= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2 h1:JRVQga0KlFCMyuKF/ghrZtRpmYL3XWRGXpSB5Qdk5Ko= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.5.2/go.mod h1:6x6OujLzkt7Wwlu/6kYO5+8FNRBi1HEw8Qm6/qvTOQA= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2 h1:FbQSZ6uXhuHzgwC73MUxqvHwV0uxKiGAeAAZIMrfUAc= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.5.2/go.mod h1:oPpGMNpwga8zTGUJfLy3Z/u4l6bvEYuRatJkgSUazr4= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2 h1:C0uzQwHCKubfmbvaZF/Qi6ernigbcoWt9A+U+s0iQGg= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.5.2/go.mod h1:RT78x34OmVb0wuZLtmzzRRy43+7pCCA6ZEOGQ9mA5w0= +github.com/DataDog/go-tuf v1.0.1-0.5.2 h1:gld/e3MXfFVB/O8hc3mloP1ayFk75Mmdkmll/9lyd9I= +github.com/DataDog/go-tuf v1.0.1-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.6.0 h1:ApW5lG/fuofa2G9B0N4dk6GsnDEUbEm/rjaP9yqDnYA= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.6.0 h1:WTLaCgzMa+rbmqArn4ctZ/uX59FdyDTQQFx0jeYEy6w= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.6.0/go.mod h1:mpbmVkOkmJq5KmHxi+zlvYXQD0o/x1MMS16CNWO8p9U= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.6.0 h1:sTsPObsNiL1B+XmflDqsvdjr7D3j17ITLfEVNHje8ss= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.6.0/go.mod h1:Y9LznMt9ITC3Y6c/QdN4Wgi0ZR7J6KQHomzcV4jrJ6s= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.6.0 h1:xSKBuZlJdEYfiiRLuSSgjK+x+27qwmpSLVd4ZA09Uww= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.6.0/go.mod h1:RVfXtkRqg/wiDqIo7Pr7L/bxie8jiEVM9wIOXYPbJKk= github.com/DataDog/sketches-go v1.4.2 h1:gppNudE9d19cQ98RYABOetxIhpTCl4m7CnbRZjvVA/o= github.com/DataDog/sketches-go v1.4.2/go.mod h1:xJIXldczJyyjnbDop7ZZcLxJdV3+7Kra7H1KMgpgkLk= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= -github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= 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= @@ -61,27 +63,24 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 h1:kHaBemcxl8o/pQ5VM1c8PVE1PubbNx3mjUr09OqWGCs= github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575/go.mod h1:9d6lWj8KzO/fd/NrVaLscBKmPigpZpn5YawRPw+e3Yo= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4= github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= +github.com/coreos/go-systemd/v22 v22.5.0/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/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= -github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= @@ -93,8 +92,6 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 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/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= -github.com/flynn/go-docopt v0.0.0-20140912013429-f6dd2ebbb31e/go.mod h1:HyVoz1Mz5Co8TFO8EupIdlcpwShBmY98dkT2xeHkvEI= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -109,7 +106,6 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= 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/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro= @@ -138,7 +134,6 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -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= @@ -154,7 +149,6 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -194,8 +188,6 @@ github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvh 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/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= 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/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= @@ -220,7 +212,6 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv 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.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= 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= @@ -267,20 +258,9 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY 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/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= -github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 h1:3snG66yBm59tKhhSPQrQ/0bCrv1LQbKt40LnUPiUxdc= -github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.1.0-rc.3 h1:l04uafi6kxByhbxev7OWiuUv0LZxEsYUfDWZ6bztAuU= +github.com/opencontainers/runtime-spec v1.1.0-rc.3/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/outcaste-io/ristretto v0.2.1 h1:KCItuNIGJZcursqHr3ghO7fc5ddZLEHspL9UR0cQM64= github.com/outcaste-io/ristretto v0.2.1/go.mod h1:W8HywhmtlopSB1jeMg3JtdIhf+DYkLAr0VN/s4+MHac= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= @@ -324,9 +304,8 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb 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/secure-systems-lab/go-securesystemslib v0.3.1/go.mod h1:o8hhjkbNl2gOamKUA/eNW3xUrntHT9L4W89W1nfj43U= -github.com/secure-systems-lab/go-securesystemslib v0.5.0 h1:oTiNu0QnulMQgN/hLK124wJD/r2f9ZhIUuKIeBsCBT8= -github.com/secure-systems-lab/go-securesystemslib v0.5.0/go.mod h1:uoCqUC0Ap7jrBSEanxT+SdACYJTVplRXWLkGMuDjXqk= +github.com/secure-systems-lab/go-securesystemslib v0.7.0 h1:OwvJ5jQf9LnIAS83waAjPbcMsODrTQUpJ02eNLUoxBg= +github.com/secure-systems-lab/go-securesystemslib v0.7.0/go.mod h1:/2gYnlnHVQ6xeGtfIqFy7Do03K4cdCY0A/GlJLDKLHI= github.com/shirou/gopsutil/v3 v3.23.6 h1:5y46WPI9QBKBbK7EEccUPNXpJpNrvPuTD0O2zHEHT08= github.com/shirou/gopsutil/v3 v3.23.6/go.mod h1:j7QX50DrXYggrpN30W0Mo+I4/8U2UUIQrnrhqUeWrAU= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= @@ -354,7 +333,6 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0= github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw= github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= @@ -416,7 +394,6 @@ golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3 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/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= @@ -435,7 +412,6 @@ golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= 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-20180906233101-161cd47e91fd/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= @@ -445,17 +421,12 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL 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-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/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-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-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= @@ -478,7 +449,6 @@ golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= 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-20180909124046-d0be0721c37e/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= @@ -486,37 +456,29 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h 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-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/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-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/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-20200519105757-fe76b779f299/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-20200814200057-3d37ad5750ed/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-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/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-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -550,7 +512,6 @@ golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtn 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-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= @@ -602,10 +563,7 @@ gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUy gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/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/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= 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= diff --git a/processor/datadogprocessor/processor.go b/processor/datadogprocessor/processor.go index 5e604de68990..55e067fd40cd 100644 --- a/processor/datadogprocessor/processor.go +++ b/processor/datadogprocessor/processor.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/DataDog/datadog-agent/pkg/trace/pb" + pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" @@ -38,7 +38,7 @@ type datadogProcessor struct { // in specifies the channel through which the agent will output Stats Payloads // resulting from ingested traces. - in chan pb.StatsPayload + in chan *pb.StatsPayload // exit specifies the exit channel, which will be closed upon shutdown. exit chan struct{} @@ -46,7 +46,7 @@ type datadogProcessor struct { func newProcessor(ctx context.Context, logger *zap.Logger, config component.Config, nextConsumer consumer.Traces) (*datadogProcessor, error) { cfg := config.(*Config) - in := make(chan pb.StatsPayload, 100) + in := make(chan *pb.StatsPayload, 100) trans, err := metrics.NewTranslator(logger) if err != nil { return nil, err diff --git a/processor/datadogprocessor/processor_test.go b/processor/datadogprocessor/processor_test.go index 967c0386dc21..5e3c198c925f 100644 --- a/processor/datadogprocessor/processor_test.go +++ b/processor/datadogprocessor/processor_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/DataDog/datadog-agent/pkg/trace/pb" + pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace" "github.com/DataDog/sketches-go/ddsketch" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -101,7 +101,7 @@ func TestProcessorIngest(t *testing.T) { ctx := context.Background() p, err := newProcessor(ctx, zap.NewNop(), createDefaultConfig(), &mockConsumer) require.NoError(t, err) - out := make(chan pb.StatsPayload, 1) + out := make(chan *pb.StatsPayload, 1) ing := &mockIngester{Out: out} p.agent = ing p.in = out @@ -258,7 +258,7 @@ var _ datadog.Ingester = (*mockIngester)(nil) // mockIngester implements ingester. type mockIngester struct { - Out chan pb.StatsPayload + Out chan *pb.StatsPayload start, stop bool ingested ptrace.Traces } @@ -271,7 +271,7 @@ func (m *mockIngester) Start() { // Ingest ingests the set of traces. func (m *mockIngester) Ingest(_ context.Context, traces ptrace.Traces) { m.ingested = traces - m.Out <- testStatsPayload + m.Out <- &testStatsPayload } // Stop stops the ingester. @@ -283,7 +283,7 @@ func (m *mockIngester) Stop() { // We should find a way to have a shared set of test utilities in either the processor // or the exporter. var testStatsPayload = pb.StatsPayload{ - Stats: []pb.ClientStatsPayload{ + Stats: []*pb.ClientStatsPayload{ { Hostname: "host", Env: "prod", @@ -296,11 +296,11 @@ var testStatsPayload = pb.StatsPayload{ Service: "mysql", ContainerID: "abcdef123456", Tags: []string{"a:b", "c:d"}, - Stats: []pb.ClientStatsBucket{ + Stats: []*pb.ClientStatsBucket{ { Start: 10, Duration: 1, - Stats: []pb.ClientGroupedStats{ + Stats: []*pb.ClientGroupedStats{ { Service: "kafka", Name: "queue.add", @@ -330,11 +330,11 @@ var testStatsPayload = pb.StatsPayload{ Service: "mysql2", ContainerID: "abcdef1234562", Tags: []string{"a:b2", "c:d2"}, - Stats: []pb.ClientStatsBucket{ + Stats: []*pb.ClientStatsBucket{ { Start: 102, Duration: 12, - Stats: []pb.ClientGroupedStats{ + Stats: []*pb.ClientGroupedStats{ { Service: "kafka2", Name: "queue.add2", diff --git a/receiver/datadogreceiver/go.mod b/receiver/datadogreceiver/go.mod index e2cd7ce10a78..0836b9888e61 100644 --- a/receiver/datadogreceiver/go.mod +++ b/receiver/datadogreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datado go 1.19 require ( - github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel + github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.82.0 github.com/stretchr/testify v1.8.4 github.com/vmihailenco/msgpack/v4 v4.3.12 diff --git a/receiver/datadogreceiver/go.sum b/receiver/datadogreceiver/go.sum index 525111b78aa9..734c6a48430b 100644 --- a/receiver/datadogreceiver/go.sum +++ b/receiver/datadogreceiver/go.sum @@ -2,8 +2,8 @@ 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= contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel h1:sC2wq2fuI1r3U6FmUsn4clsrFOql5XBfs1EG15LPDEc= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel/go.mod h1:CmdN7Zrj+S+2hOSGW5hFT2LC2FVIF/avJTyvhUjaueI= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 h1:Htxj/RE55AeDZ+OE6+x+kJQz3toGWzR40Baq0Dknv8U= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1/go.mod h1:O3WwGRPZxs4BpB2ccUvIIPprhscWBRpudJT6mC+7sr8= 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= diff --git a/receiver/datadogreceiver/receiver.go b/receiver/datadogreceiver/receiver.go index 902809fbdd9e..e4dc4120b62a 100644 --- a/receiver/datadogreceiver/receiver.go +++ b/receiver/datadogreceiver/receiver.go @@ -9,7 +9,7 @@ import ( "fmt" "net/http" - "github.com/DataDog/datadog-agent/pkg/trace/pb" + pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/obsreport" diff --git a/receiver/datadogreceiver/translator.go b/receiver/datadogreceiver/translator.go index 3b007aa75da8..8112c7aef007 100644 --- a/receiver/datadogreceiver/translator.go +++ b/receiver/datadogreceiver/translator.go @@ -14,7 +14,7 @@ import ( "strings" "sync" - "github.com/DataDog/datadog-agent/pkg/trace/pb" + pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" semconv "go.opentelemetry.io/collector/semconv/v1.16.0" diff --git a/receiver/datadogreceiver/translator_test.go b/receiver/datadogreceiver/translator_test.go index 94f05eba7342..9f550f483015 100644 --- a/receiver/datadogreceiver/translator_test.go +++ b/receiver/datadogreceiver/translator_test.go @@ -9,7 +9,7 @@ import ( "net/http" "testing" - "github.com/DataDog/datadog-agent/pkg/trace/pb" + pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" vmsgp "github.com/vmihailenco/msgpack/v4" diff --git a/testbed/go.mod b/testbed/go.mod index 1d19c743eb23..727977dac7c5 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -70,9 +70,9 @@ require ( github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect github.com/Azure/go-autorest/logger v0.2.1 // indirect github.com/Azure/go-autorest/tracing v0.6.0 // indirect - github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 // indirect github.com/DataDog/datadog-agent/pkg/trace/exportable v0.0.0-20201016145401-4646cf596b02 // indirect - github.com/Microsoft/go-winio v0.6.0 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/apache/thrift v0.18.1 // indirect github.com/armon/go-metrics v0.4.1 // indirect diff --git a/testbed/go.sum b/testbed/go.sum index 33542a22e7cc..22e7b57b5b99 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -647,8 +647,8 @@ github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUM github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel h1:sC2wq2fuI1r3U6FmUsn4clsrFOql5XBfs1EG15LPDEc= -github.com/DataDog/datadog-agent/pkg/trace v0.48.0-devel/go.mod h1:CmdN7Zrj+S+2hOSGW5hFT2LC2FVIF/avJTyvhUjaueI= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 h1:Htxj/RE55AeDZ+OE6+x+kJQz3toGWzR40Baq0Dknv8U= +github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1/go.mod h1:O3WwGRPZxs4BpB2ccUvIIPprhscWBRpudJT6mC+7sr8= github.com/DataDog/datadog-agent/pkg/trace/exportable v0.0.0-20201016145401-4646cf596b02 h1:N2BRKjJ/c+ipDwt5b+ijqEc2EsmK3zXq2lNeIPnSwMI= github.com/DataDog/datadog-agent/pkg/trace/exportable v0.0.0-20201016145401-4646cf596b02/go.mod h1:EalMiS87Guu6PkLdxz7gmWqi+dRs9sjYLTOyTrM/aVU= github.com/DataDog/datadog-agent/pkg/util/log v0.0.0-20201009091607-ce4e57cdf8f4/go.mod h1:cRy7lwapA3jcjnX74kU6NFkXaRGQyB0l/QZA0IwYGEQ= @@ -676,8 +676,8 @@ github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JP github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= -github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= -github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= From 17d1316b52c90bd71a3879ce6d86abae14f25d25 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Mon, 7 Aug 2023 09:16:31 -0700 Subject: [PATCH 013/292] [chore] [processor/tailsampling] Preallocate slices (#24959) --- processor/tailsamplingprocessor/and_helper.go | 4 ++-- processor/tailsamplingprocessor/composite_helper.go | 4 ++-- processor/tailsamplingprocessor/processor.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/processor/tailsamplingprocessor/and_helper.go b/processor/tailsamplingprocessor/and_helper.go index 5afaaea5f96d..4577c8c49692 100644 --- a/processor/tailsamplingprocessor/and_helper.go +++ b/processor/tailsamplingprocessor/and_helper.go @@ -10,14 +10,14 @@ import ( ) func getNewAndPolicy(settings component.TelemetrySettings, config *AndCfg) (sampling.PolicyEvaluator, error) { - var subPolicyEvaluators []sampling.PolicyEvaluator + subPolicyEvaluators := make([]sampling.PolicyEvaluator, len(config.SubPolicyCfg)) for i := range config.SubPolicyCfg { policyCfg := &config.SubPolicyCfg[i] policy, err := getAndSubPolicyEvaluator(settings, policyCfg) if err != nil { return nil, err } - subPolicyEvaluators = append(subPolicyEvaluators, policy) + subPolicyEvaluators[i] = policy } return sampling.NewAnd(settings.Logger, subPolicyEvaluators), nil } diff --git a/processor/tailsamplingprocessor/composite_helper.go b/processor/tailsamplingprocessor/composite_helper.go index cff0e3e9fab4..769bfcf95765 100644 --- a/processor/tailsamplingprocessor/composite_helper.go +++ b/processor/tailsamplingprocessor/composite_helper.go @@ -10,7 +10,7 @@ import ( ) func getNewCompositePolicy(settings component.TelemetrySettings, config *CompositeCfg) (sampling.PolicyEvaluator, error) { - var subPolicyEvalParams []sampling.SubPolicyEvalParams + subPolicyEvalParams := make([]sampling.SubPolicyEvalParams, len(config.SubPolicyCfg)) rateAllocationsMap := getRateAllocationMap(config) for i := range config.SubPolicyCfg { policyCfg := &config.SubPolicyCfg[i] @@ -23,7 +23,7 @@ func getNewCompositePolicy(settings component.TelemetrySettings, config *Composi Evaluator: policy, MaxSpansPerSecond: int64(rateAllocationsMap[policyCfg.Name]), } - subPolicyEvalParams = append(subPolicyEvalParams, evalParams) + subPolicyEvalParams[i] = evalParams } return sampling.NewComposite(settings.Logger, config.MaxTotalSpansPerSecond, subPolicyEvalParams, sampling.MonotonicClock{}), nil } diff --git a/processor/tailsamplingprocessor/processor.go b/processor/tailsamplingprocessor/processor.go index f2c55f956854..8d22af8b667f 100644 --- a/processor/tailsamplingprocessor/processor.go +++ b/processor/tailsamplingprocessor/processor.go @@ -69,7 +69,7 @@ func newTracesProcessor(ctx context.Context, settings component.TelemetrySetting return nil, err } - var policies []*policy + policies := make([]*policy, len(cfg.PolicyCfgs)) for i := range cfg.PolicyCfgs { policyCfg := &cfg.PolicyCfgs[i] policyCtx, err := tag.New(ctx, tag.Upsert(tagPolicyKey, policyCfg.Name), tag.Upsert(tagSourceFormat, sourceFormat)) @@ -85,7 +85,7 @@ func newTracesProcessor(ctx context.Context, settings component.TelemetrySetting evaluator: eval, ctx: policyCtx, } - policies = append(policies, p) + policies[i] = p } tsp := &tailSamplingSpanProcessor{ From 183416a3cb1aea175efc1d7c63604c292bb1b455 Mon Sep 17 00:00:00 2001 From: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com> Date: Mon, 7 Aug 2023 09:24:56 -0700 Subject: [PATCH 014/292] [chore] Add @bryan-aguilar as a triager (#24909) **Description:** I volunteer as ~~tribute~~ triager. **Link to tracking Issue:** Fixes #24875 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 746b152cc954..22be6fa71cc2 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md). Triagers ([@open-telemetry/collector-contrib-triagers](https://github.com/orgs/open-telemetry/teams/collector-contrib-triagers)) - [Benedikt Bongartz](https://github.com/frzifus), Red Hat +- [Bryan Aguilar](https://github.com/bryan-aguilar), AWS - [Gabriel Aszalos](https://github.com/gbbr), DataDog - [Goutham Veeramachaneni](https://github.com/gouthamve), Grafana - [Jared Tan](https://github.com/JaredTan95), DaoCloud From aa2b438b8a975a9679597c89b9dc185ce2f13f38 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Mon, 7 Aug 2023 09:28:16 -0700 Subject: [PATCH 015/292] [chore] [processor/spanmetrics] preallocate slice (#24958) --- processor/spanmetricsprocessor/processor.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/processor/spanmetricsprocessor/processor.go b/processor/spanmetricsprocessor/processor.go index c35da5b6f886..5f06f67f3161 100644 --- a/processor/spanmetricsprocessor/processor.go +++ b/processor/spanmetricsprocessor/processor.go @@ -171,7 +171,7 @@ func (p *processorImp) Start(ctx context.Context, host component.Host) error { p.logger.Info("Starting spanmetricsprocessor") exporters := host.GetExporters() //nolint:staticcheck - var availableMetricsExporters []string + availableMetricsExporters := make([]string, 0, len(exporters[component.DataTypeMetrics])) // The available list of exporters come from any configured metrics pipelines' exporters. for k, exp := range exporters[component.DataTypeMetrics] { From bca7589e2508c51cd5ae647d4a48ec0151c3a24a Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Mon, 7 Aug 2023 09:32:47 -0700 Subject: [PATCH 016/292] [chore] [pkg/stanza] preallocate slice (#24950) Co-authored-by: Daniel Jaglowski --- pkg/stanza/operator/helper/writer.go | 6 +++--- pkg/stanza/operator/transformer/router/router.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/stanza/operator/helper/writer.go b/pkg/stanza/operator/helper/writer.go index 9352de413a6c..ced6b5533adc 100644 --- a/pkg/stanza/operator/helper/writer.go +++ b/pkg/stanza/operator/helper/writer.go @@ -74,9 +74,9 @@ func (w *WriterOperator) GetOutputIDs() []string { // SetOutputs will set the outputs of the operator. func (w *WriterOperator) SetOutputs(operators []operator.Operator) error { - var outputOperators []operator.Operator + outputOperators := make([]operator.Operator, len(w.OutputIDs)) - for _, operatorID := range w.OutputIDs { + for i, operatorID := range w.OutputIDs { operator, ok := w.findOperator(operators, operatorID) if !ok { return fmt.Errorf("operator '%s' does not exist", operatorID) @@ -86,7 +86,7 @@ func (w *WriterOperator) SetOutputs(operators []operator.Operator) error { return fmt.Errorf("operator '%s' can not process entries", operatorID) } - outputOperators = append(outputOperators, operator) + outputOperators[i] = operator } w.OutputOperators = outputOperators diff --git a/pkg/stanza/operator/transformer/router/router.go b/pkg/stanza/operator/transformer/router/router.go index 343574b14ec9..b962e8aef680 100644 --- a/pkg/stanza/operator/transformer/router/router.go +++ b/pkg/stanza/operator/transformer/router/router.go @@ -177,13 +177,13 @@ func (p *Transformer) SetOutputIDs(_ []string) {} // findOperators will find a subset of operators from a collection. func (p *Transformer) findOperators(operators []operator.Operator, operatorIDs []string) ([]operator.Operator, error) { - var result []operator.Operator - for _, operatorID := range operatorIDs { + result := make([]operator.Operator, len(operatorIDs)) + for i, operatorID := range operatorIDs { operator, err := p.findOperator(operators, operatorID) if err != nil { return nil, err } - result = append(result, operator) + result[i] = operator } return result, nil } From 89a6aaf9fa97961273a6099e49c55c761af223a6 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Mon, 7 Aug 2023 09:34:47 -0700 Subject: [PATCH 017/292] [chore] [exporter/pulsar] preallocate slice (#24941) --- exporter/pulsarexporter/jaeger_marshaler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporter/pulsarexporter/jaeger_marshaler.go b/exporter/pulsarexporter/jaeger_marshaler.go index 070c13033cf0..79a927a12f2e 100644 --- a/exporter/pulsarexporter/jaeger_marshaler.go +++ b/exporter/pulsarexporter/jaeger_marshaler.go @@ -28,7 +28,7 @@ func (j jaegerMarshaler) Marshal(traces ptrace.Traces, _ string) ([]*pulsar.Prod } var errs error - var messages []*pulsar.ProducerMessage + messages := make([]*pulsar.ProducerMessage, 0, len(batches)) for _, batch := range batches { bts, err := j.marshaler.marshal(batch) From 6ccfaf1a5065b5894e4fd8c8d77b380c7fde1d5e Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Mon, 7 Aug 2023 10:00:41 -0700 Subject: [PATCH 018/292] [chore] [exporter/logzio] preallocate slice (#24938) --- exporter/logzioexporter/logziospan.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exporter/logzioexporter/logziospan.go b/exporter/logzioexporter/logziospan.go index 90dddff56a13..58c82b68e97b 100644 --- a/exporter/logzioexporter/logziospan.go +++ b/exporter/logzioexporter/logziospan.go @@ -35,9 +35,9 @@ type logzioSpan struct { } func getTagsValues(tags []model.KeyValue) []string { - var values []string + values := make([]string, len(tags)) for i := range tags { - values = append(values, tags[i].VStr) + values[i] = tags[i].VStr } return values } From 7d8e45256827ed442da189996c50a914038c95eb Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Mon, 7 Aug 2023 10:02:15 -0700 Subject: [PATCH 019/292] [chore] [exporter/signalfx] preallocate slice for faster performance (#24929) See https://github.com/alexkohler/prealloc for motivation. --- .../internal/translation/dpfilters/filterset.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/exporter/signalfxexporter/internal/translation/dpfilters/filterset.go b/exporter/signalfxexporter/internal/translation/dpfilters/filterset.go index 6c835897d90d..853f0445e0b3 100644 --- a/exporter/signalfxexporter/internal/translation/dpfilters/filterset.go +++ b/exporter/signalfxexporter/internal/translation/dpfilters/filterset.go @@ -48,8 +48,8 @@ func NewFilterSet(excludes []MetricFilter, includes []MetricFilter) (*FilterSet, } func getDataPointFilters(metricFilters []MetricFilter) ([]*dataPointFilter, error) { - var out []*dataPointFilter - for _, f := range metricFilters { + out := make([]*dataPointFilter, len(metricFilters)) + for i, f := range metricFilters { dimSet, err := f.normalize() if err != nil { return nil, err @@ -60,7 +60,7 @@ func getDataPointFilters(metricFilters []MetricFilter) ([]*dataPointFilter, erro return nil, err } - out = append(out, dpf) + out[i] = dpf } return out, nil } From 89e812d3e97af1fda381b33016f1071e5a7f0ba7 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Mon, 7 Aug 2023 13:03:51 -0700 Subject: [PATCH 020/292] [chore] improve signalfx exporter tests (#24927) Preallocate a slice and check json marshaling errors. --- .../internal/translation/logdata_to_signalfxv2_test.go | 2 +- .../internal/translation/translator_test.go | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/exporter/signalfxexporter/internal/translation/logdata_to_signalfxv2_test.go b/exporter/signalfxexporter/internal/translation/logdata_to_signalfxv2_test.go index 24a3c829f0fb..c78713bb9188 100644 --- a/exporter/signalfxexporter/internal/translation/logdata_to_signalfxv2_test.go +++ b/exporter/signalfxexporter/internal/translation/logdata_to_signalfxv2_test.go @@ -133,7 +133,7 @@ func TestLogDataToSignalFxEvents(t *testing.T) { } func mapToEventProps(m map[string]interface{}) []*sfxpb.Property { - var out []*sfxpb.Property + out := make([]*sfxpb.Property, 0, len(m)) for k, v := range m { var pval sfxpb.PropertyValue diff --git a/exporter/signalfxexporter/internal/translation/translator_test.go b/exporter/signalfxexporter/internal/translation/translator_test.go index 9c37c184f070..694f081a404c 100644 --- a/exporter/signalfxexporter/internal/translation/translator_test.go +++ b/exporter/signalfxexporter/internal/translation/translator_test.go @@ -33,8 +33,14 @@ type byDimensions []*sfxpb.Dimension func (dims byDimensions) Len() int { return len(dims) } func (dims byDimensions) Less(i, j int) bool { - ib, _ := json.Marshal(dims[i]) - jb, _ := json.Marshal(dims[j]) + ib, err := json.Marshal(dims[i]) + if err != nil { + panic(err) + } + jb, err := json.Marshal(dims[j]) + if err != nil { + panic(err) + } return string(ib) < string(jb) } func (dims byDimensions) Swap(i, j int) { dims[i], dims[j] = dims[j], dims[i] } From 9a8b29e5fb30460002c772f62817fb887e6d4e3b Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Mon, 7 Aug 2023 16:30:26 -0400 Subject: [PATCH 021/292] [chore] Use env vars when running shell commands in CI (#25002) Follows https://github.com/open-telemetry/opentelemetry-collector/pull/8177 --- .github/workflows/changelog.yml | 6 ++++-- .github/workflows/check-links.yaml | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 4004117b04d6..cfe6a0b50e53 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -24,6 +24,8 @@ jobs: changelog: runs-on: ubuntu-latest if: ${{ github.actor != 'dependabot[bot]' }} + env: + PR_HEAD: ${{ github.event.pull_request.head.sha }} steps: - uses: actions/checkout@v3 @@ -46,7 +48,7 @@ jobs: - name: Ensure no changes to the CHANGELOG.md or CHANGELOG-API.md if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}} run: | - if [[ $(git diff --name-only $(git merge-base origin/main ${{ github.event.pull_request.head.sha }}) ${{ github.event.pull_request.head.sha }} ./CHANGELOG*.md) ]] + if [[ $(git diff --name-only $(git merge-base origin/main $PR_HEAD) $PR_HEAD ./CHANGELOG*.md) ]] then echo "CHANGELOG.md and CHANGELOG-API.md should not be directly modified." echo "Please add a .yaml file to the ./.chloggen/ directory." @@ -60,7 +62,7 @@ jobs: - name: Ensure ./.chloggen/*.yaml addition(s) if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}} run: | - if [[ 1 -gt $(git diff --diff-filter=A --name-only $(git merge-base origin/main ${{ github.event.pull_request.head.sha }}) ${{ github.event.pull_request.head.sha }} ./.chloggen | grep -c \\.yaml) ]] + if [[ 1 -gt $(git diff --diff-filter=A --name-only $(git merge-base origin/main $PR_HEAD) $PR_HEAD ./.chloggen | grep -c \\.yaml) ]] then echo "No changelog entry was added to the ./.chloggen/ directory." echo "Please add a .yaml file to the ./.chloggen/ directory." diff --git a/.github/workflows/check-links.yaml b/.github/workflows/check-links.yaml index af6afe9eb535..e8b5cacd6e2c 100644 --- a/.github/workflows/check-links.yaml +++ b/.github/workflows/check-links.yaml @@ -13,6 +13,8 @@ jobs: changedfiles: name: changed files runs-on: ubuntu-latest + env: + PR_HEAD: ${{ github.event.pull_request.head.sha }} if: ${{ github.actor != 'dependabot[bot]' }} outputs: md: ${{ steps.changes.outputs.md }} @@ -23,7 +25,7 @@ jobs: - name: Get changed files id: changes run: | - echo "md=$(git diff --name-only --diff-filter=ACMRTUXB $(git merge-base origin/main ${{ github.event.pull_request.head.sha }}) ${{ github.event.pull_request.head.sha }} | grep .md$ | xargs)" >> $GITHUB_OUTPUT + echo "md=$(git diff --name-only --diff-filter=ACMRTUXB $(git merge-base origin/main $PR_HEAD) $PR_HEAD | grep .md$ | xargs)" >> $GITHUB_OUTPUT check-links: runs-on: ubuntu-latest needs: changedfiles From d34a710cff389337a97357e91dca57739e593dea Mon Sep 17 00:00:00 2001 From: Ziqi Zhao Date: Tue, 8 Aug 2023 07:02:44 +0800 Subject: [PATCH 022/292] [chore] [processor/attributes] enable exhaustive linter (#24977) **Description:** related #23266 Signed-off-by: Ziqi Zhao --- processor/attributesprocessor/attributes_metric.go | 1 + 1 file changed, 1 insertion(+) diff --git a/processor/attributesprocessor/attributes_metric.go b/processor/attributesprocessor/attributes_metric.go index c913d1f85d99..72a4d9d03fcf 100644 --- a/processor/attributesprocessor/attributes_metric.go +++ b/processor/attributesprocessor/attributes_metric.go @@ -65,6 +65,7 @@ func (a *metricAttributesProcessor) processMetricAttributes(ctx context.Context, // This is a lot of repeated code, but since there is no single parent superclass // between metric data types, we can't use polymorphism. + //exhaustive:enforce switch m.Type() { case pmetric.MetricTypeGauge: dps := m.Gauge().DataPoints() From df601903c67f029bfbb250de56399c835e2a15dd Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Mon, 7 Aug 2023 16:03:54 -0700 Subject: [PATCH 023/292] [chore] [processor/groupbytrace] preallocate slice (#24955) --- processor/groupbytraceprocessor/storage_memory.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/processor/groupbytraceprocessor/storage_memory.go b/processor/groupbytraceprocessor/storage_memory.go index 487277ba6ad5..909164d12330 100644 --- a/processor/groupbytraceprocessor/storage_memory.go +++ b/processor/groupbytraceprocessor/storage_memory.go @@ -54,11 +54,11 @@ func (st *memoryStorage) get(traceID pcommon.TraceID) ([]ptrace.ResourceSpans, e return nil, nil } - var result []ptrace.ResourceSpans - for _, rs := range rss { + result := make([]ptrace.ResourceSpans, len(rss)) + for i, rs := range rss { newRS := ptrace.NewResourceSpans() rs.CopyTo(newRS) - result = append(result, newRS) + result[i] = newRS } return result, nil From c9f2b8e352df22b4c41c34e1a264b74243f549b9 Mon Sep 17 00:00:00 2001 From: asaharn <102726227+asaharn@users.noreply.github.com> Date: Tue, 8 Aug 2023 04:51:20 +0530 Subject: [PATCH 024/292] [chore]: updated CODEOWNERS for ADX exporter (#24567) **Description:** Fixed and Updated ADX exporter's codeowners. **Link to tracking Issue:** #24566 --------- Co-authored-by: Ramachandran A G <106139410+ag-ramachandran@users.noreply.github.com> Co-authored-by: Antoine Toulme --- .github/CODEOWNERS | 2 +- exporter/azuredataexplorerexporter/README.md | 2 +- exporter/azuredataexplorerexporter/metadata.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9f06a49200eb..5f4c82d3503a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -45,7 +45,7 @@ exporter/awsemfexporter/ @open-telemetry/collect exporter/awskinesisexporter/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @MovieStoreGuy exporter/awss3exporter/ @open-telemetry/collector-contrib-approvers @atoulme @pdelewski exporter/awsxrayexporter/ @open-telemetry/collector-contrib-approvers @wangzlei @srprash -exporter/azuredataexplorerexporter/ @open-telemetry/collector-contrib-approvers @asaharan @ag-ramachandran +exporter/azuredataexplorerexporter/ @open-telemetry/collector-contrib-approvers @asaharn @ag-ramachandran exporter/azuremonitorexporter/ @open-telemetry/collector-contrib-approvers @pcwiese exporter/carbonexporter/ @open-telemetry/collector-contrib-approvers @aboguszewski-sumo exporter/cassandraexporter/ @open-telemetry/collector-contrib-approvers @atoulme @emreyalvac diff --git a/exporter/azuredataexplorerexporter/README.md b/exporter/azuredataexplorerexporter/README.md index e5c5ffc6a080..31f511a42127 100644 --- a/exporter/azuredataexplorerexporter/README.md +++ b/exporter/azuredataexplorerexporter/README.md @@ -6,7 +6,7 @@ | Stability | [beta]: traces, metrics, logs | | Distributions | [contrib] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aexporter%2Fazuredataexplorer%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aexporter%2Fazuredataexplorer) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aexporter%2Fazuredataexplorer%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aexporter%2Fazuredataexplorer) | -| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@asaharan](https://www.github.com/asaharan), [@ag-ramachandran](https://www.github.com/ag-ramachandran) | +| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@asaharn](https://www.github.com/asaharn), [@ag-ramachandran](https://www.github.com/ag-ramachandran) | [beta]: https://github.com/open-telemetry/opentelemetry-collector#beta [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib diff --git a/exporter/azuredataexplorerexporter/metadata.yaml b/exporter/azuredataexplorerexporter/metadata.yaml index a39f4db68bc1..7b7c031da4da 100644 --- a/exporter/azuredataexplorerexporter/metadata.yaml +++ b/exporter/azuredataexplorerexporter/metadata.yaml @@ -6,4 +6,4 @@ status: beta: [traces, metrics, logs] distributions: [contrib] codeowners: - active: [asaharan, ag-ramachandran] \ No newline at end of file + active: [asaharn, ag-ramachandran] \ No newline at end of file From 973c7e2c7e1835b3bdee3142c03ce6652f2641a3 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Mon, 7 Aug 2023 16:22:07 -0700 Subject: [PATCH 025/292] [chore] [exporter/tanzuobservability] prealloc slice (#24942) --- exporter/tanzuobservabilityexporter/trace_exporter.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporter/tanzuobservabilityexporter/trace_exporter.go b/exporter/tanzuobservabilityexporter/trace_exporter.go index b7c6345c9780..a8989b62374f 100644 --- a/exporter/tanzuobservabilityexporter/trace_exporter.go +++ b/exporter/tanzuobservabilityexporter/trace_exporter.go @@ -162,7 +162,7 @@ func (e *tracesExporter) shutdown(_ context.Context) error { } func mapToSpanTags(tags map[string]string) []senders.SpanTag { - var spanTags []senders.SpanTag + spanTags := make([]senders.SpanTag, 0, len(tags)) for k, v := range tags { spanTags = append(spanTags, senders.SpanTag{ Key: k, From 64142a805740c5f91161025f852d4ed0121e3fb2 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Mon, 7 Aug 2023 16:23:00 -0700 Subject: [PATCH 026/292] [chore] [exporter/loadbalancing] preallocate slice (#24937) --- exporter/loadbalancingexporter/resolver_dns.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/exporter/loadbalancingexporter/resolver_dns.go b/exporter/loadbalancingexporter/resolver_dns.go index e4ab5b452dd5..97d111d3d029 100644 --- a/exporter/loadbalancingexporter/resolver_dns.go +++ b/exporter/loadbalancingexporter/resolver_dns.go @@ -131,8 +131,8 @@ func (r *dnsResolver) resolve(ctx context.Context) ([]string, error) { _ = stats.RecordWithTags(ctx, resolverSuccessTrueMutators, mNumResolutions.M(1)) - var backends []string - for _, ip := range addrs { + backends := make([]string, len(addrs)) + for i, ip := range addrs { var backend string if ip.IP.To4() != nil { backend = ip.String() @@ -146,7 +146,7 @@ func (r *dnsResolver) resolve(ctx context.Context) ([]string, error) { backend = fmt.Sprintf("%s:%s", backend, r.port) } - backends = append(backends, backend) + backends[i] = backend } // keep it always in the same order From f70c6b086335b47009681cec4d3ebbac760749a6 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Tue, 8 Aug 2023 00:02:02 -0700 Subject: [PATCH 027/292] [processor/resourcedetectionprocessor] handle partial presence of heroku metadata (#25059) **Description:** Currently, heroku metadata is only collected if the `HEROKU_DYNO_ID` environment variable is present. It turns that under some circumstances this environment variable may be missing, but the rest of the variables may still be present. We collect what we can and offer to log at debug level if some or all metadata is missing to avoid cluttering logs. **Testing:** Unit tests. **Documentation:** No changes. --- .chloggen/log-partial-metadata-heroku.yaml | 27 +++++++++++++++++++ .../internal/heroku/heroku.go | 25 ++++++++++++----- .../internal/heroku/heroku_test.go | 27 +++++++++++++++---- 3 files changed, 68 insertions(+), 11 deletions(-) create mode 100644 .chloggen/log-partial-metadata-heroku.yaml diff --git a/.chloggen/log-partial-metadata-heroku.yaml b/.chloggen/log-partial-metadata-heroku.yaml new file mode 100644 index 000000000000..b7c52cfd65db --- /dev/null +++ b/.chloggen/log-partial-metadata-heroku.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: resourcedetectionprocessor + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Collect heroku metadata available instead of exiting early. Log at debug level if metadata is missing to help troubleshooting. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [25059] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/processor/resourcedetectionprocessor/internal/heroku/heroku.go b/processor/resourcedetectionprocessor/internal/heroku/heroku.go index a2ba9f4decdd..968c18dd07bb 100644 --- a/processor/resourcedetectionprocessor/internal/heroku/heroku.go +++ b/processor/resourcedetectionprocessor/internal/heroku/heroku.go @@ -37,16 +37,29 @@ type detector struct { // Detect detects heroku metadata and returns a resource with the available ones func (d *detector) Detect(_ context.Context) (resource pcommon.Resource, schemaURL string, err error) { - dynoID, ok := os.LookupEnv("HEROKU_DYNO_ID") - if !ok { - d.logger.Debug("heroku metadata unavailable", zap.Error(err)) - return pcommon.NewResource(), "", nil + dynoIDMissing := false + if dynoID, ok := os.LookupEnv("HEROKU_DYNO_ID"); ok { + d.rb.SetServiceInstanceID(dynoID) + } else { + dynoIDMissing = true } - d.rb.SetCloudProvider("heroku") - d.rb.SetServiceInstanceID(dynoID) + herokuAppIDMissing := false if v, ok := os.LookupEnv("HEROKU_APP_ID"); ok { d.rb.SetHerokuAppID(v) + } else { + herokuAppIDMissing = true + } + if dynoIDMissing { + if herokuAppIDMissing { + d.logger.Debug("Heroku metadata is missing. Please check metadata is enabled.") + } else { + // some heroku deployments will enable some of the metadata. + d.logger.Debug("Partial Heroku metadata is missing. Please check metadata is supported.") + } + } + if !herokuAppIDMissing { + d.rb.SetCloudProvider("heroku") } if v, ok := os.LookupEnv("HEROKU_APP_NAME"); ok { d.rb.SetServiceName(v) diff --git a/processor/resourcedetectionprocessor/internal/heroku/heroku_test.go b/processor/resourcedetectionprocessor/internal/heroku/heroku_test.go index 33ee61ecb5bb..65380bbe1b75 100644 --- a/processor/resourcedetectionprocessor/internal/heroku/heroku_test.go +++ b/processor/resourcedetectionprocessor/internal/heroku/heroku_test.go @@ -11,7 +11,6 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/processor/processortest" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" - "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal" ) @@ -62,13 +61,31 @@ func TestDetectTruePartial(t *testing.T) { res.Attributes().AsRaw()) } +func TestDetectTruePartialMissingDynoId(t *testing.T) { + t.Setenv("HEROKU_APP_ID", "appid") + t.Setenv("HEROKU_APP_NAME", "appname") + t.Setenv("HEROKU_RELEASE_VERSION", "v1") + + detector, err := NewDetector(processortest.NewNopCreateSettings(), CreateDefaultConfig()) + require.NoError(t, err) + res, schemaURL, err := detector.Detect(context.Background()) + assert.Equal(t, conventions.SchemaURL, schemaURL) + require.NoError(t, err) + assert.Equal(t, map[string]any{ + "heroku.app.id": "appid", + "service.name": "appname", + "service.version": "v1", + "cloud.provider": "heroku", + }, + res.Attributes().AsRaw()) +} + func TestDetectFalse(t *testing.T) { - detector := &detector{ - logger: zap.NewNop(), - } + detector, err := NewDetector(processortest.NewNopCreateSettings(), CreateDefaultConfig()) + require.NoError(t, err) res, schemaURL, err := detector.Detect(context.Background()) require.NoError(t, err) - assert.Equal(t, "", schemaURL) + assert.Equal(t, "https://opentelemetry.io/schemas/1.6.1", schemaURL) assert.True(t, internal.IsEmptyResource(res)) } From e314b70b720d1a5a0869f3668b0e658cf6b45e5b Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Tue, 8 Aug 2023 00:52:12 -0700 Subject: [PATCH 028/292] [receiver/carbon] Fix memory leak (#24276) **Description:** The carbonreceiver has a memory leak where it will repeatedly open new obsrecv operations but not close them afterwards. Those operations eventually create a burden. The fix is to make sure the receiver only creates an operation per interaction over TCP. **Link to tracking Issue:** Fixes #24275 **Testing:** Added a test showing TCP reconnections no longer start additional spans. --- .../carbon-receiver-obsrecv-memory-leak.yaml | 23 +++++++++++ receiver/carbonreceiver/go.mod | 2 +- receiver/carbonreceiver/receiver_test.go | 41 ++++++++++++++----- .../transport/client/plaintext_client.go | 22 ++++++++++ .../carbonreceiver/transport/tcp_server.go | 16 +++++++- 5 files changed, 91 insertions(+), 13 deletions(-) create mode 100644 .chloggen/carbon-receiver-obsrecv-memory-leak.yaml diff --git a/.chloggen/carbon-receiver-obsrecv-memory-leak.yaml b/.chloggen/carbon-receiver-obsrecv-memory-leak.yaml new file mode 100644 index 000000000000..32646b73bd39 --- /dev/null +++ b/.chloggen/carbon-receiver-obsrecv-memory-leak.yaml @@ -0,0 +1,23 @@ +# Use this changelog template to create an entry for release notes. +# If your change doesn't affect end users, such as a test fix or a tooling change, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: carbonreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix Carbon receiver obsrecv operations memory leak + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [24275] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: | + The carbonreceiver has a memory leak where it will repeatedly open new obsrecv operations but not close them afterwards. Those operations eventually create a burden. + + The fix is to make sure the receiver only creates an operation per interaction over TCP. diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index 1a1befd6dddd..e3d568677349 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -13,6 +13,7 @@ require ( go.opentelemetry.io/collector/consumer v0.82.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 go.opentelemetry.io/collector/receiver v0.82.0 + go.opentelemetry.io/otel/sdk v1.16.0 go.uber.org/zap v1.25.0 ) @@ -50,7 +51,6 @@ require ( go.opentelemetry.io/otel v1.16.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect go.opentelemetry.io/otel/metric v1.16.0 // indirect - go.opentelemetry.io/otel/sdk v1.16.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect go.opentelemetry.io/otel/trace v1.16.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/receiver/carbonreceiver/receiver_test.go b/receiver/carbonreceiver/receiver_test.go index 88d78bd0cac3..e9d4646e50cd 100644 --- a/receiver/carbonreceiver/receiver_test.go +++ b/receiver/carbonreceiver/receiver_test.go @@ -18,10 +18,11 @@ import ( "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/receivertest" + sdktrace "go.opentelemetry.io/otel/sdk/trace" + "go.opentelemetry.io/otel/sdk/trace/tracetest" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/protocol" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/transport" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/transport/client" ) @@ -170,17 +171,28 @@ func Test_carbonreceiver_EndToEnd(t *testing.T) { tests := []struct { name string configFn func() *Config - clientFn func(t *testing.T) *client.Graphite + clientFn func(t *testing.T) func(client.Metric) error }{ { name: "default_config", configFn: func() *Config { return createDefaultConfig().(*Config) }, - clientFn: func(t *testing.T) *client.Graphite { + clientFn: func(t *testing.T) func(client.Metric) error { c, err := client.NewGraphite(client.TCP, addr) require.NoError(t, err) - return c + return c.SendMetric + }, + }, + { + name: "tcp_reconnect", + configFn: func() *Config { + return createDefaultConfig().(*Config) + }, + clientFn: func(t *testing.T) func(client.Metric) error { + c, err := client.NewGraphite(client.TCP, addr) + require.NoError(t, err) + return c.SputterThenSendMetric }, }, { @@ -190,10 +202,10 @@ func Test_carbonreceiver_EndToEnd(t *testing.T) { cfg.Transport = "udp" return cfg }, - clientFn: func(t *testing.T) *client.Graphite { + clientFn: func(t *testing.T) func(client.Metric) error { c, err := client.NewGraphite(client.UDP, addr) require.NoError(t, err) - return c + return c.SendMetric }, }, } @@ -202,11 +214,16 @@ func Test_carbonreceiver_EndToEnd(t *testing.T) { cfg := tt.configFn() cfg.Endpoint = addr sink := new(consumertest.MetricsSink) - rcv, err := New(receivertest.NewNopCreateSettings(), *cfg, sink) + recorder := tracetest.NewSpanRecorder() + rt := sdktrace.NewTracerProvider(sdktrace.WithSpanProcessor(recorder)) + cs := receivertest.NewNopCreateSettings() + cs.TracerProvider = rt + rcv, err := New(cs, *cfg, sink) require.NoError(t, err) r := rcv.(*carbonReceiver) - mr := transport.NewMockReporter(1) + mr, err := newReporter(cs) + require.NoError(t, err) r.reporter = mr require.NoError(t, r.Start(context.Background(), componenttest.NewNopHost())) @@ -223,10 +240,13 @@ func Test_carbonreceiver_EndToEnd(t *testing.T) { Value: 1.23, Timestamp: ts, } - err = snd.SendMetric(carbonMetric) + + err = snd(carbonMetric) require.NoError(t, err) - mr.WaitAllOnMetricsProcessedCalls() + require.Eventually(t, func() bool { + return len(recorder.Ended()) == 1 + }, 30*time.Second, 100*time.Millisecond) mdd := sink.AllMetrics() require.Len(t, mdd, 1) @@ -234,6 +254,7 @@ func Test_carbonreceiver_EndToEnd(t *testing.T) { m := mdd[0].ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0) assert.Equal(t, carbonMetric.Name, m.Name()) require.Equal(t, 1, m.Gauge().DataPoints().Len()) + require.Equal(t, len(recorder.Ended()), len(recorder.Started())) }) } } diff --git a/receiver/carbonreceiver/transport/client/plaintext_client.go b/receiver/carbonreceiver/transport/client/plaintext_client.go index e496af84f480..9afb3de4a82f 100644 --- a/receiver/carbonreceiver/transport/client/plaintext_client.go +++ b/receiver/carbonreceiver/transport/client/plaintext_client.go @@ -100,6 +100,28 @@ func (g *Graphite) SendMetric(metric Metric) error { return nil } +// SputterThenSendMetric method sends a bad partial metric, then the whole metric across. +func (g *Graphite) SputterThenSendMetric(metric Metric) error { + str := metric.String() + for i := 0; i < 5; i++ { + if _, err := fmt.Fprint(g.Conn, ""); err != nil { + return err + } + if err := g.Disconnect(); err != nil { + return err + } + if err := g.connect(TCP); err != nil { + return err + } + } + + if _, err := fmt.Fprint(g.Conn, str); err != nil { + return err + } + + return nil +} + // SendMetrics method can be used to pass a set of metrics and // have it be sent to the Graphite host func (g *Graphite) SendMetrics(metrics []Metric) error { diff --git a/receiver/carbonreceiver/transport/tcp_server.go b/receiver/carbonreceiver/transport/tcp_server.go index 54e341521f48..04a4419cc523 100644 --- a/receiver/carbonreceiver/transport/tcp_server.go +++ b/receiver/carbonreceiver/transport/tcp_server.go @@ -136,6 +136,8 @@ func (t *tcpServer) handleConnection( defer conn.Close() var span *trace.Span reader := bufio.NewReader(conn) + reporterActive := false + var ctx context.Context for { if span != nil { span.End() @@ -161,11 +163,13 @@ func (t *tcpServer) handleConnection( // this case). bytes, err := reader.ReadBytes((byte)('\n')) - // It is possible to have new data in bytes and err to be io.EOF - ctx := t.reporter.OnDataReceived(context.Background()) var numReceivedMetricPoints int line := strings.TrimSpace(string(bytes)) if line != "" { + if !reporterActive { + ctx = t.reporter.OnDataReceived(context.Background()) + reporterActive = true + } numReceivedMetricPoints++ var metric pmetric.Metric metric, err = p.Parse(line) @@ -178,6 +182,7 @@ func (t *tcpServer) handleConnection( metric.MoveTo(newMetric) err = nextConsumer.ConsumeMetrics(ctx, metrics) t.reporter.OnMetricsProcessed(ctx, numReceivedMetricPoints, err) + reporterActive = false if err != nil { // The protocol doesn't account for returning errors. // Since this is a TCP connection it seems reasonable to close the @@ -193,6 +198,9 @@ func (t *tcpServer) handleConnection( t.reporter.OnDebugf("TCP Transport (%s) - net.OpError: %v", t.ln.Addr(), netErr) if netErr.Timeout() { // We want to end on timeout so idle connections are purged. + if reporterActive { + t.reporter.OnMetricsProcessed(ctx, 0, err) + } span.End() return } @@ -203,6 +211,10 @@ func (t *tcpServer) handleConnection( "TCP Transport (%s) - error: %v", t.ln.Addr(), err) + + if reporterActive { + t.reporter.OnMetricsProcessed(ctx, 0, err) + } span.End() return } From 8f724f1643de73bc2f5f505d308e64fb75578c04 Mon Sep 17 00:00:00 2001 From: Ziqi Zhao Date: Tue, 8 Aug 2023 21:03:44 +0800 Subject: [PATCH 029/292] [processor/filter] enable exhaustive lint for (#25062) **Description:** related #23266 Signed-off-by: Ziqi Zhao --- processor/filterprocessor/metrics.go | 1 + 1 file changed, 1 insertion(+) diff --git a/processor/filterprocessor/metrics.go b/processor/filterprocessor/metrics.go index 51fbb857c62f..31fae0dfad5b 100644 --- a/processor/filterprocessor/metrics.go +++ b/processor/filterprocessor/metrics.go @@ -133,6 +133,7 @@ func (fmp *filterMetricProcessor) processMetrics(ctx context.Context, md pmetric } } if fmp.skipDataPointExpr != nil { + //exhaustive:enforce switch metric.Type() { case pmetric.MetricTypeSum: errors = multierr.Append(errors, fmp.handleNumberDataPoints(ctx, metric.Sum().DataPoints(), metric, smetrics.Metrics(), scope, resource)) From fb1c920bade27637a87f8087debf1b7765689a98 Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Tue, 8 Aug 2023 09:30:52 -0400 Subject: [PATCH 030/292] [chore][pkg/stanza/fileconsumer] Simplify filter interface (#24910) - No longer requires Matcher to call `f := filter.New` followed by `f.Apply` and then `f.Values()`. Now just call `filter.Filter`. - Fix issue introduced in previous PR where a sort options would not enforce their parsing rules on a slice of length 1. --- .../matcher/internal/filter/filter.go | 71 +++++----- .../matcher/internal/filter/filter_test.go | 122 ++++++++++-------- .../matcher/internal/filter/item.go | 36 ------ .../matcher/internal/filter/item_test.go | 61 --------- .../matcher/internal/filter/sort.go | 32 +++-- .../matcher/internal/filter/sort_test.go | 32 ++++- pkg/stanza/fileconsumer/matcher/matcher.go | 12 +- .../fileconsumer/matcher/matcher_test.go | 37 +++++- 8 files changed, 193 insertions(+), 210 deletions(-) delete mode 100644 pkg/stanza/fileconsumer/matcher/internal/filter/item.go delete mode 100644 pkg/stanza/fileconsumer/matcher/internal/filter/item_test.go diff --git a/pkg/stanza/fileconsumer/matcher/internal/filter/filter.go b/pkg/stanza/fileconsumer/matcher/internal/filter/filter.go index 86ac28ad9a47..ec1d31b15cb6 100644 --- a/pkg/stanza/fileconsumer/matcher/internal/filter/filter.go +++ b/pkg/stanza/fileconsumer/matcher/internal/filter/filter.go @@ -4,51 +4,64 @@ package filter // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/matcher/internal/filter" import ( + "fmt" "regexp" "go.uber.org/multierr" ) -type Filter struct { - items []*item - opts []Option -} - -func (f *Filter) Apply() error { - var errs error - for _, opt := range f.opts { - errs = multierr.Append(errs, opt.apply(f)) - } - return errs -} - -func (f *Filter) Values() []string { - values := make([]string, 0, len(f.items)) - for _, item := range f.items { - values = append(values, item.value) - } - return values -} - type Option interface { // Returned error is for explanitory purposes only. // All options will be called regardless of error. - apply(*Filter) error + apply([]*item) ([]*item, error) } -func New(values []string, regex *regexp.Regexp, opts ...Option) (Filter, error) { - f := Filter{ - items: make([]*item, 0, len(values)), - opts: opts, - } +func Filter(values []string, regex *regexp.Regexp, opts ...Option) ([]string, error) { var errs error + items := make([]*item, 0, len(values)) for _, value := range values { it, err := newItem(value, regex) if err != nil { errs = multierr.Append(errs, err) continue } - f.items = append(f.items, it) + items = append(items, it) + } + for _, opt := range opts { + var applyErr error + items, applyErr = opt.apply(items) + errs = multierr.Append(errs, applyErr) + } + result := make([]string, 0, len(items)) + for _, item := range items { + result = append(result, item.value) + } + return result, errs +} + +type item struct { + value string + captures map[string]string + + // Used when an Option is unable to interpret the value. + // For example, a numeric sort may fail to parse the value as a number. + err error +} + +func newItem(value string, regex *regexp.Regexp) (*item, error) { + match := regex.FindStringSubmatch(value) + if match == nil { + return nil, fmt.Errorf("'%s' does not match regex", value) + } + it := &item{ + value: value, + captures: make(map[string]string), + } + for i, name := range regex.SubexpNames() { + if i == 0 || name == "" { + continue + } + it.captures[name] = match[i] } - return f, errs + return it, nil } diff --git a/pkg/stanza/fileconsumer/matcher/internal/filter/filter_test.go b/pkg/stanza/fileconsumer/matcher/internal/filter/filter_test.go index ad08f18c0370..fb4a865026c5 100644 --- a/pkg/stanza/fileconsumer/matcher/internal/filter/filter_test.go +++ b/pkg/stanza/fileconsumer/matcher/internal/filter/filter_test.go @@ -10,55 +10,76 @@ import ( "github.com/stretchr/testify/assert" ) -func TestNew(t *testing.T) { +func TestNewItem(t *testing.T) { cases := []struct { name string regex string - values []string + value string expectedErr string - expectItems []*item - numOpts int + expect *item }{ { - name: "SingleCapture", - regex: `err\.(?P\d{4}\d{2}\d{2}\d{2}).*log`, - values: []string{"err.2023020611.log", "err.2023020612.log"}, - expectItems: []*item{ - { - value: "err.2023020611.log", - captures: map[string]string{"value": "2023020611"}, - }, - { - value: "err.2023020612.log", - captures: map[string]string{"value": "2023020612"}, - }, + name: "SingleCapture", + regex: `err\.(?P\d{4}\d{2}\d{2}\d{2}).*log`, + value: "err.2023020611.log", + expect: &item{ + value: "err.2023020611.log", + captures: map[string]string{"value": "2023020611"}, }, }, { name: "MultipleCapture", regex: `foo\.(?P[a-zA-Z])\.(?P\d+)\.(?P